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

diff --git a/ChangeLog b/ChangeLog
index e2b1141212cd8709cdf0de87638d0cab897f3858..871b8d60f6d69be4e0e25c85dfeb925a8bb6e03b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
+
 2011-10-09 [colin]     3.7.10cvs27
 
        * src/addr_compl.c

diff --git a/PATCHSETS b/PATCHSETS
index 87f4e003f6e53ac8bafd6e4a77b352560ae20075..01fa428e6be548c1a2e7a01fc6e15da453f3041c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4231,3 +4231,4 @@
 ( cvs diff -u -r 1.20.2.26 -r 1.20.2.27 src/gtk/Makefile.am;  diff -u /dev/null src/gtk/gdkkeysyms-new.h;  cvs diff -u -r 1.4.2.58 -r 1.4.2.59 src/gtk/gtkutils.h;  ) > 3.7.10cvs25.patchset
 ( cvs diff -u -r 1.1.4.72 -r 1.1.4.73 src/prefs_filtering_action.c;  cvs diff -u -r 1.4.2.59 -r 1.4.2.60 src/gtk/gtkutils.h;  ) > 3.7.10cvs26.patchset
 ( cvs diff -u -r 1.27.2.56 -r 1.27.2.57 src/addr_compl.c;  ) > 3.7.10cvs27.patchset
+( cvs diff -u -r 1.382.2.584 -r 1.382.2.585 src/compose.c;  ) > 3.7.10cvs28.patchset

diff --git a/configure.ac b/configure.ac
index e2fa5b67f360a77361ab0e24ba4f5bed7f6704d2..da984d32769766503be0364ff0758918556cde36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 2211ea0e30b49a39c98df99e882f6d79f24b15c3..15d2ac94df5e15519db6c38819388d18f3dfa4d6 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -797,9 +797,9 @@ static void compose_create_tags(GtkTextView *text, Compose *compose)
 #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 @@ void compose_entry_append(Compose *compose, const gchar *address,
 
 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 @@ static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
        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 @@ static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
                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 @@ static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
                                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
                }