144 lines
5.2 KiB
Diff
144 lines
5.2 KiB
Diff
From 2cf859f01912fe41fd36edaeb0efc21f4fabcb0f Mon Sep 17 00:00:00 2001
|
|
From: fujiwarat <takao.fujiwara1@gmail.com>
|
|
Date: Sat, 5 Feb 2011 03:00:04 +0900
|
|
Subject: [PATCH] Added GTK3 definitions.
|
|
|
|
---
|
|
client/gtk2/ibusimcontext.c | 9 +++++++++
|
|
1 files changed, 9 insertions(+), 0 deletions(-)
|
|
|
|
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.
|
|
*/
|
|
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 void
|
|
--
|
|
1.7.3.2
|
|
|
|
From a00ebefde44cf5daaa642fc880c51357cb83f15b Mon Sep 17 00:00:00 2001
|
|
From: fujiwarat <takao.fujiwara1@gmail.com>
|
|
Date: Tue, 8 Feb 2011 18:17:11 +0900
|
|
Subject: [PATCH] Fixed typo.
|
|
|
|
---
|
|
client/gtk2/ibusimcontext.c | 10 +++++-----
|
|
1 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
|
|
index 608f294..bb5ae5c 100644
|
|
--- a/client/gtk2/ibusimcontext.c
|
|
+++ b/client/gtk2/ibusimcontext.c
|
|
@@ -401,11 +401,11 @@ _get_boolean_env(const gchar *name,
|
|
if (value == NULL)
|
|
return defval;
|
|
|
|
- if (g_strcmp0 (name, "") == 0 ||
|
|
- g_strcmp0 (name, "0") == 0 ||
|
|
- g_strcmp0 (name, "false") == 0 ||
|
|
- g_strcmp0 (name, "False") == 0 ||
|
|
- g_strcmp0 (name, "FALSE") == 0)
|
|
+ if (g_strcmp0 (value, "") == 0 ||
|
|
+ g_strcmp0 (value, "0") == 0 ||
|
|
+ g_strcmp0 (value, "false") == 0 ||
|
|
+ g_strcmp0 (value, "False") == 0 ||
|
|
+ g_strcmp0 (value, "FALSE") == 0)
|
|
return FALSE;
|
|
|
|
return TRUE;
|
|
--
|
|
1.7.3.2
|
|
|
|
From 0501756a1e51469849eca064aeb1e340afbf8be2 Mon Sep 17 00:00:00 2001
|
|
From: fujiwarat <takao.fujiwara1@gmail.com>
|
|
Date: Wed, 9 Feb 2011 00:51:39 +0900
|
|
Subject: [PATCH] Add pkgdatadir in ibus-1.0.pc.in
|
|
|
|
---
|
|
ibus-1.0.pc.in | 2 ++
|
|
1 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/ibus-1.0.pc.in b/ibus-1.0.pc.in
|
|
index 88357af..9f593ab 100644
|
|
--- a/ibus-1.0.pc.in
|
|
+++ b/ibus-1.0.pc.in
|
|
@@ -2,6 +2,8 @@ prefix=@prefix@
|
|
exec_prefix=@exec_prefix@
|
|
libdir=@libdir@
|
|
includedir=@includedir@
|
|
+datadir=@datadir@
|
|
+pkgdatadir=@datadir@/ibus
|
|
|
|
Name: IBus
|
|
Description: IBus Library
|
|
--
|
|
1.7.3.2
|
|
|
|
From 6575fab67eaf6f8e483a001f26dbfd61c3258e0a Mon Sep 17 00:00:00 2001
|
|
From: fujiwarat <takao.fujiwara1@gmail.com>
|
|
Date: Thu, 17 Feb 2011 14:46:45 +0900
|
|
Subject: [PATCH] Call gtk_key_snooper_remove when GTK IM client is switched.
|
|
|
|
---
|
|
client/gtk2/ibusimcontext.c | 10 ++++++++++
|
|
1 files changed, 10 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
|
|
index bb5ae5c..bb9cb3d 100644
|
|
--- a/client/gtk2/ibusimcontext.c
|
|
+++ b/client/gtk2/ibusimcontext.c
|
|
@@ -258,6 +258,8 @@ _key_snooper_cb (GtkWidget *widget,
|
|
IBusIMContext *ibusimcontext = (IBusIMContext *) _focus_im_context;
|
|
IBusInputContext *ibuscontext = NULL;
|
|
|
|
+ g_return_val_if_fail (IBUS_IS_IM_CONTEXT (ibusimcontext), FALSE);
|
|
+
|
|
if (ibusimcontext != NULL &&
|
|
ibusimcontext->has_focus == TRUE) {
|
|
/* has IC with focus and use_key_snooper is true */
|
|
@@ -620,6 +622,12 @@ ibus_im_context_finalize (GObject *obj)
|
|
pango_attr_list_unref (ibusimcontext->preedit_attrs);
|
|
}
|
|
|
|
+ if (_key_snooper_id != 0) {
|
|
+ IDEBUG ("snooper is terminated.");
|
|
+ gtk_key_snooper_remove (_key_snooper_id);
|
|
+ _key_snooper_id = 0;
|
|
+ }
|
|
+
|
|
G_OBJECT_CLASS(parent_class)->finalize (obj);
|
|
}
|
|
|
|
@@ -631,6 +639,8 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
|
|
|
|
IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context);
|
|
|
|
+ g_return_val_if_fail (IBUS_IS_IM_CONTEXT (ibusimcontext), FALSE);
|
|
+
|
|
if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) {
|
|
/* If context does not have focus, ibus will process key event in sync mode.
|
|
* It is a workaround for increase search in treeview.
|
|
--
|
|
1.7.4
|
|
|