2008-10-07 [colin] 3.6.0cvs13

	* src/mainwindow.c
		Fix build with GTK+ < 2.14

diff --git a/ChangeLog b/ChangeLog
index 9d5b9e89c55e05899f134ff946dd8955b45a69b6..7a3d91d16ee2fafdfc7d5b91c62ba5f5bc58490d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-07 [colin]     3.6.0cvs13
+
+       * src/mainwindow.c
+               Fix build with GTK+ < 2.14
+

 2008-10-07 [colin]     3.6.0cvs12
 
        * src/mainwindow.c
 2008-10-07 [colin]     3.6.0cvs12
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 6bb2491d828a885a2bfa667859c8dcec342cfd17..64c373fead068bccd8dde6142eec1eb964a4d74d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3569,3 +3569,4 @@
 ( cvs diff -u -r 1.274.2.279 -r 1.274.2.280 src/mainwindow.c;  ) > 3.6.0cvs10.patchset
 ( cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/prefs_other.c;  ) > 3.6.0cvs11.patchset
 ( cvs diff -u -r 1.274.2.280 -r 1.274.2.281 src/mainwindow.c;  cvs diff -u -r 1.39.2.52 -r 1.39.2.53 src/mainwindow.h;  cvs diff -u -r 1.204.2.180 -r 1.204.2.181 src/prefs_common.c;  cvs diff -u -r 1.103.2.115 -r 1.103.2.116 src/prefs_common.h;  cvs diff -u -r 1.395.2.394 -r 1.395.2.395 src/summaryview.c;  cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/gtk/colorlabel.c;  ) > 3.6.0cvs12.patchset
 ( cvs diff -u -r 1.274.2.279 -r 1.274.2.280 src/mainwindow.c;  ) > 3.6.0cvs10.patchset
 ( cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/prefs_other.c;  ) > 3.6.0cvs11.patchset
 ( cvs diff -u -r 1.274.2.280 -r 1.274.2.281 src/mainwindow.c;  cvs diff -u -r 1.39.2.52 -r 1.39.2.53 src/mainwindow.h;  cvs diff -u -r 1.204.2.180 -r 1.204.2.181 src/prefs_common.c;  cvs diff -u -r 1.103.2.115 -r 1.103.2.116 src/prefs_common.h;  cvs diff -u -r 1.395.2.394 -r 1.395.2.395 src/summaryview.c;  cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/gtk/colorlabel.c;  ) > 3.6.0cvs12.patchset

+( cvs diff -u -r 1.274.2.281 -r 1.274.2.282 src/mainwindow.c;  ) > 3.6.0cvs13.patchset

diff --git a/configure.ac b/configure.ac
index 675915fdee44e327698c46497553e5de703aabfb..a22700b9536c9fcb33b9d36acd5d256772c0b813 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=12
+EXTRA_VERSION=13

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 93b11bf2ba75c5b74d6c58e845fe8d8ce3f93635..0c5ed63f2553051c5351fdeafac02d06b256ef4e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1054,8 +1054,14 @@ void mainwin_accel_changed_cb (GtkAccelGroup *accelgroup, guint keyval, GdkModif
                        gchar *new_accel;
                        
                        if (keyval == GDK_BackSpace) {
                        gchar *new_accel;
                        
                        if (keyval == GDK_BackSpace) {

+                               const gchar *accel_path;
+#if GTK_CHECK_VERSION(2,14,0)
+                               accel_path = gtk_menu_item_get_accel_path(item);
+#else
+                               accel_path = GTK_MENU_ITEM(item)->accel_path;
+#endif

                                keyval = 0; modifier = 0;
                                keyval = 0; modifier = 0;

-                               gtk_accel_map_change_entry (gtk_menu_item_get_accel_path(item), keyval, modifier, TRUE);
+                               gtk_accel_map_change_entry (accel_path, keyval, modifier, TRUE);

                        }
                        new_accel = gtk_accelerator_get_label(keyval, modifier);
                        gtk_label_set_text(label, new_accel);
                        }
                        new_accel = gtk_accelerator_get_label(keyval, modifier);
                        gtk_label_set_text(label, new_accel);