[uim] r7074 committed - * helper/toolbar-common-gtk.c...

[codesite-noreply]

Revision: 7074
Author:   ek.kato
Date:     Wed May 11 21:18:42 2011
Log:      * helper/toolbar-common-gtk.c
  - (uim_launch_helper_application) : Rename to
    uim_toolbar_launch_helper_application.
  - (uim_toolbar_launch_helper_application) : Renamed from
    uim_launch_helper_application.
* helper/toolbar-applet-gnome.c : Follow the change.
* gtk3/applet-gnome3.c : Ditto.
http://code.google.com/p/uim/source/detail?r=7074

Modified:
 /trunk/gtk3/toolbar/applet-gnome3.c
 /trunk/helper/toolbar-applet-gnome.c
 /trunk/helper/toolbar-common-gtk.c

=======================================
--- /trunk/gtk3/toolbar/applet-gnome3.c Fri May  6 20:20:14 2011
+++ /trunk/gtk3/toolbar/applet-gnome3.c Wed May 11 21:18:42 2011
@@ -53,7 +53,7 @@
 static void display_about_dialog(GtkAction *action, gpointer data);

 extern GtkWidget *uim_toolbar_applet_new(void);
-extern void uim_launch_helper_application(const char *command);
+extern void uim_toolbar_launch_helper_application(const char *command);


 static const GtkActionEntry uim_menu_actions[] = {
@@ -85,37 +85,37 @@
 static void
 exec_switcher(GtkAction *action, gpointer data)
 {
-  uim_launch_helper_application("uim-im-switcher-gtk3");
+  uim_toolbar_launch_helper_application("uim-im-switcher-gtk3");
 }

 static void
 exec_pref(GtkAction *action, gpointer data)
 {
-  uim_launch_helper_application("uim-pref-gtk3");
+  uim_toolbar_launch_helper_application("uim-pref-gtk3");
 }

 static void
 exec_dic(GtkAction *action, gpointer data)
 {
-  uim_launch_helper_application("uim-dict-gtk3");
+  uim_toolbar_launch_helper_application("uim-dict-gtk3");
 }

 static void
 exec_pad(GtkAction *action, gpointer data)
 {
-  uim_launch_helper_application("uim-input-pad-ja-gtk3");
+  uim_toolbar_launch_helper_application("uim-input-pad-ja-gtk3");
 }

 static void
 exec_hand(GtkAction *action, gpointer data)
 {
-  uim_launch_helper_application("uim-tomoe-gtk");
+  uim_toolbar_launch_helper_application("uim-tomoe-gtk");
 }

 static void
 exec_help(GtkAction *uic, gpointer data)
 {
-  uim_launch_helper_application("uim-help");
+  uim_toolbar_launch_helper_application("uim-help");
 }

 /* Just the about window... If it's already open, just focus it */
=======================================
--- /trunk/helper/toolbar-applet-gnome.c        Mon Feb 14 06:26:14 2011
+++ /trunk/helper/toolbar-applet-gnome.c        Wed May 11 21:18:42 2011
@@ -51,7 +51,7 @@
 static void display_about_dialog(BonoboUIComponent *uic, gpointer data,  
const gchar *verbname);

 extern GtkWidget *uim_toolbar_applet_new(void);
-extern void uim_launch_helper_application(const char *command);
+extern void uim_toolbar_launch_helper_application(const char *command);


 static const BonoboUIVerb uim_menu_verbs[] = {
@@ -89,37 +89,37 @@
 static void
 exec_switcher(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
 {
-  uim_launch_helper_application("uim-im-switcher-gtk");
+  uim_toolbar_launch_helper_application("uim-im-switcher-gtk");
 }

 static void
 exec_pref(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
 {
-  uim_launch_helper_application("uim-pref-gtk");
+  uim_toolbar_launch_helper_application("uim-pref-gtk");
 }

 static void
 exec_dic(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
 {
-  uim_launch_helper_application("uim-dict-gtk");
+  uim_toolbar_launch_helper_application("uim-dict-gtk");
 }

 static void
 exec_pad(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
 {
-  uim_launch_helper_application("uim-input-pad-ja");
+  uim_toolbar_launch_helper_application("uim-input-pad-ja");
 }

 static void
 exec_hand(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
 {
-  uim_launch_helper_application("uim-tomoe-gtk");
+  uim_toolbar_launch_helper_application("uim-tomoe-gtk");
 }

 static void
 exec_help(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
 {
-  uim_launch_helper_application("uim-help");
+  uim_toolbar_launch_helper_application("uim-help");
 }

 /* Just the about window... If it's already open, just focus it */
=======================================
--- /trunk/helper/toolbar-common-gtk.c  Mon May  9 22:21:02 2011
+++ /trunk/helper/toolbar-common-gtk.c  Wed May 11 21:18:42 2011
@@ -58,7 +58,7 @@
 GtkWidget *uim_toolbar_applet_new(void);
 void uim_toolbar_check_helper_connection(GtkWidget *widget);
 void uim_toolbar_get_im_list(void);
-void uim_launch_helper_application(const char *command);
+void uim_toolbar_launch_helper_application(const char *command);


 enum {
@@ -281,7 +281,7 @@
 }

 void
-uim_launch_helper_application(const char *command)
+uim_toolbar_launch_helper_application(const char *command)
 {
   if (command) {
     if (!g_spawn_command_line_async(command, NULL)) {
@@ -298,7 +298,7 @@
 right_click_menu_activated(GtkMenu *menu_item, gpointer data)
 {
   const char *command = data;
-  uim_launch_helper_application(command);
+  uim_toolbar_launch_helper_application(command);
 }

 static gboolean