[uim-commit] r699 - trunk/helper

[makeinu at freedesktop.org]

Author: makeinu
Date: 2005-02-23 06:39:35 -0800 (Wed, 23 Feb 2005)
New Revision: 699

Modified:
   trunk/helper/toolbar-common-gtk.c
Log:
* helper/toolbar-common-gtk.c
  - Show switcher icon on system tray icon.
    Thanks 466 of [Anthy/uim thread 5].


Modified: trunk/helper/toolbar-common-gtk.c
===================================================================
--- trunk/helper/toolbar-common-gtk.c	2005-02-23 13:37:48 UTC (rev 698)
+++ trunk/helper/toolbar-common-gtk.c	2005-02-23 14:39:35 UTC (rev 699)
@@ -744,16 +744,12 @@
   }
 }
 
-static GtkWidget *
-toolbar_new(gint type)
+static void
+regist_icon(void)
 {
   GtkIconFactory *factory;
   GtkIconSet *icon_set;
   GdkPixbuf *pixbuf;
-  GtkWidget *button;
-  GtkWidget *hbox;
-  GList *menu_buttons = NULL;
-  GtkSizeGroup *sg;
 
   /* regist our icons */
   factory = gtk_icon_factory_new();
@@ -765,7 +761,18 @@
   gtk_icon_set_unref(icon_set);
   g_object_unref(G_OBJECT(pixbuf));
   g_object_unref(G_OBJECT (factory));
+}
 
+static GtkWidget *
+toolbar_new(gint type)
+{
+  GtkWidget *button;
+  GtkWidget *hbox;
+  GList *menu_buttons = NULL;
+  GtkSizeGroup *sg;
+
+  regist_icon();
+
   /* create widgets */
   hbox = gtk_hbox_new(FALSE, 0);
   prop_menu = gtk_menu_new();
@@ -812,6 +819,8 @@
 {
   GtkWidget *button;
 
+  regist_icon();
+
   prop_menu = gtk_menu_new();
   right_click_menu = right_click_menu_create();