2008-08-10 [colin] 3.5.0cvs57

	* src/summaryview.c
	* src/gtk/gtkcmclist.c
		Continue fixing GTK < 2.12 build, thanks to
		Michael Hugues

diff --git a/ChangeLog b/ChangeLog
index a8a96f7495fdb1ca171c1c23a366596c5d4b5d6d..b7ce3bbe8578a4036c32a029a87997e0f11777f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-10 [colin]     3.5.0cvs57
+
+       * src/summaryview.c
+       * src/gtk/gtkcmclist.c
+               Continue fixing GTK < 2.12 build, thanks to
+               Michael Hugues
+
 2008-08-10 [colin]     3.5.0cvs56
 
        * src/gtk/gtksctree.c

diff --git a/PATCHSETS b/PATCHSETS
index 6ae1c0864f29a42258208859c4516b0f9fcc347d..43397894445cb2cafca784a59d1f4d9e30445772 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3468,3 +3468,4 @@
 ( cvs diff -u -r 1.382.2.465 -r 1.382.2.466 src/compose.c;  cvs diff -u -r 1.14.2.52 -r 1.14.2.53 src/editaddress.c;  cvs diff -u -r 1.207.2.205 -r 1.207.2.206 src/folderview.c;  cvs diff -u -r 1.274.2.264 -r 1.274.2.265 src/mainwindow.c;  cvs diff -u -r 1.3.12.31 -r 1.3.12.32 src/message_search.c;  cvs diff -u -r 1.83.2.141 -r 1.83.2.142 src/mimeview.c;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/noticeview.c;  cvs diff -u -r 1.105.2.141 -r 1.105.2.142 src/prefs_account.c;  cvs diff -u -r 1.204.2.175 -r 1.204.2.176 src/prefs_common.c;  cvs diff -u -r 1.16.2.32 -r 1.16.2.33 src/prefs_customheader.c;  cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/prefs_ext_prog.c;  cvs diff -u -r 1.1.4.55 -r 1.1.4.56 src/prefs_filtering_action.c;  cvs diff -u -r 1.10.2.37 -r 1.10.2.38 src/prefs_gtk.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_logging.c;  cvs diff -u -r 1.43.2.75 -r 1.43.2.76 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/prefs_msg_colors.c;  cvs diff -u -r 1.49.2.111 -r 1.49.2.112 src/procmime.c;  cvs diff -u -r 1.15.2.55 -r 1.15.2.56 src/summary_search.c;  cvs diff -u -r 1.395.2.380 -r 1.395.2.381 src/summaryview.c;  cvs diff -u -r 1.43.2.103 -r 1.43.2.104 src/toolbar.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/colorsel.c;  cvs diff -u -r 1.9.2.58 -r 1.9.2.59 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.80 -r 1.5.2.81 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.44 -r 1.4.2.45 src/gtk/gtkutils.h;  cvs diff -u -r 1.2.2.30 -r 1.2.2.31 src/gtk/inputdialog.c;  cvs diff -u -r 1.5.2.52 -r 1.5.2.53 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.84 -r 1.1.2.85 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.23.2.49 -r 1.23.2.50 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.5.0cvs54.patchset
 ( cvs diff -u -r 1.274.2.265 -r 1.274.2.266 src/mainwindow.c;  ) > 3.5.0cvs55.patchset
 ( cvs diff -u -r 1.1.4.47 -r 1.1.4.48 src/gtk/gtksctree.c;  ) > 3.5.0cvs56.patchset
+( cvs diff -u -r 1.395.2.381 -r 1.395.2.382 src/summaryview.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmclist.c;  ) > 3.5.0cvs57.patchset

diff --git a/configure.ac b/configure.ac
index fb3700d4344c2a5f6ff0cbcefc00a44c85054d93..864cd29a1bcece22cf0f0a133abde34d0ebf42a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=56
+EXTRA_VERSION=57
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c
index f5dd23b40f58b4f048f5e55b4bc9a918d1239719..61ec7fb29b434e6c041138371639dc426a9ab141 100644 (file)
--- a/src/gtk/gtkcmclist.c
+++ b/src/gtk/gtkcmclist.c
@@ -5314,9 +5314,13 @@ gtk_cmclist_motion (GtkWidget      *widget,
       if (clist->htimer)
        return FALSE;
 
+#if GTK_CHECK_VERSION(2,12,0)
       clist->htimer = gdk_threads_add_timeout
        (SCROLL_TIME, (GSourceFunc) horizontal_timeout, clist);
-
+#else
+      clist->htimer = g_timeout_add
+       (SCROLL_TIME, (GSourceFunc) horizontal_timeout, clist);
+#endif
       if (!((x < 0 && clist->hadjustment->value == 0) ||
            (x >= clist->clist_window_width &&
             clist->hadjustment->value ==
@@ -5345,10 +5349,13 @@ gtk_cmclist_motion (GtkWidget      *widget,
     {
       if (clist->vtimer)
        return FALSE;
-
+#if GTK_CHECK_VERSION(2,12,0)
       clist->vtimer = gdk_threads_add_timeout (SCROLL_TIME,
                                     (GSourceFunc) vertical_timeout, clist);
-
+#else
+      clist->vtimer = g_timeout_add (SCROLL_TIME,
+                                    (GSourceFunc) vertical_timeout, clist);
+#endif
       if (clist->drag_button &&
          ((y < 0 && clist->focus_row == 0) ||
           (y >= clist->clist_window_height &&

diff --git a/src/summaryview.c b/src/summaryview.c
index 22b3aed5cb91e32d847f135894730c3072440271..ea1fa26a23c7c6d51db52428035c0b2cf76ef67d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -682,7 +682,7 @@ SummaryView *summary_create(void)
        summaryview = g_new0(SummaryView, 1);
 
 #if !(GTK_CHECK_VERSION(2,12,0))
-       summaryview->tips = tips;
+       summaryview->tooltips = tips;
 #endif
 #define SUMMARY_VBOX_SPACING 3
        vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
@@ -7659,7 +7659,7 @@ void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
        guint replied, forwarded, locked, ignored, watched;
        static gboolean tips_initialized = FALSE;
 #if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *tips = summaryview->tips;
+       GtkTooltips *tips = summaryview->tooltips;
 #endif
 
        if (prefs_common.layout_mode != SMALL_LAYOUT) {