Revision: 7020
Author: ek.kato
Date: Sat May 7 07:55:59 2011
Log: * gtk/gtk-im-uim.c
- (im_module_init)
- (im_module_exit)
- Use uim_counted_init() and uim_counted_quit() for QGtkStyle
in Qt4.
* gtk/Makefile.am (im_uim_la_LIBADD) : Add libuim-counted-init.la.
* qt4/immodule/plugin.cpp
- (UimInputContextPlugin::uimInit)
- (UimInputContextPlugin::uimQuit)
- Use uim_counted_init() and uim_counted_quit() for QGtkStyle.
* qt4/immoculd/quiminputcontextplugin.pro.in (LIBS) : Add
libuim-counted-init.a.
* uim/counted-init.c (uim_init_count) : Move the variable into uim.c.
* uim/uim.c (uim_init_count) : Moved from counted-init.c.
* uim/counted-init.h (uim_init_count) : Extern the variable.
http://code.google.com/p/uim/source/detail?r=7020
Modified:
/trunk/gtk/Makefile.am
/trunk/gtk/gtk-im-uim.c
/trunk/qt4/immodule/plugin.cpp
/trunk/qt4/immodule/quiminputcontextplugin.pro.in
/trunk/uim/counted-init.c
/trunk/uim/counted-init.h
/trunk/uim/uim.c
=======================================
--- /trunk/gtk/Makefile.am Sun Jun 13 00:30:03 2010
+++ /trunk/gtk/Makefile.am Sat May 7 07:55:59 2011
@@ -15,7 +15,8 @@
im_uim_la_SOURCES = $(IM_UIM_SOURCES)
im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
- $(top_builddir)/uim/libuim.la
+ $(top_builddir)/uim/libuim.la \
+ $(top_builddir)/uim/libuim-counted-init.la
if LIBUIM_X_UTIL
im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la
endif
=======================================
--- /trunk/gtk/gtk-im-uim.c Sat Feb 12 04:49:42 2011
+++ /trunk/gtk/gtk-im-uim.c Sat May 7 07:55:59 2011
@@ -55,6 +55,7 @@
#include "uim/uim-im-switcher.h"
#include "uim/gettext.h"
#include "uim/uim-scm.h"
+#include "uim/counted-init.h"
#include "gtk-im-uim.h"
#include "uim-cand-win-gtk.h"
@@ -1656,7 +1657,7 @@
void
im_module_init(GTypeModule *type_module)
{
- if (uim_init() == -1)
+ if (uim_counted_init() == -1)
return;
context_list.next = (IMUIMContext *)&context_list;
@@ -1689,5 +1690,5 @@
#ifdef GDK_WINDOWING_X11
im_uim_release_compose_tree();
#endif
- uim_quit();
-}
+ uim_counted_quit();
+}
=======================================
--- /trunk/qt4/immodule/plugin.cpp Thu Jan 6 18:09:56 2011
+++ /trunk/qt4/immodule/plugin.cpp Sat May 7 07:55:59 2011
@@ -42,6 +42,7 @@
#include "uim/uim.h"
#include "uim/uim-x-util.h"
+#include "uim/counted-init.h"
#include "quiminfomanager.h"
#include "quiminputcontext_with_slave.h"
@@ -107,7 +108,7 @@
void UimInputContextPlugin::uimInit()
{
- if ( !uim_init() ) {
+ if ( !uim_counted_init() ) {
if (!infoManager)
infoManager = new QUimInfoManager();
#if UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK
@@ -121,7 +122,7 @@
{
if ( uimReady )
{
- uim_quit();
+ uim_counted_quit();
delete infoManager;
uimReady = false;
}
=======================================
--- /trunk/qt4/immodule/quiminputcontextplugin.pro.in Mon Jan 31 23:56:57
2011
+++ /trunk/qt4/immodule/quiminputcontextplugin.pro.in Sat May 7 07:55:59
2011
@@ -3,7 +3,7 @@
TEMPLATE = lib
CONFIG += plugin
-LIBS += @X11_LIBS@
+LIBS += @X11_LIBS@ ../../uim/.libs/libuim-counted-init.a
# Input
HEADERS += @srcdir@/abstractcandidatewindow.h \
=======================================
--- /trunk/uim/counted-init.c Thu Jan 6 18:09:56 2011
+++ /trunk/uim/counted-init.c Sat May 7 07:55:59 2011
@@ -35,8 +35,6 @@
#include "uim.h"
#include "counted-init.h"
-unsigned int uim_init_count;
-
int uim_counted_init()
{
uim_init_count++;
=======================================
--- /trunk/uim/counted-init.h Thu Jan 6 18:09:56 2011
+++ /trunk/uim/counted-init.h Sat May 7 07:55:59 2011
@@ -42,6 +42,8 @@
void uim_counted_quit(void);
void uim_force_quit_regardless_of_count(void);
+extern unsigned int uim_init_count;
+
#ifdef __cplusplus
}
#endif
=======================================
--- /trunk/uim/uim.c Thu Jan 6 18:09:56 2011
+++ /trunk/uim/uim.c Sat May 7 07:55:59 2011
@@ -80,6 +80,7 @@
static uim_bool uim_initialized;
static uim_lisp protected0, protected1;
+unsigned int uim_init_count;
/****************************************************************
* Core APIs *
