fixed systray crash by mart1987

diff --git a/ChangeLog b/ChangeLog
index 5d674ec3f42b4b2a557ecc8cf7b936f7e1164f31..15ddfbf7c5abf590ce3613a9592c062b7bd303bf 100644 (file)
--- 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 9842384443b7653b02e9c768a68374709f81b65a..069a3fc8aa998a7f103699d2889e2f310f85acc1 100644 (file)
--- 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 2720ee4491a79e39121b8c847ae89b1aec41764b..21b8f0be9e6c976ce2af2b43a5be4ae4d9263435 100644 (file)
--- 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>";