Attachment 619736 Details for Bug 859879 – Patch for gtkimmulticontext.c

[patch] Patch for gtkimmulticontext.c

gtk+-859879-segv-im-ibus.patch (text/plain), 1.92 KB, created by fujiwara on 2012-10-01 11:19:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fujiwara

Created: 2012-10-01 11:19:31 UTC

Size: 1.92 KB

patch

obsolete

>From ac642125fd455ff3a9dcc5becd45f592d237a286 Mon Sep 17 00:00:00 2001
>From: Takao Fujiwara <tfujiwar@redhat.com>
>Date: Mon, 1 Oct 2012 20:03:42 +0900
>Subject: [PATCH] Reset the private context_id in GtkIMMultiContext with
> notify::gtk-im-module
>
>get_slave calls unref in GtkIMMultiContext if the context_id and
>get_effective_context_id() are different.
>The slave needs to be updated when notify::gtk-im-module is received
>to reduce the time gap.
>
>https://bugzilla.redhat.com/show_bug.cgi?id=859879
>---
> gtk/gtkimmulticontext.c |   19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
>diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
>index 712d5ca..d69a928 100644
>--- a/gtk/gtkimmulticontext.c
>+++ b/gtk/gtkimmulticontext.c
>@@ -289,9 +289,25 @@ gtk_im_multicontext_get_slave (GtkIMMulticontext *multicontext)
> 
> static void
> im_module_setting_changed (GtkSettings *settings, 
>+                           GParamSpec  *pspec,
>                            gpointer     data)
> {
>+  GtkIMMulticontext *multicontext = NULL;
>+  GtkIMMulticontextPrivate *priv = NULL;
>+
>   global_context_id = NULL;
>+  if (!GTK_IS_IM_MULTICONTEXT (data))
>+    {
>+      return;
>+    }
>+
>+  multicontext = GTK_IM_MULTICONTEXT (data);
>+  priv = multicontext->priv;
>+
>+  if (g_strcmp0 (priv->context_id, get_effective_context_id (multicontext)) != 0)
>+    {
>+      gtk_im_multicontext_set_slave (multicontext, NULL, FALSE);
>+    }
> }
> 
> 
>@@ -318,7 +334,8 @@ gtk_im_multicontext_set_client_window (GtkIMContext *context,
>       if (!connected)
>         {
>           g_signal_connect (settings, "notify::gtk-im-module",
>-                            G_CALLBACK (im_module_setting_changed), NULL);
>+                            G_CALLBACK (im_module_setting_changed),
>+                            G_OBJECT (context));
>           g_object_set_data (G_OBJECT (settings), "gtk-im-module-connected",
>                              GINT_TO_POINTER (TRUE));
> 
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 859879: 617482 | 618516 | 619736 | 620096