commit c7637f8b817a8f2df20fbb365b4c70f2be242918
parent 86b381a5ddd8032e6c417b559fef7378e3ffb542
Author: Paul Mangan <paul@claws-mail.org>
Date: Mon, 11 Apr 2011 06:37:32 +0000
2011-04-11 [paul] 3.7.9cvs12
* src/plugins/trayicon/trayicon.c
fix build bug: gtk_status_icon_set_title() is available
since gtk 2.18.x not 2.14.x
Diffstat:
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-11 [paul] 3.7.9cvs12
+
+ * src/plugins/trayicon/trayicon.c
+ fix build bug: gtk_status_icon_set_title() is available
+ since gtk 2.18.x not 2.14.x
+
2011-04-11 [paul] 3.7.9cvs11
* po/hu.po
diff --git a/PATCHSETS b/PATCHSETS
@@ -4163,3 +4163,4 @@
( cvs diff -u -r 1.382.2.574 -r 1.382.2.575 src/compose.c; cvs diff -u -r 1.14.2.58 -r 1.14.2.59 src/editaddress.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.115.2.235 -r 1.115.2.236 src/main.c; cvs diff -u -r 1.3.12.37 -r 1.3.12.38 src/message_search.c; cvs diff -u -r 1.16.2.41 -r 1.16.2.42 src/prefs_display_header.c; cvs diff -u -r 1.43.2.87 -r 1.43.2.88 src/prefs_matcher.c; cvs diff -u -r 1.30.2.65 -r 1.30.2.66 src/prefs_toolbar.c; cvs diff -u -r 1.15.2.63 -r 1.15.2.64 src/summary_search.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/gtk/combobox.c; cvs diff -u -r 1.4.2.54 -r 1.4.2.55 src/gtk/gtkutils.h; cvs diff -u -r 1.2.2.40 -r 1.2.2.41 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.100 -r 1.1.2.101 src/gtk/quicksearch.c; ) > 3.7.9cvs9.patchset
( cvs diff -u -r 1.27.2.52 -r 1.27.2.53 src/addr_compl.c; cvs diff -u -r 1.60.2.142 -r 1.60.2.143 src/addressbook.c; cvs diff -u -r 1.382.2.575 -r 1.382.2.576 src/compose.c; cvs diff -u -r 1.14.2.59 -r 1.14.2.60 src/editaddress.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.115.2.236 -r 1.115.2.237 src/main.c; cvs diff -u -r 1.3.12.38 -r 1.3.12.39 src/message_search.c; cvs diff -u -r 1.16.2.42 -r 1.16.2.43 src/prefs_display_header.c; cvs diff -u -r 1.1.4.68 -r 1.1.4.69 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.88 -r 1.43.2.89 src/prefs_matcher.c; cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/prefs_other.c; cvs diff -u -r 1.30.2.66 -r 1.30.2.67 src/prefs_toolbar.c; cvs diff -u -r 1.15.2.64 -r 1.15.2.65 src/summary_search.c; cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/gtk/colorlabel.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/combobox.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/gtkcmoptionmenu.c; cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/gtkshruler.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/gtkshruler.h; cvs diff -u -r 1.4.2.55 -r 1.4.2.56 src/gtk/gtkutils.h; cvs diff -u -r 1.2.2.41 -r 1.2.2.42 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.101 -r 1.1.2.102 src/gtk/quicksearch.c; ) > 3.7.9cvs10.patchset
( cvs diff -u -r 1.5.2.18 -r 1.5.2.19 po/hu.po; ) > 3.7.9cvs11.patchset
+( cvs diff -u -r 1.14.2.76 -r 1.14.2.77 src/plugins/trayicon/trayicon.c; ) > 3.7.9cvs12.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=9
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
@@ -347,7 +347,7 @@ static void create_trayicon()
{
GtkActionGroup *action_group;
trayicon = gtk_status_icon_new();
-#if GTK_CHECK_VERSION(2,14,0)
+#if GTK_CHECK_VERSION(2,18,0)
gtk_status_icon_set_title(GTK_STATUS_ICON(trayicon), _("Claws Mail"));
#endif
g_signal_connect(G_OBJECT(trayicon), "button-press-event",
