talons

commit e05eee081846804256a098c6fdab4f3a7c3073d7
parent a6ef1d708bd89b669cd758f55b97b7488d55e934
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Thu,  6 Jan 2011 17:14:15 +0000

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

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/trayicon/trayicon.c
 | 
7
++-----

4 files changed, 12 insertions(+), 6 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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;