From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Sun, 19 Jul 2009 17:53:30 +0000 (+0000)
Subject: fixed systray crash by mart1987
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=6cec73e05579a2a57f27b9b49fc567e8500e446c;p=chaz%2Ftint2

fixed systray crash by mart1987
---

diff --git a/ChangeLog b/ChangeLog
index 5d674ec..15ddfbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-07-19
+- fixed systray crash by mart1987
+
 2009-07-14
 - play with some tint2conf code
 
diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 9842384..069a3fc 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -79,10 +79,9 @@ void init_systray()
 void cleanup_systray()
 {
    if (systray.list_icons) {
-		GSList *it;
-
-		for (it = systray.list_icons; it; it = it->next)
-			remove_icon((TrayWindow*)it->data);
+		// remove_icon change systray.list_icons
+		while(systray.list_icons)
+			remove_icon((TrayWindow*)systray.list_icons->data);
 
       g_slist_free(systray.list_icons);
       systray.list_icons = 0;
diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c
index 2720ee4..21b8f0b 100644
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -25,7 +25,6 @@
 #include <glib/gi18n.h>
 
 
-// gcc -Wall -g main.c -o tint2conf `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0 --libs gthread-2.0`
 // need GTK+-2.4 ou plus
 
 #define LONG_VERSION_STRING "0.2"
@@ -39,9 +38,6 @@ static const char *fallback_ui_file =
         "    </menu>"
         "  </menubar>"
         "  <toolbar  name='ToolBar'>"
-        "    <toolitem action='ViewRefreshAll'/>"
-        "    <separator/>"
-        "    <toolitem action='ThemeProperties'/>"
         "    <toolitem action='ViewApply'/>"
         "  </toolbar>"
         "</ui>";