fixed segfault on tray application due to tint2

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 7b6b3c5dd06b05d0b1341bf9f4ce515e70da6b5f..f54bebe6ee9c5d4e411dbfa4f664ed2cd3ea8c7d 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -86,8 +86,8 @@ void init ()
 
 void cleanup()
 {
-       cleanup_panel();
        cleanup_systray();
+       cleanup_panel();
 
    if (time1_font_desc) pango_font_description_free(time1_font_desc);
    if (time2_font_desc) pango_font_description_free(time2_font_desc);
@@ -551,7 +551,7 @@ load_config:
                                        case DestroyNotify:
                                                for (it = systray.list_icons; it; it = g_slist_next(it)) {
                                                        if (((TrayWindow*)it->data)->id == e.xany.window) {
-                                                               icon_remove((TrayWindow*)it->data);
+                                                               remove_icon((TrayWindow*)it->data);
                                                                break;
                                                        }
                                                }