Revision: 6954
Author: nogu.dev
Date: Sun Feb 13 07:00:59 2011
Log: * gtk3/toolbar/toolbar-applet-gnome3.c
- Lunch GTK+3 helper applications from GTK+3 toolbar.
* helper/toolbar-common-gtk.c
- Ditto.
http://code.google.com/p/uim/source/detail?r=6954
Modified:
/trunk/gtk3/toolbar/toolbar-applet-gnome3.c
/trunk/helper/toolbar-common-gtk.c
=======================================
--- /trunk/gtk3/toolbar/toolbar-applet-gnome3.c Sun Feb 13 04:10:29 2011
+++ /trunk/gtk3/toolbar/toolbar-applet-gnome3.c Sun Feb 13 07:00:59 2011
@@ -85,25 +85,25 @@
static void
exec_switcher(GtkAction *action, gpointer data)
{
- system("uim-im-switcher-gtk &");
+ system("uim-im-switcher-gtk3 &");
}
static void
exec_pref(GtkAction *action, gpointer data)
{
- system("uim-pref-gtk &");
+ system("uim-pref-gtk3 &");
}
static void
exec_dic(GtkAction *action, gpointer data)
{
- system("uim-dict-gtk &");
+ system("uim-dict-gtk3 &");
}
static void
exec_pad(GtkAction *action, gpointer data)
{
- system("uim-input-pad-ja &");
+ system("uim-input-pad-ja-gtk3 &");
}
static void
=======================================
--- /trunk/helper/toolbar-common-gtk.c Fri Feb 11 19:07:35 2011
+++ /trunk/helper/toolbar-common-gtk.c Sun Feb 13 07:00:59 2011
@@ -86,7 +86,11 @@
N_("Switch input method"),
NULL,
"im_switcher",
+#if GTK_CHECK_VERSION(2, 90, 0)
+ "uim-im-switcher-gtk3",
+#else
"uim-im-switcher-gtk",
+#endif
"toolbar-show-switcher-button?",
UIM_FALSE
},
@@ -95,7 +99,11 @@
N_("Preference"),
NULL,
GTK_STOCK_PREFERENCES,
+#if GTK_CHECK_VERSION(2, 90, 0)
+ "uim-pref-gtk3",
+#else
"uim-pref-gtk",
+#endif
"toolbar-show-pref-button?",
UIM_FALSE
},
@@ -104,7 +112,11 @@
N_("Japanese dictionary editor"),
NULL,
"uim-dict",
+#if GTK_CHECK_VERSION(2, 90, 0)
+ "uim-dict-gtk3",
+#else
"uim-dict-gtk",
+#endif
"toolbar-show-dict-button?",
UIM_FALSE
},
@@ -113,7 +125,11 @@
N_("Input pad"),
NULL,
GTK_STOCK_BOLD,
+#if GTK_CHECK_VERSION(2, 90, 0)
+ "uim-input-pad-ja-gtk3",
+#else
"uim-input-pad-ja",
+#endif
"toolbar-show-input-pad-button?",
UIM_FALSE
},
