[uim] push by nogu....@gmail.com - Prevent systray-gtk from becoming defunct.... on 2012-04-30 06:25 GMT

[codesite-noreply]

Revision: c9995145d097
Author:   Muneyuki Noguchi <nogu....@gmail.com>
Date:     Sun Apr 29 23:18:50 2012
Log:      Prevent systray-gtk from becoming defunct.
* gtk2/toolbar/common-gtk.c
  - (right_click_menu_quit_activated):
    Call uim_quit() after "Quit this toolbar" is selected.
* gtk2/toolbar/systray-gtk.c
  - (systray_unrealize_cb): Remove.
  - (main): Don't call systray_unrealize_cb after "unrealize"
    to prevent systray-gtk from becoming a defunct process.

http://code.google.com/p/uim/source/detail?r=c9995145d097

Modified:
 /gtk2/toolbar/common-gtk.c
 /gtk2/toolbar/systray-gtk.c

=======================================
--- /gtk2/toolbar/common-gtk.c  Mon Mar 19 06:24:34 2012
+++ /gtk2/toolbar/common-gtk.c  Sun Apr 29 23:18:50 2012
@@ -278,6 +278,7 @@
 right_click_menu_quit_activated(GtkMenu *menu_item, gpointer data)
 {
   gtk_main_quit();
+  uim_quit();
 }

 void
=======================================
--- /gtk2/toolbar/systray-gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/toolbar/systray-gtk.c Sun Apr 29 23:18:50 2012
@@ -57,13 +57,6 @@

   gtk_widget_show_all(user_data);
 }
-
-static void
-systray_unrealize_cb(GtkWidget *widget, gpointer user_data)
-{
-  uim_quit();
-  exit(0);
-}

 int
 main(int argc, char *argv[])
@@ -85,7 +78,6 @@

   icon = uim_toolbar_trayicon_new();
   g_signal_connect(G_OBJECT(tray), "embedded", G_CALLBACK(embedded_cb),  
icon);
-  g_signal_connect_after(G_OBJECT(tray), "unrealize",  
G_CALLBACK(systray_unrealize_cb), NULL);

   gtk_container_add(GTK_CONTAINER(tray), icon);
   gtk_widget_show(GTK_WIDGET(tray));