[Commits] compose.c 1.382.2.584 1.382.2.585

[claws at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv8428/src

Modified Files:
      Tag: gtk2
	compose.c 
Log Message:
2011-10-15 [paul]	3.7.10cvs28

	* src/compose.c
		compose_create_tags() - fix misplaced 'int i'
		compose_entry_mark_default_to() - fix To field highlighting 

Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.584
retrieving revision 1.382.2.585
diff -u -d -r1.382.2.584 -r1.382.2.585
--- compose.c	7 Oct 2011 10:13:41 -0000	1.382.2.584
+++ compose.c	15 Oct 2011 08:17:09 -0000	1.382.2.585
@@ -797,9 +797,9 @@
 #if !GTK_CHECK_VERSION(2, 24, 0)
 	GdkColormap *cmap;
 	gboolean success[8];
+	int i;
 #endif
 	GdkColor color[8];
-	int i;
 
 	buffer = gtk_text_view_get_buffer(text);
 
@@ -2547,7 +2547,7 @@
 
 static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
 {
-#if !GTK_CHECK_VERSION(2, 24, 0)
+#if !GTK_CHECK_VERSION(3, 0, 0)
 	static GdkColor yellow;
 	static GdkColor black;
 	static gboolean yellow_initialised = FALSE;
@@ -2558,7 +2558,7 @@
 	GSList *h_list;
 	GtkEntry *entry;
 		
-#if !GTK_CHECK_VERSION(2, 24, 0)
+#if !GTK_CHECK_VERSION(3, 0, 0)
 	if (!yellow_initialised) {
 		gdk_color_parse("#f5f6be", &yellow);
 		gdk_color_parse("#000000", &black);
@@ -2573,7 +2573,7 @@
 		entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
 		if (gtk_entry_get_text(entry) && 
 		    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
-#if !GTK_CHECK_VERSION(2, 24, 0)
+#if !GTK_CHECK_VERSION(3, 0, 0)
 			if (yellow_initialised) {
 #endif
 				gtk_widget_modify_base(
@@ -2582,7 +2582,7 @@
 				gtk_widget_modify_text(
 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
 					GTK_STATE_NORMAL, &black);
-#if !GTK_CHECK_VERSION(2, 24, 0)
+#if !GTK_CHECK_VERSION(3, 0, 0)
 			}
 #endif
 		}