Revision: 7076
Author: ek.kato
Date: Wed May 11 21:26:04 2011
Log: * Merge r7064:7075 from trunk.
http://code.google.com/p/uim/source/detail?r=7076
Modified:
/branches/1.7
/branches/1.7/NEWS
/branches/1.7/configure.ac
/branches/1.7/gtk3/toolbar/applet-gnome3.c
/branches/1.7/helper/toolbar-applet-gnome.c
/branches/1.7/helper/toolbar-common-gtk.c
/branches/1.7/tables/Makefile.am
=======================================
--- /branches/1.7/NEWS Mon May 9 18:41:09 2011
+++ /branches/1.7/NEWS Wed May 11 21:26:04 2011
@@ -1,3 +1,9 @@
+Overview of changes from 1.7.0-alpha to 1.7.0
+=============================================
+* Fixes
+ - Correct Wubi86 and Zhengma tables
+
+
Overview of changes from 1.6.x to 1.7.0-alpha
=============================================
* New features
=======================================
--- /branches/1.7/configure.ac Tue May 10 10:45:18 2011
+++ /branches/1.7/configure.ac Wed May 11 21:26:04 2011
@@ -859,8 +859,8 @@
dnl ******************************
AC_ARG_WITH(gtk3,
AC_HELP_STRING([--with-gtk3],
- [build gtk3 helper applications
- @<:@default=no@:>@]),
+ [build GTK+3 immodule and helper applications
+ @<:@default=yes@:>@]),
[
case $with_gtk3 in
no)
@@ -878,7 +878,7 @@
AC_ARG_ENABLE(gnome3-applet,
AC_HELP_STRING([--enable-gnome3-applet],
[enable uim applet for Gnome3 panel
- @<:@default=no@:>@]),
+ @<:@default=yet@:>@]),
[
case $enable_gnome3_applet in
no)
=======================================
--- /branches/1.7/gtk3/toolbar/applet-gnome3.c Fri May 6 20:20:14 2011
+++ /branches/1.7/gtk3/toolbar/applet-gnome3.c Wed May 11 21:26:04 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 */
=======================================
--- /branches/1.7/helper/toolbar-applet-gnome.c Mon Feb 14 06:26:14 2011
+++ /branches/1.7/helper/toolbar-applet-gnome.c Wed May 11 21:26:04 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 */
=======================================
--- /branches/1.7/helper/toolbar-common-gtk.c Mon May 9 22:21:02 2011
+++ /branches/1.7/helper/toolbar-common-gtk.c Wed May 11 21:26:04 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
=======================================
--- /branches/1.7/tables/Makefile.am Wed Jul 28 01:48:02 2010
+++ /branches/1.7/tables/Makefile.am Wed May 11 21:26:04 2011
@@ -32,7 +32,7 @@
$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/replace && \
$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/uim sigscheme-combined && \
$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/uim uim-sh && \
- echo "(begin (load \"$<\") (for-each (lambda (key) (display (format \"~a
~W\n\" (apply string-append (caar key)) (cadr key)))) `basename
$< .scm`-rule))" | $(UIM_SH_ENV) $(UIM_SH) -b | grep -v "^#<undef>" | sort
$@
+ echo "(begin (load \"$<\") (for-each (lambda (key) (display (format \"~a
~W\n\" (apply string-append (caar key)) (cadr key)))) `basename
$< .scm`-rule))" | $(UIM_SH_ENV) $(UIM_SH) -b | grep -v "^#<undef>" |
LANG=C sort > $@
#endif
clean-genscm:
