public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Takao Fujiwara <tfujiwar@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Updated to 1.3.99.20110127
Date: Sun, 31 May 2026 02:05:01 GMT [thread overview]
Message-ID: <178019310138.1.987788221056215460.rpms-ibus-0610dd694c16@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ibus
Branch : autotool
Commit : 0610dd694c165a168e3763f9086cdecb1d1faff7
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2011-02-05T03:06:02+09:00
Stats : +202/-988 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/0610dd694c165a168e3763f9086cdecb1d1faff7?branch=autotool
Log:
Updated to 1.3.99.20110127
---
diff --git a/.gitignore b/.gitignore
index d20b7c1..fbdcaa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ ibus-1.3.6.tar.gz
/ibus-1.3.99.20101118.tar.gz
/ibus-1.3.99.20101202.tar.gz
/ibus-1.3.99.20110117.tar.gz
+/ibus-1.3.99.20110127.tar.gz
diff --git a/ibus-435880-surrounding-text.patch b/ibus-435880-surrounding-text.patch
index 758b12a..f38dd56 100644
--- a/ibus-435880-surrounding-text.patch
+++ b/ibus-435880-surrounding-text.patch
@@ -1,6 +1,6 @@
-From 2284f5ada37ff8f13a802bd652e2b71b68db1b10 Mon Sep 17 00:00:00 2001
+From 4b115935d47b1a849617aad5db44212856b48630 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
-Date: Wed, 26 Jan 2011 15:42:44 +0900
+Date: Fri, 4 Feb 2011 19:48:05 +0900
Subject: [PATCH] Support surrounding-text retrieval.
This change adds a new API function ibus_engine_get_surrounding_text().
@@ -216,7 +216,7 @@ index 32d51e8..20f561c 100644
context_signals[ENGINE_CHANGED],
0);
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index 009d05d..22d1e46 100644
+index ab9c520..e61dd86 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -27,6 +27,7 @@
@@ -237,7 +237,7 @@ index 009d05d..22d1e46 100644
};
struct _IBusIMContextClass {
-@@ -108,11 +110,18 @@ static void ibus_im_context_set_cursor_location
+@@ -110,11 +112,18 @@ static void ibus_im_context_set_cursor_location
static void ibus_im_context_set_use_preedit
(GtkIMContext *context,
gboolean use_preedit);
@@ -256,7 +256,7 @@ index 009d05d..22d1e46 100644
static void _bus_connected_cb (IBusBus *bus,
IBusIMContext *context);
-@@ -126,14 +135,15 @@ static void _slave_preedit_start_cb (GtkIMContext *slave,
+@@ -128,14 +137,15 @@ static void _slave_preedit_start_cb (GtkIMContext *slave,
IBusIMContext *context);
static void _slave_preedit_end_cb (GtkIMContext *slave,
IBusIMContext *context);
@@ -278,10 +278,10 @@ index 009d05d..22d1e46 100644
static void _create_fake_input_context (void);
-@@ -221,6 +231,17 @@ _focus_out_cb (GtkWidget *widget,
- return FALSE;
+@@ -247,6 +257,17 @@ _process_key_event_done (GObject *object,
}
+
+static void
+_request_surrounding_text (IBusIMContext *context)
+{
@@ -296,16 +296,16 @@ index 009d05d..22d1e46 100644
static gint
_key_snooper_cb (GtkWidget *widget,
GdkEventKey *event,
-@@ -311,6 +332,8 @@ _key_snooper_cb (GtkWidget *widget,
- ibusimcontext->time = event->time;
- }
+@@ -333,6 +354,8 @@ _key_snooper_cb (GtkWidget *widget,
+
+ } while (0);
+ _request_surrounding_text (ibusimcontext);
+
- switch (event->type) {
- case GDK_KEY_RELEASE:
- retval = ibus_input_context_process_key_event (ibuscontext,
-@@ -357,6 +380,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
+ if (ibusimcontext != NULL) {
+ ibusimcontext->time = event->time;
+ }
+@@ -429,6 +452,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
im_context_class->set_client_window = ibus_im_context_set_client_window;
im_context_class->set_cursor_location = ibus_im_context_set_cursor_location;
im_context_class->set_use_preedit = ibus_im_context_set_use_preedit;
@@ -313,7 +313,7 @@ index 009d05d..22d1e46 100644
gobject_class->finalize = ibus_im_context_finalize;
_signal_commit_id =
-@@ -463,7 +487,12 @@ ibus_im_context_init (GObject *obj)
+@@ -542,7 +566,12 @@ ibus_im_context_init (GObject *obj)
ibusimcontext->ibuscontext = NULL;
ibusimcontext->has_focus = FALSE;
ibusimcontext->time = GDK_CURRENT_TIME;
@@ -327,16 +327,16 @@ index 009d05d..22d1e46 100644
// Create slave im context
-@@ -559,6 +588,8 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
- ibusimcontext->time = event->time;
- }
+@@ -639,6 +668,8 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
+ if (ibusimcontext->client_window == NULL && event->window != NULL)
+ gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext, event->window);
+ _request_surrounding_text (ibusimcontext);
+
- switch (event->type) {
- case GDK_KEY_RELEASE:
- retval = ibus_input_context_process_key_event (ibusimcontext->ibuscontext,
-@@ -623,6 +654,8 @@ ibus_im_context_focus_in (GtkIMContext *context)
+ if (ibusimcontext != NULL) {
+ ibusimcontext->time = event->time;
+ }
+@@ -733,6 +764,8 @@ ibus_im_context_focus_in (GtkIMContext *context)
(gpointer *) &_focus_im_context);
_focus_im_context = context;
}
@@ -345,7 +345,7 @@ index 009d05d..22d1e46 100644
}
static void
-@@ -780,6 +813,25 @@ ibus_im_context_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
+@@ -890,6 +923,25 @@ ibus_im_context_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
}
static void
@@ -371,7 +371,7 @@ index 009d05d..22d1e46 100644
ibus_im_context_set_use_preedit (GtkIMContext *context, gboolean use_preedit)
{
IDEBUG ("%s", __FUNCTION__);
-@@ -788,17 +840,50 @@ ibus_im_context_set_use_preedit (GtkIMContext *context, gboolean use_preedit)
+@@ -898,17 +950,50 @@ ibus_im_context_set_use_preedit (GtkIMContext *context, gboolean use_preedit)
if(ibusimcontext->ibuscontext) {
if (use_preedit) {
@@ -425,7 +425,7 @@ index 009d05d..22d1e46 100644
_bus_connected_cb (IBusBus *bus,
IBusIMContext *ibusimcontext)
{
-@@ -817,6 +902,8 @@ _ibus_context_commit_text_cb (IBusInputContext *ibuscontext,
+@@ -927,6 +1012,8 @@ _ibus_context_commit_text_cb (IBusInputContext *ibuscontext,
IDEBUG ("%s", __FUNCTION__);
g_signal_emit (ibusimcontext, _signal_commit_id, 0, text->text);
@@ -434,7 +434,7 @@ index 009d05d..22d1e46 100644
}
static gboolean
-@@ -1111,6 +1198,8 @@ _ibus_context_show_preedit_text_cb (IBusInputContext *ibuscontext,
+@@ -1221,6 +1308,8 @@ _ibus_context_show_preedit_text_cb (IBusInputContext *ibuscontext,
ibusimcontext->preedit_visible = TRUE;
g_signal_emit (ibusimcontext, _signal_preedit_start_id, 0);
g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
@@ -443,7 +443,7 @@ index 009d05d..22d1e46 100644
}
static void
-@@ -1176,6 +1265,14 @@ _ibus_context_destroy_cb (IBusInputContext *ibuscontext,
+@@ -1286,6 +1375,14 @@ _ibus_context_destroy_cb (IBusInputContext *ibuscontext,
}
static void
@@ -458,7 +458,7 @@ index 009d05d..22d1e46 100644
_create_input_context (IBusIMContext *ibusimcontext)
{
IDEBUG ("%s", __FUNCTION__);
-@@ -1218,6 +1315,10 @@ _create_input_context (IBusIMContext *ibusimcontext)
+@@ -1328,6 +1425,10 @@ _create_input_context (IBusIMContext *ibusimcontext)
"disabled",
G_CALLBACK (_ibus_context_disabled_cb),
ibusimcontext);
@@ -469,7 +469,7 @@ index 009d05d..22d1e46 100644
g_signal_connect (ibusimcontext->ibuscontext, "destroy",
G_CALLBACK (_ibus_context_destroy_cb),
ibusimcontext);
-@@ -1274,17 +1375,21 @@ _slave_preedit_end_cb (GtkIMContext *slave,
+@@ -1384,17 +1485,21 @@ _slave_preedit_end_cb (GtkIMContext *slave,
g_signal_emit (ibusimcontext, _signal_preedit_end_id, 0);
}
@@ -495,7 +495,7 @@ index 009d05d..22d1e46 100644
_slave_delete_surrounding_cb (GtkIMContext *slave,
gint offset_from_cursor,
guint nchars,
-@@ -1293,9 +1398,10 @@ _slave_delete_surrounding_cb (GtkIMContext *slave,
+@@ -1403,9 +1508,10 @@ _slave_delete_surrounding_cb (GtkIMContext *slave,
gboolean return_value;
if (ibusimcontext->enable && ibusimcontext->ibuscontext) {
@@ -508,12 +508,12 @@ index 009d05d..22d1e46 100644
#ifdef OS_CHROMEOS
diff --git a/configure.ac b/configure.ac
-index 1a1e663..def1986 100644
+index 05ceb18..0c06fbc 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -354,6 +354,19 @@ AC_ARG_WITH(no-snooper-apps,
- AC_DEFINE_UNQUOTED(NO_SNOOPER_APPS, "$NO_SNOOPER_APPS",
- [Does not enbale keyboard snooper in those applications])
+@@ -368,6 +368,19 @@ else
+ enable_inputcontext_sync="no (disabled, use --enable-inputcontext-sync to enable)"
+ fi
+# option for enable surrounding-text
+AC_ARG_ENABLE(surrounding-text,
@@ -531,9 +531,9 @@ index 1a1e663..def1986 100644
# check iso-codes
PKG_CHECK_MODULES(ISOCODES, [
iso-codes
-@@ -424,5 +437,6 @@ Build options:
- Build document $enable_gtk_doc
+@@ -439,5 +452,6 @@ Build options:
Enable key snooper $enable_key_snooper
+ Enable inputcontext sync $enable_inputcontext_sync
No snooper regexes "$NO_SNOOPER_APPS"
+ Enable surrounding-text $enable_surrounding_text
])
@@ -598,7 +598,7 @@ index 89f6dbd..bb25c5a 100644
+ def EngineChanged(self): pass
diff --git a/src/ibusengine.c b/src/ibusengine.c
-index ae07393..f284af6 100644
+index 519d7ca..fc129a2 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -45,6 +45,7 @@ enum {
@@ -636,7 +636,7 @@ index ae07393..f284af6 100644
static void ibus_engine_emit_signal (IBusEngine *engine,
const gchar *signal_name,
GVariant *parameters);
-@@ -180,6 +190,10 @@ static const gchar introspection_xml[] =
+@@ -185,6 +195,10 @@ static const gchar introspection_xml[] =
" <method name='PageDown' />"
" <method name='CursorUp' />"
" <method name='CursorDown' />"
@@ -647,7 +647,7 @@ index ae07393..f284af6 100644
/* FIXME signals */
" <signal name='CommitText'>"
" <arg type='v' name='text' />"
-@@ -245,6 +259,7 @@ ibus_engine_class_init (IBusEngineClass *class)
+@@ -250,6 +264,7 @@ ibus_engine_class_init (IBusEngineClass *class)
class->property_hide = ibus_engine_property_hide;
class->set_cursor_location = ibus_engine_set_cursor_location;
class->set_capabilities = ibus_engine_set_capabilities;
@@ -655,7 +655,7 @@ index ae07393..f284af6 100644
/* install properties */
/**
-@@ -611,12 +626,39 @@ ibus_engine_class_init (IBusEngineClass *class)
+@@ -616,12 +631,39 @@ ibus_engine_class_init (IBusEngineClass *class)
G_TYPE_STRING);
g_type_class_add_private (class, sizeof (IBusEnginePrivate));
@@ -695,7 +695,7 @@ index ae07393..f284af6 100644
}
static void
-@@ -625,6 +667,11 @@ ibus_engine_destroy (IBusEngine *engine)
+@@ -630,6 +672,11 @@ ibus_engine_destroy (IBusEngine *engine)
g_free (engine->priv->engine_name);
engine->priv->engine_name = NULL;
@@ -707,7 +707,7 @@ index ae07393..f284af6 100644
IBUS_OBJECT_CLASS(ibus_engine_parent_class)->destroy (IBUS_OBJECT (engine));
}
-@@ -796,6 +843,25 @@ ibus_engine_service_method_call (IBusService *service,
+@@ -801,6 +848,25 @@ ibus_engine_service_method_call (IBusService *service,
return;
}
@@ -733,7 +733,7 @@ index ae07393..f284af6 100644
/* should not be reached */
g_return_if_reached ();
}
-@@ -950,6 +1016,26 @@ ibus_engine_property_hide (IBusEngine *engine, const gchar *prop_name)
+@@ -955,6 +1021,26 @@ ibus_engine_property_hide (IBusEngine *engine, const gchar *prop_name)
}
static void
@@ -760,7 +760,7 @@ index ae07393..f284af6 100644
ibus_engine_emit_signal (IBusEngine *engine,
const gchar *signal_name,
GVariant *parameters)
-@@ -1133,14 +1219,66 @@ void ibus_engine_delete_surrounding_text (IBusEngine *engine,
+@@ -1138,14 +1224,66 @@ void ibus_engine_delete_surrounding_text (IBusEngine *engine,
gint offset_from_cursor,
guint nchars)
{
@@ -1146,7 +1146,7 @@ index 9718b15..209d460 100644
* @info: An IBusEngineDesc
* @output: XML-formatted Input method engine description.
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
-index 3d25f68..097f203 100644
+index f8f5848..9556df3 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -28,6 +28,9 @@
@@ -1263,7 +1263,7 @@ index 3d25f68..097f203 100644
};
if (g_strcmp0 (signal_name, "CommitText") == 0) {
-@@ -805,6 +864,38 @@ ibus_input_context_property_hide (IBusInputContext *context,
+@@ -848,6 +907,38 @@ ibus_input_context_property_hide (IBusInputContext *context,
);
}
@@ -1303,7 +1303,7 @@ index 3d25f68..097f203 100644
ibus_input_context_is_enabled (IBusInputContext *context)
{
diff --git a/src/ibusinputcontext.h b/src/ibusinputcontext.h
-index fa7d976..b3e8c96 100644
+index 96fd00e..1f8ae86 100644
--- a/src/ibusinputcontext.h
+++ b/src/ibusinputcontext.h
@@ -41,6 +41,7 @@
@@ -1314,7 +1314,7 @@ index fa7d976..b3e8c96 100644
/*
* Type macros.
-@@ -279,6 +280,16 @@ IBusEngineDesc
+@@ -324,6 +325,16 @@ IBusEngineDesc
void ibus_input_context_set_engine (IBusInputContext *context,
const gchar *name);
diff --git a/ibus-530711-preload-sys.patch b/ibus-530711-preload-sys.patch
index d1fea0a..86d9bb0 100644
--- a/ibus-530711-preload-sys.patch
+++ b/ibus-530711-preload-sys.patch
@@ -1,6 +1,6 @@
-From aef8d6fa4118336f562f74580f0f1986d8054be5 Mon Sep 17 00:00:00 2001
+From 8265052e2616f25af6e6a84cda8fb6d5c4d5f4ed Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 26 Jan 2011 15:42:56 +0900
+Date: Fri, 4 Feb 2011 19:48:19 +0900
Subject: [PATCH] Reload preload engines until users customize the list.
The idea is, if users don't customize the preload_engines with ibus-setup,
@@ -30,7 +30,7 @@ diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index cbcf7f4..1bb159e 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
-@@ -144,6 +144,9 @@ static void bus_ibus_impl_set_previo
+@@ -144,6 +144,9 @@ static void bus_ibus_impl_set_previous_engine
static void bus_ibus_impl_set_preload_engines
(BusIBusImpl *ibus,
GVariant *value);
@@ -218,10 +218,11 @@ index cbcf7f4..1bb159e 100644
}
/**
-@@ -459,79 +577,47 @@ bus_ibus_impl_set_use_global_engine (Bus
+@@ -459,82 +577,48 @@ bus_ibus_impl_set_use_global_engine (BusIBusImpl *ibus,
}
}
+-#ifndef OS_CHROMEOS
-static gint
-_engine_desc_cmp (IBusEngineDesc *desc1,
- IBusEngineDesc *desc2)
@@ -229,6 +230,7 @@ index cbcf7f4..1bb159e 100644
- return - ((gint) ibus_engine_desc_get_rank (desc1)) +
- ((gint) ibus_engine_desc_get_rank (desc2));
-}
+-#endif
-
/**
* bus_ibus_impl_set_default_preload_engines:
@@ -254,6 +256,7 @@ index cbcf7f4..1bb159e 100644
static void
bus_ibus_impl_set_default_preload_engines (BusIBusImpl *ibus)
{
+ #ifndef OS_CHROMEOS
- g_assert (BUS_IS_IBUS_IMPL (ibus));
-
static gboolean done = FALSE;
@@ -318,10 +321,10 @@ index cbcf7f4..1bb159e 100644
- }
- g_list_free (engines);
+ _set_language_relative_preload_engines (ibus);
+ #endif
}
- /* The list of config entries that are related to ibus-daemon. */
-@@ -544,6 +630,7 @@ const static struct {
+@@ -548,6 +632,7 @@ const static struct {
{ "general/hotkey", "next_engine_in_menu", bus_ibus_impl_set_next_engine_in_menu },
{ "general/hotkey", "previous_engine", bus_ibus_impl_set_previous_engine },
{ "general", "preload_engines", bus_ibus_impl_set_preload_engines },
diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch
index 7694d4a..3f6912e 100644
--- a/ibus-541492-xkb.patch
+++ b/ibus-541492-xkb.patch
@@ -1,6 +1,6 @@
-From 836f4375531307a4abac4cdbd3cd091413de2b51 Mon Sep 17 00:00:00 2001
+From 245b932b2a72bd23ab8f40ec624184da7ad53b8d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 26 Jan 2011 15:42:49 +0900
+Date: Fri, 4 Feb 2011 19:48:10 +0900
Subject: [PATCH] Add XKB layouts
---
@@ -72,7 +72,7 @@ index 02b7163..6cbe82a 100644
$(NULL)
diff --git a/configure.ac b/configure.ac
-index def1986..1347991 100644
+index 0c06fbc..8667510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,6 +185,57 @@ else
@@ -133,7 +133,7 @@ index def1986..1347991 100644
# GObject introspection
GOBJECT_INTROSPECTION_CHECK([0.6.8])
-@@ -413,6 +464,7 @@ gconf/Makefile
+@@ -427,6 +478,7 @@ gconf/Makefile
gconf/gconf.xml.in
bindings/Makefile
bindings/vala/Makefile
@@ -141,7 +141,7 @@ index def1986..1347991 100644
])
AC_OUTPUT
-@@ -428,6 +480,7 @@ Build options:
+@@ -442,6 +494,7 @@ Build options:
Build gtk2 immodule $enable_gtk2
Build gtk3 immodule $enable_gtk3
Build XIM agent server $enable_xim
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index ca7020d..6302468 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1,956 +1,166 @@
-From d26f418a3df4a9ad78dd952d997e028ba24c88f9 Mon Sep 17 00:00:00 2001
+From 03c9e591430c62354bbf26ef7bd4a2e6acfb7c8f Mon Sep 17 00:00:00 2001
From: Yusuke Sato <yusukes@chromium.org>
-Date: Mon, 24 Jan 2011 10:56:05 +0900
-Subject: [PATCH] Add <signal name='ValueChanged'> to introspection_xml in src/ibusconfigservice.c.
+Date: Thu, 3 Feb 2011 10:15:24 +0900
+Subject: [PATCH] Overwrite Gtk+'s default compose table to fix crosbug.com/11421.
-I don't think that GDBus library in glib-2.26.[01] uses the information to filter out undefined signals, but just in case.
+BUG=chromium-os:11421
+TEST=manually done on Chrome OS.
-BUG=none
-TEST=manually
-
-Review URL: http://codereview.appspot.com/4015043
+Review URL: http://codereview.appspot.com/3989060
---
- src/ibusconfigservice.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/src/ibusconfigservice.c b/src/ibusconfigservice.c
-index 5374a76..6420730 100644
---- a/src/ibusconfigservice.c
-+++ b/src/ibusconfigservice.c
-@@ -103,6 +103,11 @@ static const gchar introspection_xml[] =
- " <arg direction='in' type='s' name='section' />"
- " <arg direction='in' type='s' name='name' />"
- " </method>"
-+ " <signal name='ValueChanged'>"
-+ " <arg type='s' name='section' />"
-+ " <arg type='s' name='name' />"
-+ " <arg type='v' name='value' />"
-+ " </signal>"
- " </interface>"
- "</node>";
-
---
-1.7.3.2
-
-From f28d3e30cb04dc0eee5a657469f2c8d49d7056e0 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Mon, 24 Jan 2011 12:25:48 +0900
-Subject: [PATCH] Set GdkEventKey time for gdk_event_put with IBUS_FORWARD_MASK.
-
----
- client/gtk2/ibusimcontext.c | 35 +++++++++++++++++++++++++++++++++--
- 1 files changed, 33 insertions(+), 2 deletions(-)
+ client/gtk2/ibusimcontext.c | 23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index fb6fb2d..009d05d 100644
+index b1ae0c8..745722f 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
-@@ -59,8 +59,8 @@ struct _IBusIMContext {
- GdkRectangle cursor_area;
- gboolean has_focus;
-
-+ guint32 time;
- gint caps;
--
- };
-
- struct _IBusIMContextClass {
-@@ -307,6 +307,10 @@ _key_snooper_cb (GtkWidget *widget,
-
- } while (0);
-
-+ if (ibusimcontext != NULL) {
-+ ibusimcontext->time = event->time;
-+ }
-+
- switch (event->type) {
- case GDK_KEY_RELEASE:
- retval = ibus_input_context_process_key_event (ibuscontext,
-@@ -458,6 +462,7 @@ ibus_im_context_init (GObject *obj)
-
- ibusimcontext->ibuscontext = NULL;
- ibusimcontext->has_focus = FALSE;
-+ ibusimcontext->time = GDK_CURRENT_TIME;
- ibusimcontext->caps = IBUS_CAP_PREEDIT_TEXT | IBUS_CAP_FOCUS | IBUS_CAP_SURROUNDING_TEXT;
-
-
-@@ -550,6 +555,10 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
- if (ibusimcontext->client_window == NULL && event->window != NULL)
- gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext, event->window);
+@@ -496,6 +496,24 @@ ibus_im_context_class_init (IBusIMContextClass *class)
+ _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
+ }
-+ if (ibusimcontext != NULL) {
-+ ibusimcontext->time = event->time;
-+ }
++/* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
++ * Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */
++
++/* The difference between this and the default input method is the handling
++ * of C+acute - this method produces C WITH CEDILLA rather than C WITH ACUTE.
++ * For languages that use CCedilla and not acute, this is the preferred mapping,
++ * and is particularly important for pt_BR, where the us-intl keyboard is
++ * used extensively.
++ */
++static guint16 cedilla_compose_seqs[] = {
++ GDK_dead_acute, GDK_C, 0, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
++ GDK_dead_acute, GDK_c, 0, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
++ GDK_Multi_key, GDK_apostrophe, GDK_C, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
++ GDK_Multi_key, GDK_apostrophe, GDK_c, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
++ GDK_Multi_key, GDK_C, GDK_apostrophe, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
++ GDK_Multi_key, GDK_c, GDK_apostrophe, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
++};
+
- switch (event->type) {
- case GDK_KEY_RELEASE:
- retval = ibus_input_context_process_key_event (ibusimcontext->ibuscontext,
-@@ -892,7 +901,29 @@ _create_gdk_event (IBusIMContext *ibusimcontext,
- event->window = g_object_ref (ibusimcontext->client_window);
- else if (_input_window)
- event->window = g_object_ref (_input_window);
-- event->time = GDK_CURRENT_TIME;
-+
-+ /* The time is copied the latest value from the previous
-+ * GdkKeyEvent in filter_keypress().
-+ *
-+ * We understand the best way would be to pass the all time value
-+ * to IBus functions process_key_event() and IBus DBus functions
-+ * ProcessKeyEvent() in IM clients and IM engines so that the
-+ * _create_gdk_event() could get the correct time values.
-+ * However it would causes to change many functions and the time value
-+ * would not provide the useful meanings for each IBus engines but just
-+ * pass the original value to ForwardKeyEvent().
-+ * We use the saved value at the moment.
-+ *
-+ * Another idea might be to have the time implementation in X servers
-+ * but some Xorg uses clock_gettime() and others use gettimeofday()
-+ * and the values would be different in each implementation and
-+ * locale/remote X server. So probably that idea would not work. */
-+ if (ibusimcontext) {
-+ event->time = ibusimcontext->time;
-+ } else {
-+ event->time = GDK_CURRENT_TIME;
-+ }
-+
- event->send_event = FALSE;
- event->state = state;
- event->keyval = keyval;
+ static void
+ ibus_im_context_init (GObject *obj)
+ {
+@@ -528,6 +546,11 @@ ibus_im_context_init (GObject *obj)
+
+ // Create slave im context
+ ibusimcontext->slave = gtk_im_context_simple_new ();
++ gtk_im_context_simple_add_table (GTK_IM_CONTEXT_SIMPLE (ibusimcontext->slave),
++ cedilla_compose_seqs,
++ 4,
++ G_N_ELEMENTS (cedilla_compose_seqs) / (4 + 2));
++
+ g_signal_connect (ibusimcontext->slave,
+ "commit",
+ G_CALLBACK (_slave_commit_cb),
--
1.7.3.2
-From 73135d06d2195cee5630918e48003347315eb653 Mon Sep 17 00:00:00 2001
+From 2cf859f01912fe41fd36edaeb0efc21f4fabcb0f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 26 Jan 2011 14:01:17 +0900
-Subject: [PATCH] Add signals in IBusPanelService for non-C classes.
+Date: Sat, 5 Feb 2011 03:00:04 +0900
+Subject: [PATCH] Added GTK3 definitions.
---
- src/ibuspanelservice.c | 525 ++++++++++++++++++++++++++++++++++++++++++++----
- src/ibuspanelservice.h | 4 +-
- 2 files changed, 492 insertions(+), 37 deletions(-)
+ client/gtk2/ibusimcontext.c | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
-diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
-index df949c5..f027390 100644
---- a/src/ibuspanelservice.c
-+++ b/src/ibuspanelservice.c
-@@ -21,8 +21,33 @@
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 745722f..608f294 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -506,12 +506,21 @@ ibus_im_context_class_init (IBusIMContextClass *class)
+ * used extensively.
*/
- #include "ibusshare.h"
- #include "ibuspanelservice.h"
-+#include "ibusmarshalers.h"
-+#include "ibusinternal.h"
-
- enum {
-+ UPDATE_PREEDIT_TEXT,
-+ UPDATE_AUXILIARY_TEXT,
-+ UPDATE_LOOKUP_TABLE,
-+ FOCUS_IN,
-+ FOCUS_OUT,
-+ REGISTER_PROPERTIES,
-+ UPDATE_PROPERTY,
-+ SET_CURSOR_LOCATION,
-+ CURSOR_UP_LOOKUP_TABLE,
-+ CURSOR_DOWN_LOOKUP_TABLE,
-+ HIDE_AUXILIARY_TEXT,
-+ HIDE_LANGUAGE_BAR,
-+ HIDE_LOOKUP_TABLE,
-+ HIDE_PREEDIT_TEXT,
-+ PAGE_UP_LOOKUP_TABLE,
-+ PAGE_DOWN_LOOKUP_TABLE,
-+ RESET,
-+ SHOW_AUXILIARY_TEXT,
-+ SHOW_LANGUAGE_BAR,
-+ SHOW_LOOKUP_TABLE,
-+ SHOW_PREEDIT_TEXT,
-+ START_SETUP,
-+ STATE_CHANGED,
- LAST_SIGNAL,
- };
-
-@@ -30,6 +55,8 @@ enum {
- PROP_0,
+ static guint16 cedilla_compose_seqs[] = {
++#ifdef DEPRECATED_GDK_KEYSYMS
+ GDK_dead_acute, GDK_C, 0, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+ GDK_dead_acute, GDK_c, 0, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+ GDK_Multi_key, GDK_apostrophe, GDK_C, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+ GDK_Multi_key, GDK_apostrophe, GDK_c, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+ GDK_Multi_key, GDK_C, GDK_apostrophe, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+ GDK_Multi_key, GDK_c, GDK_apostrophe, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
++#else
++ GDK_KEY_dead_acute, GDK_KEY_C, 0, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
++ GDK_KEY_dead_acute, GDK_KEY_c, 0, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
++ GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_C, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
++ GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_c, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
++ GDK_KEY_Multi_key, GDK_KEY_C, GDK_KEY_apostrophe, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
++ GDK_KEY_Multi_key, GDK_KEY_c, GDK_KEY_apostrophe, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
++#endif
};
-+static guint panel_signals[LAST_SIGNAL] = { 0 };
-+
- /* functions prototype */
- static void ibus_panel_service_set_property (IBusPanelService *panel,
- guint prop_id,
-@@ -167,6 +194,7 @@ static void
- ibus_panel_service_class_init (IBusPanelServiceClass *class)
- {
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-+ ibus_panel_service_parent_class = IBUS_SERVICE_CLASS (g_type_class_peek_parent (class));
-
- gobject_class->set_property = (GObjectSetPropertyFunc) ibus_panel_service_set_property;
- gobject_class->get_property = (GObjectGetPropertyFunc) ibus_panel_service_get_property;
-@@ -203,6 +231,436 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
- class->show_preedit_text = ibus_panel_service_not_implemented;
- class->start_setup = ibus_panel_service_not_implemented;
- class->state_changed = ibus_panel_service_not_implemented;
-+
-+ /* install signals */
-+ /**
-+ * IBusPanelService::update-preedit-text:
-+ * @text: A preedit text to be updated.
-+ * @cursor_pos: The cursor position of the text.
-+ * @visible: Whether the update is visible.
-+ *
-+ * Emitted when the client application get the update-preedit-text.
-+ * Implement the member function update_preedit_text() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[UPDATE_PREEDIT_TEXT] =
-+ g_signal_new (I_("update-preedit-text"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, update_preedit_text),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__OBJECT_UINT_BOOLEAN,
-+ G_TYPE_NONE,
-+ 3,
-+ IBUS_TYPE_TEXT,
-+ G_TYPE_UINT,
-+ G_TYPE_BOOLEAN);
-+
-+ /**
-+ * IBusPanelService::update-auxiliary-text:
-+ * @text: A preedit text to be updated.
-+ * @visible: Whether the update is visible.
-+ *
-+ * Emitted when the client application get the update-auxiliary-text.
-+ * Implement the member function update_auxiliary_text() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[UPDATE_AUXILIARY_TEXT] =
-+ g_signal_new (I_("update-auxiliary-text"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, update_auxiliary_text),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__OBJECT_BOOLEAN,
-+ G_TYPE_NONE,
-+ 2,
-+ IBUS_TYPE_TEXT,
-+ G_TYPE_BOOLEAN);
-+
-+ /**
-+ * IBusPanelService::update-lookup-table:
-+ * @lookup_table: A lookup table to be updated.
-+ * @visible: Whether the update is visible.
-+ *
-+ * Emitted when the client application get the update-lookup-table.
-+ * Implement the member function update_lookup_table() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[UPDATE_LOOKUP_TABLE] =
-+ g_signal_new (I_("update-lookup-table"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, update_lookup_table),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__OBJECT_BOOLEAN,
-+ G_TYPE_NONE,
-+ 2,
-+ IBUS_TYPE_LOOKUP_TABLE,
-+ G_TYPE_BOOLEAN);
-+
-+ /**
-+ * IBusPanelService::focus-in:
-+ * @input_context_path: Object path of InputContext.
-+ *
-+ * Emitted when the client application get the focus-in.
-+ * Implement the member function focus_in() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[FOCUS_IN] =
-+ g_signal_new (I_("focus-in"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, focus_in),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__STRING,
-+ G_TYPE_NONE,
-+ 1,
-+ G_TYPE_STRING);
-+
-+ /**
-+ * IBusPanelService::focus-out:
-+ * @input_context_path: Object path of InputContext.
-+ *
-+ * Emitted when the client application get the focus-out.
-+ * Implement the member function focus_out() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[FOCUS_OUT] =
-+ g_signal_new (I_("focus-out"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, focus_out),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__STRING,
-+ G_TYPE_NONE,
-+ 1,
-+ G_TYPE_STRING);
-+
-+ /**
-+ * IBusPanelService::register-properties:
-+ * @prop_list: An IBusPropList that contains properties.
-+ *
-+ * Emitted when the client application get the register-properties.
-+ * Implement the member function register_properties() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[REGISTER_PROPERTIES] =
-+ g_signal_new (I_("register-properties"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, register_properties),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__OBJECT,
-+ G_TYPE_NONE,
-+ 1,
-+ IBUS_TYPE_PROP_LIST);
-+
-+ /**
-+ * IBusPanelService::update-property:
-+ * @prop: The IBusProperty to be updated.
-+ *
-+ * Emitted when the client application get the update-property.
-+ * Implement the member function update_property() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[UPDATE_PROPERTY] =
-+ g_signal_new (I_("update-property"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, update_property),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__OBJECT,
-+ G_TYPE_NONE,
-+ 1,
-+ IBUS_TYPE_PROPERTY);
-+
-+ /**
-+ * IBusPanelService::set-cursor-location:
-+ * @x: X coordinate of the cursor.
-+ * @y: Y coordinate of the cursor.
-+ * @w: Width of the cursor.
-+ * @h: Height of the cursor.
-+ *
-+ * Emitted when the client application get the set-cursor-location.
-+ * Implement the member function set_cursor_location() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[SET_CURSOR_LOCATION] =
-+ g_signal_new (I_("set-cursor-location"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, set_cursor_location),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__INT_INT_INT_INT,
-+ G_TYPE_NONE,
-+ 4,
-+ G_TYPE_INT,
-+ G_TYPE_INT,
-+ G_TYPE_INT,
-+ G_TYPE_INT);
-+
-+ /**
-+ * IBusPanelService::cursor-up-lookup-table:
-+ *
-+ * Emitted when the client application get the cursor-up-lookup-table.
-+ * Implement the member function cursor_up_lookup_table() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[CURSOR_UP_LOOKUP_TABLE] =
-+ g_signal_new (I_("cursor-up-lookup-table"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, cursor_up_lookup_table),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::cursor-down-lookup-table:
-+ *
-+ * Emitted when the client application get the cursor-down-lookup-table.
-+ * Implement the member function cursor_down_lookup_table() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[CURSOR_DOWN_LOOKUP_TABLE] =
-+ g_signal_new (I_("cursor-down-lookup-table"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, cursor_down_lookup_table),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::hide-auxiliary-text:
-+ *
-+ * Emitted when the client application get the hide-auxiliary-text.
-+ * Implement the member function hide_auxiliary_text() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[HIDE_AUXILIARY_TEXT] =
-+ g_signal_new (I_("hide-auxiliary-text"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, hide_auxiliary_text),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::hide-language-bar:
-+ *
-+ * Emitted when the client application get the hide-language-bar.
-+ * Implement the member function hide_language_bar() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[HIDE_LANGUAGE_BAR] =
-+ g_signal_new (I_("hide-language-bar"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, hide_language_bar),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::hide-lookup-table:
-+ *
-+ * Emitted when the client application get the hide-lookup-table.
-+ * Implement the member function hide_lookup_table() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[HIDE_LOOKUP_TABLE] =
-+ g_signal_new (I_("hide-lookup-table"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, hide_lookup_table),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::hide-preedit-text:
-+ *
-+ * Emitted when the client application get the hide-preedit-text.
-+ * Implement the member function hide_preedit_text() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[HIDE_PREEDIT_TEXT] =
-+ g_signal_new (I_("hide-preedit-text"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, hide_preedit_text),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::page-up-lookup-table:
-+ *
-+ * Emitted when the client application get the page-up-lookup-table.
-+ * Implement the member function page_up_lookup_table() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[PAGE_UP_LOOKUP_TABLE] =
-+ g_signal_new (I_("page-up-lookup-table"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, page_up_lookup_table),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::page-down-lookup-table:
-+ *
-+ * Emitted when the client application get the page-down-lookup-table.
-+ * Implement the member function page_down_lookup_table() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[PAGE_DOWN_LOOKUP_TABLE] =
-+ g_signal_new (I_("page-down-lookup-table"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, page_down_lookup_table),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::reset:
-+ *
-+ * Emitted when the client application get the reset.
-+ * Implement the member function reset() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[RESET] =
-+ g_signal_new (I_("reset"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, reset),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::show-auxiliary-text:
-+ *
-+ * Emitted when the client application get the show-auxiliary-text.
-+ * Implement the member function show_auxiliary_text() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[SHOW_AUXILIARY_TEXT] =
-+ g_signal_new (I_("show-auxiliary-text"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, show_auxiliary_text),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::show-language-bar:
-+ *
-+ * Emitted when the client application get the show-language-bar.
-+ * Implement the member function show_language_bar() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[SHOW_LANGUAGE_BAR] =
-+ g_signal_new (I_("show-language-bar"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, show_language_bar),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::show-lookup-table:
-+ *
-+ * Emitted when the client application get the show-lookup-table.
-+ * Implement the member function show_lookup_table() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[SHOW_LOOKUP_TABLE] =
-+ g_signal_new (I_("show-lookup-table"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, show_lookup_table),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::show-preedit-text:
-+ *
-+ * Emitted when the client application get the show-preedit-text.
-+ * Implement the member function show_preedit_text() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[SHOW_PREEDIT_TEXT] =
-+ g_signal_new (I_("show-preedit-text"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, show_preedit_text),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::start-setup:
-+ *
-+ * Emitted when the client application get the start-setup.
-+ * Implement the member function start_setup() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[START_SETUP] =
-+ g_signal_new (I_("start-setup"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, start_setup),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ /**
-+ * IBusPanelService::state-changed:
-+ *
-+ * Emitted when the client application get the state-changed.
-+ * Implement the member function state_changed() in extended class to receive this signal.
-+ *
-+ * <note><para>Argument @user_data is ignored in this function.</para></note>
-+ */
-+ panel_signals[STATE_CHANGED] =
-+ g_signal_new (I_("state-changed"),
-+ G_TYPE_FROM_CLASS (gobject_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (IBusPanelServiceClass, state_changed),
-+ NULL, NULL,
-+ _ibus_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
- }
-
static void
-@@ -282,7 +740,7 @@ ibus_panel_service_service_method_call (IBusService *service,
- IBusText *text = IBUS_TEXT (ibus_serializable_deserialize (variant));
- g_variant_unref (variant);
-
-- IBUS_PANEL_SERVICE_GET_CLASS (panel)->update_preedit_text (panel, text, cursor, visible);
-+ g_signal_emit (panel, panel_signals[UPDATE_PREEDIT_TEXT], 0, text, cursor, visible);
- _g_object_unref_if_floating (text);
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
-@@ -296,7 +754,7 @@ ibus_panel_service_service_method_call (IBusService *service,
- IBusText *text = IBUS_TEXT (ibus_serializable_deserialize (variant));
- g_variant_unref (variant);
-
-- IBUS_PANEL_SERVICE_GET_CLASS (panel)->update_auxiliary_text (panel, text, visible);
-+ g_signal_emit (panel, panel_signals[UPDATE_AUXILIARY_TEXT], 0, text, visible);
- _g_object_unref_if_floating (text);
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
-@@ -310,7 +768,7 @@ ibus_panel_service_service_method_call (IBusService *service,
- IBusLookupTable *table = IBUS_LOOKUP_TABLE (ibus_serializable_deserialize (variant));
- g_variant_unref (variant);
-
-- IBUS_PANEL_SERVICE_GET_CLASS (panel)->update_lookup_table (panel, table, visible);
-+ g_signal_emit (panel, panel_signals[UPDATE_LOOKUP_TABLE], 0, table, visible);
- _g_object_unref_if_floating (table);
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
-@@ -319,7 +777,7 @@ ibus_panel_service_service_method_call (IBusService *service,
- if (g_strcmp0 (method_name, "FocusIn") == 0) {
- const gchar *path;
- g_variant_get (parameters, "(&o)", &path);
-- IBUS_PANEL_SERVICE_GET_CLASS (panel)->focus_in (panel, path);
-+ g_signal_emit (panel, panel_signals[FOCUS_IN], 0, path);
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
- }
-@@ -327,7 +785,7 @@ ibus_panel_service_service_method_call (IBusService *service,
- if (g_strcmp0 (method_name, "FocusOut") == 0) {
- const gchar *path;
- g_variant_get (parameters, "(&o)", &path);
-- IBUS_PANEL_SERVICE_GET_CLASS (panel)->focus_out (panel, path);
-+ g_signal_emit (panel, panel_signals[FOCUS_OUT], 0, path);
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
- }
-@@ -337,7 +795,7 @@ ibus_panel_service_service_method_call (IBusService *service,
- IBusPropList *prop_list = IBUS_PROP_LIST (ibus_serializable_deserialize (variant));
- g_variant_unref (variant);
-
-- IBUS_PANEL_SERVICE_GET_CLASS (panel)->register_properties (panel, prop_list);
-+ g_signal_emit (panel, panel_signals[REGISTER_PROPERTIES], 0, prop_list);
- _g_object_unref_if_floating (prop_list);
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
-@@ -348,7 +806,7 @@ ibus_panel_service_service_method_call (IBusService *service,
- IBusProperty *property = IBUS_PROPERTY (ibus_serializable_deserialize (variant));
- g_variant_unref (variant);
-
-- IBUS_PANEL_SERVICE_GET_CLASS (panel)->update_property (panel, property);
-+ g_signal_emit (panel, panel_signals[UPDATE_PROPERTY], 0, property);
- _g_object_unref_if_floating (property);
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
-@@ -357,41 +815,38 @@ ibus_panel_service_service_method_call (IBusService *service,
- if (g_strcmp0 (method_name, "SetCursorLocation") == 0) {
- gint x, y, w, h;
- g_variant_get (parameters, "(iiii)", &x, &y, &w, &h);
-- IBUS_PANEL_SERVICE_GET_CLASS (panel)->set_cursor_location (panel, x, y, w, h);
-+ g_signal_emit (panel, panel_signals[SET_CURSOR_LOCATION], 0, x, y, w, h);
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
- }
-
- const static struct {
- const gchar *name;
-- const gint offset;
-+ const gint signal_id;
- } no_arg_methods [] = {
-- { "CursorUpLookupTable" , G_STRUCT_OFFSET (IBusPanelServiceClass, cursor_down_lookup_table) },
-- { "CursorDownLookupTable", G_STRUCT_OFFSET (IBusPanelServiceClass, cursor_up_lookup_table) },
-- { "HideAuxiliaryText", G_STRUCT_OFFSET (IBusPanelServiceClass, hide_auxiliary_text) },
-- { "HideLanguageBar", G_STRUCT_OFFSET (IBusPanelServiceClass, hide_language_bar) },
-- { "HideLookupTable", G_STRUCT_OFFSET (IBusPanelServiceClass, hide_lookup_table) },
-- { "HidePreeditText", G_STRUCT_OFFSET (IBusPanelServiceClass, hide_preedit_text) },
-- { "PageDownLookupTable", G_STRUCT_OFFSET (IBusPanelServiceClass, page_down_lookup_table) },
-- { "PageUpLookupTable", G_STRUCT_OFFSET (IBusPanelServiceClass, page_up_lookup_table) },
-- { "Reset", G_STRUCT_OFFSET (IBusPanelServiceClass, reset) },
-- { "ShowAuxiliaryText", G_STRUCT_OFFSET (IBusPanelServiceClass, show_auxiliary_text) },
-- { "ShowLanguageBar", G_STRUCT_OFFSET (IBusPanelServiceClass, show_language_bar) },
-- { "ShowLookupTable", G_STRUCT_OFFSET (IBusPanelServiceClass, show_lookup_table) },
-- { "ShowPreeditText", G_STRUCT_OFFSET (IBusPanelServiceClass, show_preedit_text) },
-- { "StartSetup", G_STRUCT_OFFSET (IBusPanelServiceClass, start_setup) },
-- { "StateChanged", G_STRUCT_OFFSET (IBusPanelServiceClass, state_changed) },
-+ { "CursorUpLookupTable", CURSOR_UP_LOOKUP_TABLE },
-+ { "CursorDownLookupTable", CURSOR_DOWN_LOOKUP_TABLE },
-+ { "HideAuxiliaryText", HIDE_AUXILIARY_TEXT },
-+ { "HideLanguageBar", HIDE_LANGUAGE_BAR },
-+ { "HideLookupTable", HIDE_LOOKUP_TABLE },
-+ { "HidePreeditText", HIDE_PREEDIT_TEXT },
-+ { "PageUpLookupTable", PAGE_UP_LOOKUP_TABLE },
-+ { "PageDownLookupTable", PAGE_DOWN_LOOKUP_TABLE },
-+ { "Reset", RESET },
-+ { "ShowAuxiliaryText", SHOW_AUXILIARY_TEXT },
-+ { "ShowLanguageBar", SHOW_LANGUAGE_BAR },
-+ { "ShowLookupTable", SHOW_LOOKUP_TABLE },
-+ { "ShowPreeditText", SHOW_PREEDIT_TEXT },
-+ { "StartSetup", START_SETUP },
-+ { "StateChanged", STATE_CHANGED },
- };
-
- gint i;
- for (i = 0; i < G_N_ELEMENTS (no_arg_methods); i++) {
- if (g_strcmp0 (method_name, no_arg_methods[i].name) == 0) {
-- typedef gboolean (* NoArgFunc) (IBusPanelService *);
-- NoArgFunc func;
-- func = G_STRUCT_MEMBER (NoArgFunc,
-- IBUS_PANEL_SERVICE_GET_CLASS (panel),
-- no_arg_methods[i].offset);
-- func (panel);
-+ if (no_arg_methods[i].signal_id >= 0) {
-+ g_signal_emit (panel, panel_signals[no_arg_methods[i].signal_id], 0);
-+ }
- g_dbus_method_invocation_return_value (invocation, NULL);
- return;
- }
-@@ -490,7 +945,7 @@ ibus_panel_service_update_auxiliary_text (IBusPanelService *panel,
- static void
- ibus_panel_service_update_lookup_table (IBusPanelService *panel,
- IBusLookupTable *lookup_table,
-- gboolean visibl)
-+ gboolean visible)
- {
- ibus_panel_service_not_implemented(panel);
- }
-@@ -540,15 +995,15 @@ ibus_panel_service_candidate_clicked (IBusPanelService *panel,
- }
-
- void
--ibus_panel_service_property_active (IBusPanelService *panel,
-- const gchar *prop_name,
-- guint prop_state)
-+ibus_panel_service_property_activate (IBusPanelService *panel,
-+ const gchar *prop_name,
-+ guint prop_state)
- {
- g_return_if_fail (IBUS_IS_PANEL_SERVICE (panel));
- ibus_service_emit_signal ((IBusService *) panel,
- NULL,
- IBUS_INTERFACE_PANEL,
-- "PropertyActive",
-+ "PropertyActivate",
- g_variant_new ("(su)", prop_name, prop_state),
- NULL);
- }
-diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
-index 505fb7f..7678922 100644
---- a/src/ibuspanelservice.h
-+++ b/src/ibuspanelservice.h
-@@ -182,7 +182,7 @@ void ibus_panel_service_page_down (IBusPanelService *panel);
- void ibus_panel_service_page_up (IBusPanelService *panel);
-
- /**
-- * ibus_panel_service_property_active
-+ * ibus_panel_service_property_activate
- * @panel: An IBusPanelService
- * @prop_name: A property name
- * @prop_state: State of the property
-@@ -190,7 +190,7 @@ void ibus_panel_service_page_up (IBusPanelService *panel);
- * Notify that a property is active
- * by sending a "PropertyActivate" message to IBus service.
- */
--void ibus_panel_service_property_active (IBusPanelService *panel,
-+void ibus_panel_service_property_activate (IBusPanelService *panel,
- const gchar *prop_name,
- guint prop_state);
- /**
--
1.7.3.2
-From cc1d776aeb65b481b1bd93e1f7acfbe4fea8e1f2 Mon Sep 17 00:00:00 2001
+From 275087240dfa197177d5c31326d14d943e84bb29 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 26 Jan 2011 14:01:25 +0900
-Subject: [PATCH] Set QT_IM_MODULE=xim in case of no ibus-qt.
+Date: Fri, 4 Feb 2011 19:40:16 +0900
+Subject: [PATCH] Added the optional sync mode in IBusIMContext.
+Async mode always return TRUE in filter_keypress() so the caller could
+ignore the events.
---
- xinput-ibus.in | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ client/gtk2/ibusimcontext.c | 5 +++--
+ configure.ac | 15 +++++++++++++++
+ 2 files changed, 18 insertions(+), 2 deletions(-)
-diff --git a/xinput-ibus.in b/xinput-ibus.in
-index f10d003..8e5818b 100644
---- a/xinput-ibus.in
-+++ b/xinput-ibus.in
-@@ -13,6 +13,8 @@ if test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so || \
- test -f /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so;
- then
- QT_IM_MODULE=ibus
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 745722f..ab9c520 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -79,7 +79,7 @@ static const gchar *_no_snooper_apps = NO_SNOOPER_APPS;
+ static gboolean _use_key_snooper = ENABLE_SNOOPER;
+ static guint _key_snooper_id = 0;
+
+-static gboolean _use_sync_mode = FALSE;
++static gboolean _use_sync_mode = ENABLE_INPUTCONTEXT_SYNC;
+
+ static GtkIMContext *_focus_im_context = NULL;
+ static IBusInputContext *_fake_context = NULL;
+@@ -457,7 +457,8 @@ ibus_im_context_class_init (IBusIMContextClass *class)
+
+ _use_key_snooper = !_get_boolean_env ("IBUS_DISABLE_SNOOPER",
+ !(ENABLE_SNOOPER));
+- _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", FALSE);
++ _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE",
++ ENABLE_INPUTCONTEXT_SYNC);
+
+ /* env IBUS_DISABLE_SNOOPER does not exist */
+ if (_use_key_snooper) {
+diff --git a/configure.ac b/configure.ac
+index 1a1e663..05ceb18 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -354,6 +354,20 @@ AC_ARG_WITH(no-snooper-apps,
+ AC_DEFINE_UNQUOTED(NO_SNOOPER_APPS, "$NO_SNOOPER_APPS",
+ [Does not enbale keyboard snooper in those applications])
+
++# option for always enable inputcontext sync.
++AC_ARG_ENABLE(key-snooper,
++ AS_HELP_STRING([--enable-inputcontext-sync],
++ [Always enable inputcontext sync in gtk im module]),
++ [enable_inputcontext_sync=$enableval],
++ [enable_inputcontext_sync=yes]
++)
++if test x"$enable_inputcontext_sync" = x"yes"; then
++ AC_DEFINE(ENABLE_INPUTCONTEXT_SYNC, TRUE, [Enable inputcontext sync])
+else
-+ QT_IM_MODULE=xim
- fi
++ AC_DEFINE(ENABLE_INPUTCONTEXT_SYNC, FALSE, [Enable inputcontext sync])
++ enable_inputcontext_sync="no (disabled, use --enable-inputcontext-sync to enable)"
++fi
++
+ # check iso-codes
+ PKG_CHECK_MODULES(ISOCODES, [
+ iso-codes
+@@ -423,6 +437,7 @@ Build options:
+ Build vala binding $enable_vala
+ Build document $enable_gtk_doc
+ Enable key snooper $enable_key_snooper
++ Enable inputcontext sync $enable_inputcontext_sync
+ No snooper regexes "$NO_SNOOPER_APPS"
+ ])
- # if [ -z "$IBUS_SESSION_ID" ]; then
---
-1.7.3.2
-
-From ea3917659bb7be5ee93ced938d5b522a468f7677 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 26 Jan 2011 13:15:08 +0900
-Subject: [PATCH] Fix introspection definitions.
-
----
- src/ibusbus.h | 2 +-
- src/ibusinputcontext.h | 20 ++++++++++----------
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/ibusbus.h b/src/ibusbus.h
-index a2cd1db..3ea3cde 100644
---- a/src/ibusbus.h
-+++ b/src/ibusbus.h
-@@ -101,7 +101,7 @@ gboolean ibus_bus_is_connected (IBusBus *bus);
- /**
- * ibus_bus_get_connection:
- * @bus: An IBusBus.
-- * @returns: TRUE if @bus is connected, FALSE otherwise.
-+ * @returns: (transfer none): A GDBusConnection of an IBusIBus instance.
- *
- * Return GDBusConnection of an IBusIBus instance.
- */
-@@ -318,7 +318,7 @@ gboolean ibus_bus_set_global_engine (IBusBus *bus,
- /**
- * ibus_bus_get_config:
- * @bus: An IBusBus.
-- * @returns: An newly allocated IBusConfig which is configurable with @bus.
-+ * @returns: (transfer none): An newly allocated IBusConfig which is configurable with @bus.
- *
- * Get the config instance from IBusBus.
- */
-diff --git a/src/ibusinputcontext.h b/src/ibusinputcontext.h
-index 4be9160..fa7d976 100644
---- a/src/ibusinputcontext.h
-+++ b/src/ibusinputcontext.h
-@@ -107,7 +107,7 @@ IBusInputContext
- * ibus_input_context_get_input_context:
- * @path: The path to the object that emitting the signal.
- * @connection: An GDBusConnection.
-- * @returns: An existing IBusInputContext.
-+ * @returns: (transfer none): An existing IBusInputContext.
- *
- * Gets an existing IBusInputContext.
- */
-@@ -142,7 +142,7 @@ IBusInputContext
- *
- * Use ibus_keymap_lookup_keysym() to convert keycode to keysym in given keyboard layout.
- *
-- * @see_also: #IBusEngine::process-key-event
-+ * see_also: #IBusEngine::process-key-event
- */
- gboolean ibus_input_context_process_key_event
- (IBusInputContext *context,
-@@ -160,7 +160,7 @@ gboolean ibus_input_context_process_key_event
- *
- * Set the cursor location of IBus input context.
- *
-- * @see_also: #IBusEngine::set-cursor-location
-+ * see_also: #IBusEngine::set-cursor-location
- */
- void ibus_input_context_set_cursor_location
- (IBusInputContext *context,
-@@ -177,7 +177,7 @@ void ibus_input_context_set_cursor_location
- * When IBUS_CAP_FOCUS is not set, IBUS_CAP_PREEDIT_TEXT, IBUS_CAP_AUXILIARY_TEXT, IBUS_CAP_LOOKUP_TABLE, and IBUS_CAP_PROPERTY have to be all set.
- * The panel component does nothing for an application that doesn't support focus.
- *
-- * @see_also: #IBusEngine::set-capabilities
-+ * see_also: #IBusEngine::set-capabilities
- */
- void ibus_input_context_set_capabilities
- (IBusInputContext *context,
-@@ -204,7 +204,7 @@ void ibus_input_context_property_activate
- *
- * Invoked when the client application get focus.
- *
-- * @see_also: #IBusEngine::focus_in.
-+ * see_also: #IBusEngine::focus_in.
- */
- void ibus_input_context_focus_in (IBusInputContext *context);
-
-@@ -214,7 +214,7 @@ void ibus_input_context_focus_in (IBusInputContext *context);
- *
- * Invoked when the client application get focus.
- *
-- * @see_also: #IBusEngine::focus_out.
-+ * see_also: #IBusEngine::focus_out.
- */
- void ibus_input_context_focus_out (IBusInputContext *context);
-
-@@ -225,7 +225,7 @@ void ibus_input_context_focus_out (IBusInputContext *context);
- *
- * Invoked when the IME is reset.
- *
-- * @see_also: #IBusEngine::reset
-+ * see_also: #IBusEngine::reset
- */
- void ibus_input_context_reset (IBusInputContext *context);
-
-@@ -235,7 +235,7 @@ void ibus_input_context_reset (IBusInputContext *context);
- *
- * Invoked when the IME is enabled, either by IME switch hotkey or select from the menu.
- *
-- * @see_also: #IBusEngine::enable
-+ * see_also: #IBusEngine::enable
- */
- void ibus_input_context_enable (IBusInputContext *context);
-
-@@ -245,7 +245,7 @@ void ibus_input_context_enable (IBusInputContext *context);
- *
- * Invoked when the IME is disabled, either by IME switch hotkey or select from the menu.
- *
-- * @see_also: #IBusEngine::disable
-+ * see_also: #IBusEngine::disable
- */
- void ibus_input_context_disable (IBusInputContext *context);
-
-@@ -262,7 +262,7 @@ gboolean ibus_input_context_is_enabled (IBusInputContext *context);
- /**
- * ibus_input_context_get_engine:
- * @context: An IBusInputContext.
-- * @returns: An IME engine description for the context
-+ * @returns: (transfer none): An IME engine description for the context
- *
- * Returns an IME engine description for the context.
- */
--
1.7.3.2
diff --git a/ibus.spec b/ibus.spec
index cb1d0f7..5281e77 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -11,8 +11,8 @@
%define im_chooser_version 1.2.5
Name: ibus
-Version: 1.3.99.20110117
-Release: 2%{?dist}
+Version: 1.3.99.20110127
+Release: 1%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -298,12 +298,12 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
-* Wed Feb 2 2011 Matthias Clasen <mclasen@redhat.com> - 1.3.99.20110117-2
-- Rebuild against newer gtk
+* Fri Feb 04 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110127-1
+- Updated to 1.3.99.20110127
+- Updated ibus-HEAD.patch from upstream.
* Wed Jan 26 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110117-1
- Updated to 1.3.99.20110117
-- Updated ibus-HEAD.patch from upstream.
- Fixed Bug 666427 - ibus requires dbus-x11
- Fixed Bug 670137 - QT_IM_MODULE=xim in ibus.conf without ibus-qt
diff --git a/sources b/sources
index 3e5e558..4550c9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3720d477051e575918a1694e0e468624 ibus-1.3.99.20110117.tar.gz
+14b8a53054d7972402a2e30a399c2b2b ibus-1.3.99.20110127.tar.gz
reply other threads:[~2026-05-31 2:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178019310138.1.987788221056215460.rpms-ibus-0610dd694c16@fedoraproject.org \
--to=tfujiwar@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox