2010-10-02 [colin] 3.7.6cvs48

	* src/plugins/trayicon/trayicon.c
		And fix theme updating.

diff --git a/ChangeLog b/ChangeLog
index 0eb144367eb7b33ec68a07d62222824691e06e56..c5d53bea8b31b15d9417cc9385c3286230aa3357 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-02 [colin]     3.7.6cvs48
+
+       * src/plugins/trayicon/trayicon.c
+               And fix theme updating.
+
 2010-10-02 [colin]     3.7.6cvs47
 
        * src/plugins/trayicon/trayicon.c

diff --git a/PATCHSETS b/PATCHSETS
index a6975b14fe61b4eadb7ccebeff522bc19f294620..0bbfd23ee3e598a9df9392cdb0d49c71970343fb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4043,3 +4043,4 @@
 ( cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/plugins/trayicon/Makefile.am;  cvs diff -u -r 1.14.2.71 -r 1.14.2.72 src/plugins/trayicon/trayicon.c;  cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/libeggtrayicon/.cvsignore;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 src/plugins/trayicon/libeggtrayicon/Makefile.am;  cvs diff -u -r -1.1.4.12 -r -1.1.4.13 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  cvs diff -u -r -1.1.4.3 -r -1.1.4.4 src/plugins/trayicon/libeggtrayicon/eggtrayicon.h;  cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c;  cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.h;  cvs diff -u -r -1.1.4.5 -r -1.1.4.6 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c;  cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h;  cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/libeggtrayicon/xembed.h;  ) > 3.7.6cvs45.patchset
 ( cvs diff -u -r 1.654.2.4114 -r 1.654.2.4115 configure.ac;  ) > 3.7.6cvs46.patchset
 ( cvs diff -u -r 1.14.2.72 -r 1.14.2.73 src/plugins/trayicon/trayicon.c;  ) > 3.7.6cvs47.patchset
+( cvs diff -u -r 1.14.2.73 -r 1.14.2.74 src/plugins/trayicon/trayicon.c;  ) > 3.7.6cvs48.patchset

diff --git a/configure.ac b/configure.ac
index baa59654ed2e852d4bb39447f9e24c2a3a6827c5..cf9e7ff2daf85e9c839967c59a6c7c14e8c8497b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 8b815953dc1f0a66f208239b54431a712a729d2f..0a827fcaa7b7f0542e0fbba501ad0c5746d2e8fd 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -64,7 +64,6 @@ static GdkPixbuf *unreadmarkedmail_pixbuf[2] = {NULL, NULL};
 static GdkPixbuf *nomail_pixbuf[2] = {NULL, NULL};
 
 static GtkStatusIcon *trayicon;
-static GtkWidget *image = NULL;
 static GtkWidget *focused_widget = NULL;
 
 static GtkWidget *traymenu_popup;
@@ -339,8 +338,7 @@ static gboolean trayicon_update_theme(gpointer source, gpointer data)
        stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL_OFFLINE, &unreadmarkedmail_pixbuf[1]);
        stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_NEWMARKEDMAIL_OFFLINE, &newmarkedmail_pixbuf[1]);
 
-       if (image != NULL)
-               update(NULL);
+       update(NULL);
 
        return FALSE;
 }