rpms/ibus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated ibus-HEAD.patch from upstream.

Browse Source
This commit is contained in:
Takao Fujiwara 2010-12-28 14:36:20 +09:00
parent fbc55799e1
commit fc455bbff0
3 changed files with 88 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ibus-435880-surrounding-text.patch
View File

@ -30,7 +30,7 @@ resets the current surrounding-text.
ibus/engine.py | 6 ++
ibus/interface/iengine.py | 3 +
ibus/interface/iinputcontext.py | 3 +
src/ibusengine.c | 134 +++++++++++++++++++++++++++++++++++++++
src/ibusengine.c | 138 +++++++++++++++++++++++++++++++++++++++++
src/ibusengine.h | 21 ++++++-
src/ibusinputcontext.c | 61 ++++++++++++++++++
src/ibusinputcontext.h | 11 +++
@ -628,7 +628,18 @@ index ae07393..777d404 100644
static void ibus_engine_emit_signal (IBusEngine *engine,
const gchar *signal_name,
GVariant *parameters);
@@ -245,6 +255,7 @@ ibus_engine_class_init (IBusEngineClass *class)
@@ -180,6 +190,10 @@ static const gchar introspection_xml[] =
" <method name='PageDown' />"
" <method name='CursorUp' />"
" <method name='CursorDown' />"
+ " <method name='SetSurroundingText'>"
+ " <arg direction='in' type='v' name='text' />"
+ " <arg direction='in' type='u' name='cursor_pos' />"
+ " </method>"
/* FIXME signals */
" <signal name='CommitText'>"
" <arg type='v' name='text' />"
@@ -245,6 +259,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;
@ -636,7 +647,7 @@ index ae07393..777d404 100644
/* install properties */
/**
@@ -611,12 +622,39 @@ ibus_engine_class_init (IBusEngineClass *class)
@@ -611,12 +626,39 @@ ibus_engine_class_init (IBusEngineClass *class)
G_TYPE_STRING);
g_type_class_add_private (class, sizeof (IBusEnginePrivate));
@ -676,7 +687,7 @@ index ae07393..777d404 100644
}
static void
@@ -625,6 +663,11 @@ ibus_engine_destroy (IBusEngine *engine)
@@ -625,6 +667,11 @@ ibus_engine_destroy (IBusEngine *engine)
g_free (engine->priv->engine_name);
engine->priv->engine_name = NULL;
@ -688,7 +699,7 @@ index ae07393..777d404 100644
IBUS_OBJECT_CLASS(ibus_engine_parent_class)->destroy (IBUS_OBJECT (engine));
}
@@ -796,6 +839,25 @@ ibus_engine_service_method_call (IBusService *service,
@@ -796,6 +843,25 @@ ibus_engine_service_method_call (IBusService *service,
return;
}
@ -714,7 +725,7 @@ index ae07393..777d404 100644
/* should not be reached */
g_return_if_reached ();
}
@@ -950,6 +1012,26 @@ ibus_engine_property_hide (IBusEngine *engine, const gchar *prop_name)
@@ -950,6 +1016,26 @@ ibus_engine_property_hide (IBusEngine *engine, const gchar *prop_name)
}
static void
@ -741,7 +752,7 @@ index ae07393..777d404 100644
ibus_engine_emit_signal (IBusEngine *engine,
const gchar *signal_name,
GVariant *parameters)
@@ -1133,14 +1215,66 @@ void ibus_engine_delete_surrounding_text (IBusEngine *engine,
@@ -1133,14 +1219,66 @@ void ibus_engine_delete_surrounding_text (IBusEngine *engine,
gint offset_from_cursor,
guint nchars)
{

67
ibus-HEAD.patch
View File

@ -45,3 +45,70 @@ index 2e288f5..fb56b76 100644
--
1.7.3.2
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -732,7 +732,7 @@ ibus_input_context_get_input_context (co
GDBusConnection *connection)
{
IBusInputContext *context;
- GError *error;
+ GError *error = NULL;
context = ibus_input_context_new (path, connection, NULL, &error);
if (!context) {
@@ -904,7 +904,7 @@ ibus_input_context_is_enabled (IBusInput
{
g_assert (IBUS_IS_INPUT_CONTEXT (context));
GVariant *result;
- GError *error;
+ GError *error = NULL;
result = g_dbus_proxy_call_sync ((GDBusProxy *) context,
"IsEnabled", /* method_name */
NULL, /* parameters */
@@ -932,7 +932,7 @@ ibus_input_context_get_engine (IBusInput
{
g_assert (IBUS_IS_INPUT_CONTEXT (context));
GVariant *result;
- GError *error;
+ GError *error = NULL;
result = g_dbus_proxy_call_sync ((GDBusProxy *) context,
"GetEngine", /* method_name */
NULL, /* parameters */
From 017077ceb9ec2f26a8c524f3794a832164f21768 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 28 Dec 2010 12:46:25 +0900
Subject: [PATCH] Fix g_variant_get() call in DeleteSurroundingText signal handler.
BUG=none
TEST=manual
Review URL: http://codereview.appspot.com/3820042
---
src/ibusinputcontext.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index 88afc22..7bbf8a2 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -578,7 +578,7 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
guint32 keycode;
guint32 state;
- g_variant_get (parameters, 0, "(uuu)", &keyval, &keycode, &state);
+ g_variant_get (parameters, "(uuu)", &keyval, &keycode, &state);
/* Forward key event back with IBUS_FORWARD_MASK. And process_key_event will
* not process key event with IBUS_FORWARD_MASK again. */
@@ -595,7 +595,7 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
gint offset_from_cursor;
guint nchars;
- g_variant_get (parameters, 0, "(iu)", &offset_from_cursor, &nchars);
+ g_variant_get (parameters, "(iu)", &offset_from_cursor, &nchars);
g_signal_emit (context,
context_signals[DELETE_SURROUNDING_TEXT],
--
1.7.3.2

5
ibus.spec
View File

@ -12,7 +12,7 @@
Name: ibus
Version: 1.3.99.20101202
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@ -294,9 +294,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
* Wed Dec 22 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20101202-2
* Wed Dec 22 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20101202-3
- Updated ibus-435880-surrounding-text.patch to support the xml setting.
- Updated ibus-530711-preload-sys.patch to set the default lang base.
- Updated ibus-HEAD.patch from upstream.
* Thu Dec 09 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20101202-1
- Updated to 1.3.99.20101202