Fix crash after 'lxpanelctl exit' command.
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Wed, 20 Aug 2014 22:47:11 +0000 (01:47 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Wed, 20 Aug 2014 22:47:11 +0000 (01:47 +0300)
plugins/tray.c
src/plugin.c

index 68051aa..ace9713 100644 (file)
@@ -101,6 +101,7 @@ static TrayClient * client_lookup(TrayPlugin * tr, Window window)
     return NULL;
 }
 
+#if 0
 static void client_print(TrayPlugin * tr, char c, TrayClient * tc, XClientMessageEvent * xevent)
 {
         char *name = get_utf8_property(tc->window, a_NET_WM_NAME);
@@ -114,11 +115,12 @@ static void client_print(TrayPlugin * tr, char c, TrayClient * tc, XClientMessag
                 xevent->serial, xevent->send_event ? 'y' : 'n', xevent->format);
         g_free(name);
 }
+#endif
 
 /* Delete a client. */
 static void client_delete(TrayPlugin * tr, TrayClient * tc, gboolean unlink, gboolean remove)
 {
-    client_print(tr, '-', tc, NULL);
+    //client_print(tr, '-', tc, NULL);
 
     if (unlink)
     {
index 703267f..1fd3e9b 100644 (file)
@@ -451,9 +451,6 @@ void _unload_modules(void)
     GHashTableIter iter;
     gpointer key, val;
 
-#ifndef DISABLE_PLUGINS_LOADING
-    fm_module_unregister_type("lxpanel_gtk");
-#endif
     g_hash_table_iter_init(&iter, _all_types);
     while(g_hash_table_iter_next(&iter, &key, &val))
     {
@@ -465,6 +462,9 @@ void _unload_modules(void)
         }
     }
     g_hash_table_destroy(_all_types);
+#ifndef DISABLE_PLUGINS_LOADING
+    fm_module_unregister_type("lxpanel_gtk");
+#endif
     old_plugins_loaded = FALSE;
 }