rpms/ibus/devel .cvsignore, 1.26, 1.27 ibus-HEAD.patch, 1.10, 1.11 ibus.spec, 1.56, 1.57 sources, 1.29, 1.30
Huang Peng
phuang at fedoraproject.org
Tue Mar 31 03:55:38 UTC 2009
Author: phuang
Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31866
Modified Files:
.cvsignore ibus-HEAD.patch ibus.spec sources
Log Message:
Update to ibus-1.1.0.20090331
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 11 Mar 2009 06:48:42 -0000 1.26
+++ .cvsignore 31 Mar 2009 03:55:08 -0000 1.27
@@ -1 +1 @@
-ibus-1.1.0.20090311.tar.gz
+ibus-1.1.0.20090331.tar.gz
ibus-HEAD.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.10 -r 1.11 ibus-HEAD.patch
Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ibus-HEAD.patch 29 Mar 2009 05:52:50 -0000 1.10
+++ ibus-HEAD.patch 31 Mar 2009 03:55:08 -0000 1.11
@@ -1,5953 +0,0 @@
-diff --git a/autogen.sh b/autogen.sh
-index c34acab..addc0bd 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -2,13 +2,13 @@
- set -e
- set -x
-
--autopoint --force
--libtoolize --automake --copy --force
--gtkdocize --copy #--flavour=no-tmpl
--aclocal -I m4 --force
--autoheader --force
--automake --add-missing --copy --force
--autoconf --force
-+autopoint --force || exit 1
-+libtoolize --automake --copy --force || exit 1
-+gtkdocize --copy || exit 1 #--flavour=no-tmpl
-+aclocal -I m4 --force || exit 1
-+autoheader --force || exit 1
-+automake --add-missing --copy --force || exit 1
-+autoconf --force || exit 1
- export CFLAGS="-Wall -g -O0 -Wl,--no-undefined"
- export CXXFLAGS="$CFLAGS"
--./configure --enable-maintainer-mode $*
-+./configure --enable-maintainer-mode $* || exit 1
-diff --git a/bus/engineproxy.c b/bus/engineproxy.c
-index 647845b..e78fbcf 100644
---- a/bus/engineproxy.c
-+++ b/bus/engineproxy.c
-@@ -541,7 +541,11 @@ bus_engine_proxy_process_key_event_reply_cb (IBusPendingCall *pending,
-
- reply_message = dbus_pending_call_steal_reply (pending);
-
-- if ((error = ibus_error_new_from_message (reply_message)) != NULL) {
-+ if (reply_message == NULL) {
-+ call_data->func(FALSE, call_data->user_data);
-+ return;
-+ }
-+ else if ((error = ibus_error_new_from_message (reply_message)) != NULL) {
- g_warning ("%s: %s", error->name, error->message);
- ibus_message_unref (reply_message);
- ibus_error_free (error);
-diff --git a/bus/inputcontext.c b/bus/inputcontext.c
-index 4d66232..723f3af 100644
---- a/bus/inputcontext.c
-+++ b/bus/inputcontext.c
-@@ -1472,7 +1472,7 @@ bus_input_context_update_lookup_table (BusInputContext *context,
- if (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) {
- bus_input_context_send_signal (context,
- "UpdateLookupTable",
-- IBUS_TYPE_TEXT, &(priv->lookup_table),
-+ IBUS_TYPE_LOOKUP_TABLE, &(priv->lookup_table),
- G_TYPE_BOOLEAN, &(priv->lookup_table_visible),
- G_TYPE_INVALID);
- }
-diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index 29e7753..f99e60a 100644
---- a/client/gtk2/ibusimcontext.c
-+++ b/client/gtk2/ibusimcontext.c
-@@ -26,14 +26,17 @@
- #include <ibus.h>
- #include "ibusimcontext.h"
-
--/* IBusIMContextPriv */
--struct _IBusIMContextPrivate {
-+struct _IBusIMContext {
-+ GtkIMContext parent;
-+
-+ /* instance members */
- GtkIMContext *slave;
- GdkWindow *client_window;
-+ GdkWindow *event_window;
-
- /* enabled */
- gboolean enable;
-- IBusInputContext *ibus_context;
-+ IBusInputContext *ibuscontext;
-
- /* preedit status */
- gchar *preedit_string;
-@@ -45,6 +48,12 @@ struct _IBusIMContextPrivate {
- gboolean has_focus;
-
- gint caps;
-+
-+};
-+
-+struct _IBusIMContextClass {
-+GtkIMContextClass parent;
-+ /* class members */
- };
-
- static guint _signal_commit_id = 0;
-@@ -53,17 +62,19 @@ static guint _signal_preedit_start_id = 0;
- static guint _signal_preedit_end_id = 0;
- static guint _signal_delete_surrounding_id = 0;
- static guint _signal_retrieve_surrounding_id = 0;
-+static GQuark _q_ibus_im_context = 0;
-+static gboolean _use_key_snooper = TRUE;
-
- /* functions prototype */
--static void ibus_im_context_class_init (IBusIMContextClass *klass);
--static void ibus_im_context_init (GObject *obj);
--static void ibus_im_context_finalize (GObject *obj);
--static void ibus_im_context_reset (GtkIMContext *context);
-+static void ibus_im_context_class_init (IBusIMContextClass *klass);
-+static void ibus_im_context_init (GObject *obj);
-+static void ibus_im_context_finalize (GObject *obj);
-+static void ibus_im_context_reset (GtkIMContext *context);
- static gboolean ibus_im_context_filter_keypress
- (GtkIMContext *context,
- GdkEventKey *key);
--static void ibus_im_context_focus_in (GtkIMContext *context);
--static void ibus_im_context_focus_out (GtkIMContext *context);
-+static void ibus_im_context_focus_in (GtkIMContext *context);
-+static void ibus_im_context_focus_out (GtkIMContext *context);
- static void ibus_im_context_get_preedit_string
- (GtkIMContext *context,
- gchar **str,
-@@ -72,6 +83,10 @@ static void ibus_im_context_get_preedit_string
- static void ibus_im_context_set_client_window
- (GtkIMContext *context,
- GdkWindow *client);
-+
-+static void ibus_im_context_set_event_window
-+ (IBusIMContext *ibusimcontext,
-+ GdkWindow *client);
- static void ibus_im_context_set_cursor_location
- (GtkIMContext *context,
- GdkRectangle *area);
-@@ -166,6 +181,30 @@ ibus_im_context_new (void)
- return obj;
- }
-
-+static gint
-+_key_snooper_cb (GtkWidget *widget,
-+ GdkEventKey *event,
-+ gpointer user_data)
-+{
-+ GdkWindow *gdkwindow;
-+ GtkIMContext *imcontext;
-+
-+ if (!_use_key_snooper)
-+ return 0;
-+
-+ gdkwindow = gtk_widget_get_window (widget);
-+
-+ if (gdkwindow == NULL)
-+ return 0;
-+
-+ imcontext = (GtkIMContext *) g_object_get_qdata ((GObject *) gdkwindow, _q_ibus_im_context);
-+
-+ if (imcontext == NULL)
-+ return 0;
-+
-+ return gtk_im_context_filter_keypress (imcontext, event);
-+}
-+
- static void
- ibus_im_context_class_init (IBusIMContextClass *klass)
- {
-@@ -174,8 +213,6 @@ ibus_im_context_class_init (IBusIMContextClass *klass)
-
- parent_class = (GtkIMContextClass *) g_type_class_peek_parent (klass);
-
-- g_type_class_add_private (klass, sizeof (IBusIMContextPrivate));
--
- im_context_class->reset = ibus_im_context_reset;
- im_context_class->focus_in = ibus_im_context_focus_in;
- im_context_class->focus_out = ibus_im_context_focus_out;
-@@ -210,71 +247,75 @@ ibus_im_context_class_init (IBusIMContextClass *klass)
- g_signal_lookup ("retrieve-surrounding", G_TYPE_FROM_CLASS (klass));
- g_assert (_signal_retrieve_surrounding_id != 0);
-
-+ _q_ibus_im_context = g_quark_from_static_string ("IBusIMContext");
-+
-+ if (_use_key_snooper) {
-+ gtk_key_snooper_install (_key_snooper_cb, NULL);
-+ }
- }
-
- static void
- ibus_im_context_init (GObject *obj)
- {
-
-- IBusIMContext *ibuscontext = IBUS_IM_CONTEXT (obj);
-- IBusIMContextPrivate *priv = ibuscontext->priv =
-- G_TYPE_INSTANCE_GET_PRIVATE (ibuscontext, IBUS_TYPE_IM_CONTEXT, IBusIMContextPrivate);
-+ IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (obj);
-
[...5562 lines suppressed...]
- };
-
- GType ibus_text_get_type (void);
-+
-+/**
-+ * ibus_text_new_from_string:
-+ * @str: An text string to be set.
-+ * @returns: A newly allocated IBusText.
-+ *
-+ * New an IBusText whose content is copied from a text string.
-+ */
- IBusText *ibus_text_new_from_string (const gchar *str);
-+
-+/**
-+ * ibus_text_new_from_ucs4:
-+ * @str: An text string to be set.
-+ * @returns: A newly allocated IBusText.
-+ *
-+ * New an IBusText whose content is copied from a UCS4 encoded text string.
-+ */
- IBusText *ibus_text_new_from_ucs4 (const gunichar *str);
-+
-+/**
-+ * ibus_text_new_from_static_string:
-+ * @str: An text string to be set.
-+ * @returns: A newly allocated IBusText.
-+ *
-+ * New an IBusText whose content is from a static string.
-+ * Note that it is the developer's duty to ensure @str is static.
-+ */
- IBusText *ibus_text_new_from_static_string (const gchar *str);
-+
-+/**
-+ * ibus_text_new_from_printf:
-+ * @fmt: printf format string.
-+ * @...: arguments for @fmt.
-+ * @returns: A newly allocated IBusText.
-+ *
-+ * New an IBusText from a printf expression.
-+ */
- IBusText *ibus_text_new_from_printf (const gchar *fmt,
- ...);
-+
-+/**
-+ * ibus_text_new_from_unichar:
-+ * @c: A single UCS4-encoded character.
-+ * @returns: A newly allocated IBusText.
-+ *
-+ * New an IBusText from a single UCS4-encoded character.
-+ */
- IBusText *ibus_text_new_from_unichar (gunichar c);
-+
-+/**
-+ * ibus_text_append_attribute:
-+ * @text: an IBusText
-+ * @type: IBusAttributeType for @text.
-+ * @value: Value for the type.
-+ * @start_index: The starting index, inclusive.
-+ * @end_index: The ending index, exclusive.
-+ *
-+ * Append an IBusAttribute for IBusText.
-+ */
- void ibus_text_append_attribute (IBusText *text,
- guint type,
- guint value,
- guint start_index,
- gint end_index);
-+/**
-+ * ibus_text_get_length:
-+ * @text: An IBusText.
-+ * @returns: Number of character in @text, not counted by bytes.
-+ *
-+ * Return number of characters in an IBusText.
-+ * This function is based on g_utf8_strlen(), so unlike strlen(),
-+ * it does not count by bytes but characters instead.
-+ */
- guint ibus_text_get_length (IBusText *text);
-
- G_END_DECLS
-diff --git a/src/ibustypes.h b/src/ibustypes.h
-index a977db4..b2ea627 100644
---- a/src/ibustypes.h
-+++ b/src/ibustypes.h
-@@ -17,9 +17,41 @@
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-+/**
-+ * SECTION: ibustypes
-+ * @short_description: Generic types for iBus.
-+ * @stability: Stable
-+ *
-+ * This session consists generic types for iBus, including shift/control key modifiers,
-+ * and a rectangle structure.
-+ */
- #ifndef __IBUS_TYPES_H_
- #define __IBUS_TYPES_H_
-
-+/**
-+ * IBusModifierType:
-+ * @IBUS_SHIFT_MASK: Shift is activated.
-+ * @IBUS_LOCK_MASK: Cap Lock is locked.
-+ * @IBUS_CONTROL_MASK: Control key is activated.
-+ * @IBUS_MOD1_MASK: Modifier 1 (Usually Alt_L (0x40), Alt_R (0x6c), Meta_L (0xcd)) activated.
-+ * @IBUS_MOD2_MASK: Modifier 2 (Usually Num_Lock (0x4d)) activated.
-+ * @IBUS_MOD3_MASK: Modifier 3 activated.
-+ * @IBUS_MOD4_MASK: Modifier 4 (Usually Super_L (0xce), Hyper_L (0xcf)) activated.
-+ * @IBUS_MOD5_MASK: Modifier 5 (ISO_Level3_Shift (0x5c), Mode_switch (0xcb)) activated.
-+ * @IBUS_BUTTON1_MASK: Mouse button 1 (left) is activated.
-+ * @IBUS_BUTTON2_MASK: Mouse button 2 (middle) is activated.
-+ * @IBUS_BUTTON3_MASK: Mouse button 3 (right) is activated.
-+ * @IBUS_BUTTON4_MASK: Mouse button 4 (scroll up) is activated.
-+ * @IBUS_BUTTON5_MASK: Mouse button 5 (scroll down) is activated.
-+ * @IBUS_FORWARD_MASK: Forward mask.
-+ * @IBUS_SUPER_MASK: Super (Usually Win) key is activated.
-+ * @IBUS_HYPER_MASK: Hyper key is activated.
-+ * @IBUS_RELEASE_MASK: Key is released.
-+ * @IBUS_MODIFIER_MASK: Modifier mask for the all the masks above.
-+ *
-+ * Handles key modifier such as control, shift and alt and release event.
-+ * Note that nits 15 - 25 are currently unused, while bit 29 is used internally.
-+ */
- typedef enum
- {
- IBUS_SHIFT_MASK = 1 << 0,
-@@ -40,7 +72,7 @@ typedef enum
- * Bits 15 - 25 are currently unused. Bit 29 is used internally.
- */
-
-- /* forard mask */
-+ /* forward mask */
- IBUS_FORWARD_MASK = 1 << 25,
-
- IBUS_SUPER_MASK = 1 << 26,
-@@ -52,6 +84,16 @@ typedef enum
- IBUS_MODIFIER_MASK = 0x5c001fff
- } IBusModifierType;
-
-+/**
-+ * IBusCapabilite:
-+ * @IBUS_CAP_PREEDIT_TEXT: UI is capable to show pre-edit text.
-+ * @IBUS_CAP_AUXILIARY_TEXT: UI is capable to show auxiliary text.
-+ * @IBUS_CAP_LOOKUP_TABLE: UI is capable to show the lookup table.
-+ * @IBUS_CAP_FOCUS: UI is capable to get focus.
-+ * @IBUS_CAP_PROPERTY: UI is capable to have property.
-+ *
-+ * Capability flags of UI.
-+ */
- typedef enum {
- IBUS_CAP_PREEDIT_TEXT = 1 << 0,
- IBUS_CAP_AUXILIARY_TEXT = 1 << 1,
-@@ -60,6 +102,15 @@ typedef enum {
- IBUS_CAP_PROPERTY = 1 << 4,
- } IBusCapabilite;
-
-+/**
-+ * IBusRectangle:
-+ * @x: x coordinate.
-+ * @y: y coordinate.
-+ * @width: width of the rectangle.
-+ * @height: height of the renctangl.
-+ *
-+ * Rectangle definition.
-+ */
- typedef struct _IBusRectangle IBusRectangle;
- struct _IBusRectangle {
- gint x;
-@@ -68,7 +119,13 @@ struct _IBusRectangle {
- gint height;
- };
-
--typedef void (* IBusFreeFunc) (gpointer );
-+/**
-+ * IBusFreeFunc:
-+ * @object: object to be freed.
-+ *
-+ * Free function prototype.
-+ */
-+typedef void (* IBusFreeFunc) (gpointer object);
-
- #endif
-
-diff --git a/ui/gtk/candidatepanel.py b/ui/gtk/candidatepanel.py
-index db02163..05c4e71 100644
---- a/ui/gtk/candidatepanel.py
-+++ b/ui/gtk/candidatepanel.py
-@@ -238,11 +238,11 @@ class CandidatePanel(gtk.VBox):
- else:
- # package all widgets in HORIZONTAL mode
- image = gtk.Image()
-- image.set_from_stock(gtk.STOCK_GO_BACK, gtk.ICON_SIZE_MENU)
-+ image.set_from_stock(gtk.STOCK_GO_UP, gtk.ICON_SIZE_MENU)
- self.__prev_button.set_image(image)
-
- image = gtk.Image()
-- image.set_from_stock(gtk.STOCK_GO_FORWARD, gtk.ICON_SIZE_MENU)
-+ image.set_from_stock(gtk.STOCK_GO_DOWN, gtk.ICON_SIZE_MENU)
- self.__next_button.set_image(image)
-
- vbox = gtk.VBox()
Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ibus.spec 29 Mar 2009 05:52:50 -0000 1.56
+++ ibus.spec 31 Mar 2009 03:55:08 -0000 1.57
@@ -7,8 +7,8 @@
%define im_chooser_version 1.2.5
Name: ibus
-Version: 1.1.0.20090311
-Release: 3%{?dist}
+Version: 1.1.0.20090331
+Release: 1%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -104,9 +104,9 @@
%prep
%setup -q
-rm -rf docs/reference/ibus/ibus-sections.txt
-%patch0 -p1
-./autogen.sh --help
+# rm -rf docs/reference/ibus/ibus-sections.txt
+# %patch0 -p1
+# ./autogen.sh --help
%build
%configure --disable-static \
@@ -217,6 +217,11 @@
%{_libdir}/pkgconfig/*
%changelog
+* Tue Mar 31 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090331-1
+- Update to ibus-1.1.0.20090331.
+- Fix bug 492956 - screws up keyboard input in firefox
+- Fix bug 490143 - ibus issue with gnome-keyring
+
* Sun Mar 29 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-3
- Recreate the ibus-HEAD.patch from upstream git source tree
- Fix bug 491999 - up/down arrow keys broken in xchat
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 11 Mar 2009 06:48:42 -0000 1.29
+++ sources 31 Mar 2009 03:55:08 -0000 1.30
@@ -1 +1 @@
-0a5dca579d10bdcc7eba4f475b5a0c2b ibus-1.1.0.20090311.tar.gz
+787a78e36da753835b059dbb46f54a40 ibus-1.1.0.20090331.tar.gz
More information about the fedora-extras-commits
mailing list