Author: yamakenz
Date: Sat Mar 29 06:33:30 2008
New Revision: 5362
Modified:
branches/1.5/configure.ac
branches/1.5/emacs/Makefile.am
branches/1.5/emacs/uim-version.el.in
branches/1.5/notify/Makefile.am
branches/1.5/notify/uim-libnotify.c
branches/1.5/po/ja.po
branches/1.5/qt4/immodule/Makefile.am
Log:
* branches/1.5
- Merge -r5354:5360 from trunk
Modified: branches/1.5/configure.ac
==============================================================================
--- branches/1.5/configure.ac (original)
+++ branches/1.5/configure.ac Sat Mar 29 06:33:30 2008
@@ -929,6 +929,8 @@
if test "x$with_libedit" != "xno"; then
use_libedit="yes"
libedit_path="$withval"
+ else
+ use_libedit="no"
fi
],
[use_libedit="yes"])
@@ -1517,6 +1519,7 @@
xim/Makefile
fep/Makefile
emacs/Makefile
+ emacs/uim-version.el
test/Makefile
examples/Makefile
examples/uim-custom/Makefile
Modified: branches/1.5/emacs/Makefile.am
==============================================================================
--- branches/1.5/emacs/Makefile.am (original)
+++ branches/1.5/emacs/Makefile.am Sat Mar 29 06:33:30 2008
@@ -27,9 +27,4 @@
uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
-if MAINTAINER_MODE
-uim-version.el: uim-version.el.in $(top_srcdir)/configure.ac
- sed -e 's/@\(VERSION\)@/$(VERSION)/' uim-version.el.in > $@
-endif
-
endif
Modified: branches/1.5/emacs/uim-version.el.in
==============================================================================
--- branches/1.5/emacs/uim-version.el.in (original)
+++ branches/1.5/emacs/uim-version.el.in Sat Mar 29 06:33:30 2008
@@ -34,5 +34,5 @@
;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;
-(defconst uim-el-version "@VERSION@")
+(defconst uim-el-version "@PACKAGE_VERSION@")
(provide 'uim-version)
Modified: branches/1.5/notify/Makefile.am
==============================================================================
--- branches/1.5/notify/Makefile.am (original)
+++ branches/1.5/notify/Makefile.am Sat Mar 29 06:33:30 2008
@@ -4,6 +4,8 @@
uimnotify_plugindir = $(pkglibdir)/notify
if LIBNOTIFY
+# XXX
+CFLAGS+= -Wno-error
uimnotify_plugin_LTLIBRARIES += libuimnotify-libnotify.la
libuimnotify_libnotify_la_SOURCES = uim-libnotify.c
libuimnotify_libnotify_la_CFLAGS = @LIBNOTIFY_CFLAGS@
Modified: branches/1.5/notify/uim-libnotify.c
==============================================================================
--- branches/1.5/notify/uim-libnotify.c (original)
+++ branches/1.5/notify/uim-libnotify.c Sat Mar 29 06:33:30 2008
@@ -37,6 +37,7 @@
#include <stdarg.h>
#include <string.h>
#include <glib.h>
+#include <glib/gconvert.h>
#include <libnotify/notify.h>
#include "uim.h" /* for uim_bool */
@@ -52,17 +53,26 @@
NotifyNotification *notification;
GError *error = NULL;
gboolean ret;
+ gchar *gmsg;
+ gsize read, written;
strlcpy(body_short, body, sizeof(body_short));
fprintf(stderr, "libuim: %s\n", body);
+ gmsg = g_locale_to_utf8(body_short, -1, &read, &written, NULL);
+
+ if (!gmsg) {
+ fprintf(stderr, "libnotify: cannot convert to utf8\n");
+ return UIM_FALSE;
+ }
+
if (!notify_is_initted()) {
fprintf(stderr, "libnotify: libnotify is not initted\n");
return UIM_FALSE;
}
- notification = notify_notification_new("uim", body_short, UIM_ICON, NULL);
+ notification = notify_notification_new("uim", gmsg, UIM_ICON, NULL);
if (!notification) {
fprintf(stderr, "notify_notification_new: can not create notification
object\n");
@@ -79,6 +89,7 @@
return UIM_FALSE;
}
+ g_free(gmsg);
g_object_unref(G_OBJECT(notification));
return UIM_TRUE;
Modified: branches/1.5/po/ja.po
==============================================================================
--- branches/1.5/po/ja.po (original)
+++ branches/1.5/po/ja.po Sat Mar 29 06:33:30 2008
@@ -4277,11 +4277,11 @@
#: ../scm/tutcode-custom.scm:54
msgid "Mazegaki dictionary file"
-msgstr "混ぜ書き辞書ファイル"
+msgstr "交ぜ書き変換辞書ファイル"
#: ../scm/tutcode-custom.scm:61
msgid "Personal mazegaki dictionary file"
-msgstr "混ぜ書き個人辞書ファイル"
+msgstr "交ぜ書き変換個人用辞書ファイル"
#: ../scm/tutcode-custom.scm:68
msgid "Code table file"
@@ -4292,10 +4292,12 @@
"Code table name is 'filename-rule' when code table file name is 'filename."
"scm'."
msgstr ""
+"コード表ファイル名がfilename.scmの場合、そのファイル内のfilename-rule変数を"
+"コード表として使用する"
#: ../scm/tutcode-custom.scm:74
msgid "Enable learning in mazegaki conversion"
-msgstr "混ぜ書き変換の学習を有効にする"
+msgstr "交ぜ書き変換の学習を有効にする"
#: ../scm/tutcode-custom.scm:86
msgid "Use Dvorak keyboard"
@@ -4323,11 +4325,11 @@
#: ../scm/tutcode-key-custom.scm:65
msgid "[TUT-Code] mazegaki conversion mode"
-msgstr "[TUT-Code] 混ぜ書き変換モード"
+msgstr "[TUT-Code] 交ぜ書き変換モード"
#: ../scm/tutcode-key-custom.scm:71
msgid "[TUT-Code] bushu conversion mode"
-msgstr "[TUT-Code] 部首変換モード"
+msgstr "[TUT-Code] 部首合成変換モード"
#: ../scm/tutcode-key-custom.scm:77
msgid "[TUT-Code] begin conversion"
Modified: branches/1.5/qt4/immodule/Makefile.am
==============================================================================
--- branches/1.5/qt4/immodule/Makefile.am (original)
+++ branches/1.5/qt4/immodule/Makefile.am Sat Mar 29 06:33:30 2008
@@ -9,15 +9,15 @@
distclean:
$(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
$(MAKE) $(AM_MAKEFLAGS) distclean-am
- -rm -f Makefile
+ -rm -f Makefile quiminputcontextplugin.pro
else
distclean:
- -rm -f Makefile
+ -rm -f Makefile quiminputcontextplugin.pro
endif
FORCE:
-EXTRA_DIST = COPYING README.en README.ja INDENT \
+EXTRA_DIST = README.en README.ja INDENT \
quiminputcontextplugin.pro.in \
quiminputcontext_with_slave.h \
quiminputcontext_with_slave.cpp
