talons

commit 74b96dc15bdf752d561d84d5c0e2a48b2275f707
parent fdc7c775b7eef124f804efc59e1d7b222cec7378
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  2 Oct 2010 15:38:13 +0000

2010-10-02 [colin]	3.7.6cvs48

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

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

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