Revision: 6286
Author: ek.kato
Date: Wed Mar 24 21:25:51 2010
Log: * Merge r6148, r6285 from trunk.
http://code.google.com/p/uim/source/detail?r=6286
Modified:
/branches/1.5/helper/Makefile.am
/branches/1.5/helper/dict-word-list-win-gtk.c
/branches/1.5/helper/dict-word-win-gtk.c
/branches/1.5/helper/eggtrayicon.c
/branches/1.5/helper/pref-gtk-custom-widgets.c
/branches/1.5/helper/pref-gtk.c
/branches/1.5/uim/Makefile.am
=======================================
--- /branches/1.5/helper/Makefile.am Wed Mar 24 19:48:48 2010
+++ /branches/1.5/helper/Makefile.am Wed Mar 24 21:25:51 2010
@@ -72,6 +72,7 @@
uim_toolbar_gtk_systray_SOURCES = toolbar-systray-gtk.c
toolbar-common-gtk.c \
eggtrayicon.c eggtrayicon.h
uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
+ @X11_LIBS@ \
$(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
=======================================
--- /branches/1.5/helper/dict-word-list-win-gtk.c Tue Jan 27 03:03:13 2009
+++ /branches/1.5/helper/dict-word-list-win-gtk.c Wed Mar 24 21:25:51 2010
@@ -224,7 +224,7 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK,
- _(message));
+ "%s", _(message));
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(GTK_WIDGET(dialog));
}
@@ -474,7 +474,7 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_OK_CANCEL,
- message);
+ "%s", message);
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window));
gtk_window_set_position(GTK_WINDOW(dialog),
GTK_WIN_POS_CENTER_ON_PARENT);
g_signal_connect(G_OBJECT(dialog), "response",
@@ -497,13 +497,13 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
- _("Word deletion succeded."));
+ "%s", _("Word deletion succeded."));
} else {
dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("Word deletion failed."));
+ "%s", _("Word deletion failed."));
}
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window));
gtk_window_set_position(GTK_WINDOW(dialog),
GTK_WIN_POS_CENTER_ON_PARENT);
=======================================
--- /branches/1.5/helper/dict-word-win-gtk.c Tue Jan 27 02:07:23 2009
+++ /branches/1.5/helper/dict-word-win-gtk.c Wed Mar 24 21:25:51 2010
@@ -497,14 +497,14 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("Word registration failed."));
+ "%s", _("Word registration failed."));
} else {
g_signal_emit(G_OBJECT(window),
word_window_signals[WORD_ADDED_SIGNAL], 0);
dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
- _("Word registration succeded."));
+ "%s", _("Word registration succeded."));
}
g_signal_connect(G_OBJECT(dialog), "response",
@@ -534,7 +534,7 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("Phonetic is emtpy!"));
+ "%s", _("Phonetic is emtpy!"));
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(message_dialog_response_cb), window);
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window));
@@ -549,7 +549,7 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("Literal is emtpy!"));
+ "%s", _("Literal is emtpy!"));
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(message_dialog_response_cb), window);
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window));
@@ -567,7 +567,7 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("Part of speech is emtpy!"));
+ "%s", _("Part of speech is emtpy!"));
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(message_dialog_response_cb), window);
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window));
=======================================
--- /branches/1.5/helper/eggtrayicon.c Fri Nov 20 19:44:49 2009
+++ /branches/1.5/helper/eggtrayicon.c Wed Mar 24 21:25:51 2010
@@ -227,7 +227,7 @@
if (xev->xany.type == ClientMessage &&
xev->xclient.message_type == icon->manager_atom &&
- xev->xclient.data.l[1] == icon->selection_atom)
+ xev->xclient.data.l[1] == (long)icon->selection_atom)
{
egg_tray_icon_update_manager_window (icon, TRUE);
}
=======================================
--- /branches/1.5/helper/pref-gtk-custom-widgets.c Tue Jan 20 18:16:35 2009
+++ /branches/1.5/helper/pref-gtk-custom-widgets.c Wed Mar 24 21:25:51 2010
@@ -1514,7 +1514,7 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO,
GTK_BUTTONS_CANCEL,
- _("Press keys to grab (e.g. <Control>a)"));
+ "%s", _("Press keys to grab (e.g.
<Control>a)"));
gtk_window_set_title(GTK_WINDOW(dialog), _("Grabbing keys"));
g_signal_connect(G_OBJECT(dialog), "key-press-event",
G_CALLBACK(grab_win_key_press_cb), key_entry);
=======================================
--- /branches/1.5/helper/pref-gtk.c Tue Jan 20 18:16:35 2009
+++ /branches/1.5/helper/pref-gtk.c Wed Mar 24 21:25:51 2010
@@ -223,7 +223,7 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
- _("Some value(s) have been changed.\n"
+ "%s", _("Some value(s) have been changed.\n"
"Do you really quit this program?"));
gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(pref_window));
gtk_window_set_position(GTK_WINDOW(dialog),
GTK_WIN_POS_CENTER_ON_PARENT);
@@ -587,7 +587,7 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK,
- _(message));
+ "%s", _(message));
if (pref_window) {
gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(pref_window));
gtk_window_set_position(GTK_WINDOW(dialog),
GTK_WIN_POS_CENTER_ON_PARENT);
=======================================
--- /branches/1.5/uim/Makefile.am Mon May 12 08:31:29 2008
+++ /branches/1.5/uim/Makefile.am Wed Mar 24 21:25:51 2010
@@ -217,7 +217,8 @@
if LIBUIM_X_UTIL
libuim_x_util_la_SOURCES = uim-x-util.h uim-x-kana-input-hack.c
libuim_x_util_la_CPPFLAGS = -I$(top_srcdir)
-libuim_x_util_la_CFLAGS = @X_CFLAGS@
+libuim_x_util_la_CFLAGS = @X11_CFLAGS@
+libuim_x_util_la_LIBADD = @X11_LIBS@
endif
To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or
reply to this email with the words "REMOVE ME" as the subject.
