[uim-commit] r481 - trunk/helper

[kzk at freedesktop.org]

Author: kzk
Date: 2005-02-02 09:09:35 -0800 (Wed, 02 Feb 2005)
New Revision: 481

Modified:
   trunk/helper/Makefile.am
   trunk/helper/toolbar-applet-gnome.c
   trunk/helper/toolbar-common-gtk.c
Log:
* helper/Makefile.am
  - rename uim-im-switcher-gtk from uim-im-switcher

* helper/toolbar-common-gtk.c
* helper/toolbar-applet-gnome.c
  - exec uim-im-switcher-gtk instead of uim-im-switcher


Modified: trunk/helper/Makefile.am
===================================================================
--- trunk/helper/Makefile.am	2005-02-02 17:00:28 UTC (rev 480)
+++ trunk/helper/Makefile.am	2005-02-02 17:09:35 UTC (rev 481)
@@ -37,7 +37,7 @@
 
 if GTK2
 
-bin_PROGRAMS = uim-candwin-gtk uim-toolbar-gtk uim-toolbar-gtk-systray uim-im-switcher uim-input-pad-ja
+bin_PROGRAMS = uim-candwin-gtk uim-toolbar-gtk uim-toolbar-gtk-systray uim-im-switcher-gtk uim-input-pad-ja
 
 if DICT
 bin_PROGRAMS += uim-dict
@@ -62,10 +62,10 @@
 uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 uim_toolbar_gtk_systray_CFLAGS   = @GTK2_CFLAGS@  -Wall
 
-uim_im_switcher_SOURCES  = im-switcher-gtk.c
-uim_im_switcher_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
-uim_im_switcher_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
-uim_im_switcher_CFLAGS   = @GTK2_CFLAGS@ -Wall
+uim_im_switcher_gtk_SOURCES  = im-switcher-gtk.c
+uim_im_switcher_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
+uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+uim_im_switcher_gtk_CFLAGS   = @GTK2_CFLAGS@ -Wall
 
 uim_input_pad_ja_SOURCES  = input-pad-ja.c
 uim_input_pad_ja_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la

Modified: trunk/helper/toolbar-applet-gnome.c
===================================================================
--- trunk/helper/toolbar-applet-gnome.c	2005-02-02 17:00:28 UTC (rev 480)
+++ trunk/helper/toolbar-applet-gnome.c	2005-02-02 17:09:35 UTC (rev 481)
@@ -77,7 +77,7 @@
 static void
 exec_switcher(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
 {
-  system("uim-im-switcher &");
+  system("uim-im-switcher-gtk &");
 }
 
 static void

Modified: trunk/helper/toolbar-common-gtk.c
===================================================================
--- trunk/helper/toolbar-common-gtk.c	2005-02-02 17:00:28 UTC (rev 480)
+++ trunk/helper/toolbar-common-gtk.c	2005-02-02 17:09:35 UTC (rev 481)
@@ -453,7 +453,7 @@
 static void
 menu_switcher_activated(GtkMenu *menu_item, gpointer data)
 {
-  system("uim-im-switcher &");
+  system("uim-im-switcher-gtk &");
 }
 
 static void
@@ -700,8 +700,8 @@
   } else if(event->button == 2) {
     gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
   } else {
-    /* exec uim-im-switcher */
-    system("uim-im-switcher &");
+    /* exec uim-im-switcher-gtk */
+    system("uim-im-switcher-gtk &");
   }
 }