2011-01-06 [pawel] 3.7.8cvs32

	* src/plugins/trayicon/trayicon.c
		- fix logic bug which caused icon to be
		  always set no-mail status on plugin load
		- force icon hide on plugin_done(), without
		  it empty space(?!) is left in tray under KDE3 and KDE4

diff --git a/ChangeLog b/ChangeLog
index 81e9ca840481da90bcb6c14952beed57a901b57b..38398e04c1b646bca57a223f204f69c70f003216 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-06 [pawel]     3.7.8cvs32
+
+       * src/plugins/trayicon/trayicon.c
+               - fix logic bug which caused icon to be
+                 always set no-mail status on plugin load
+               - force icon hide on plugin_done(), without
+                 it empty space(?!) is left in tray under KDE3 and KDE4
+
 2011-01-06 [colin]     3.7.8cvs31
 
        * src/addrharvest.c

diff --git a/PATCHSETS b/PATCHSETS
index 1b73e6d69702106369becd8b65cd1e5d7007439a..ffedcc797976d2bf4e13e527eb1487964b5c98e1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4105,3 +4105,4 @@
 ( cvs diff -u -r 1.100.2.76 -r 1.100.2.77 AUTHORS;  cvs diff -u -r 1.654.2.4177 -r 1.654.2.4178 configure.ac;  diff -u /dev/null po/lt.po;  cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/gtk/authors.h;  ) > 3.7.8cvs29.patchset
 ( cvs diff -u -r 1.94.2.211 -r 1.94.2.212 src/messageview.c;  cvs diff -u -r 1.9.2.71 -r 1.9.2.72 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/plugins/pgpinline/pgpinline.c;  ) > 3.7.8cvs30.patchset
 ( cvs diff -u -r 1.6.10.23 -r 1.6.10.24 src/addrharvest.c;  cvs diff -u -r 1.65.2.70 -r 1.65.2.71 src/codeconv.c;  cvs diff -u -r 1.15.2.24 -r 1.15.2.25 src/codeconv.h;  cvs diff -u -r 1.382.2.565 -r 1.382.2.566 src/compose.c;  cvs diff -u -r 1.101.2.62 -r 1.101.2.63 src/news.c;  cvs diff -u -r 1.47.2.52 -r 1.47.2.53 src/procheader.c;  cvs diff -u -r 1.49.2.135 -r 1.49.2.136 src/procmime.c;  cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/unmime.c;  cvs diff -u -r 1.2.10.7 -r 1.2.10.8 src/unmime.h;  ) > 3.7.8cvs31.patchset
+( cvs diff -u -r 1.14.2.74 -r 1.14.2.75 src/plugins/trayicon/trayicon.c;  ) > 3.7.8cvs32.patchset

diff --git a/configure.ac b/configure.ac
index 151f5ec999fb1386eaa7b2751004eb2e9bf0bf95..8d11af65a726c570151f71188aceebbdb8b4fd15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=32
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 0a827fcaa7b7f0542e0fbba501ad0c5746d2e8fd..e2ec910c46841379d4f6a15ae7eb4de8874eab63 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -350,10 +350,6 @@ static void create_trayicon()
 #if GTK_CHECK_VERSION(2,14,0)
        gtk_status_icon_set_title(GTK_STATUS_ICON(trayicon), _("Claws Mail"));
 #endif
-       trayicon_update_theme(NULL, NULL);
-
-       gtk_status_icon_set_from_pixbuf(GTK_STATUS_ICON(trayicon), nomail_pixbuf[0]);
-
        g_signal_connect(G_OBJECT(trayicon), "button-press-event",
                G_CALLBACK(click_cb), NULL);
 
@@ -377,7 +373,7 @@ static void create_trayicon()
        traymenu_popup = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
                                gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/TrayiconPopup")) );
 
-       update(NULL);
+       trayicon_update_theme(NULL, NULL);
 }
 
 int plugin_init(gchar **error)
@@ -474,6 +470,7 @@ gboolean plugin_done(void)
        if (claws_is_exiting())
                return TRUE;
 
+       gtk_status_icon_set_visible(trayicon, FALSE);
        g_object_unref(G_OBJECT(trayicon));
        trayicon = NULL;