[maemo-commits] [maemo-commits] r9361 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-01-26 13:42:19 +0200 (Fri, 26 Jan 2007)
New Revision: 9361

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentrycompletion.c
Log:
2007-01-26  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkentrycompletion.c (gtk_entry_completion_insert_prefix): 
	only block/unblock completion->priv->insert_text_id if it is
	actually connected (applied the same fix to upstream trunk).



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-26 10:45:58 UTC (rev 9360)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-26 11:42:19 UTC (rev 9361)
@@ -1,3 +1,9 @@
+2007-01-26  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkentrycompletion.c (gtk_entry_completion_insert_prefix): 
+	only block/unblock completion->priv->insert_text_id if it is
+	actually connected (applied the same fix to upstream trunk).
+
 2007-01-25  Michael Natterer  <mitch at imendio.com>
 
 	Port over, clean up and fixed the hildon-keyboard-shortcuts patch.

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentrycompletion.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentrycompletion.c	2007-01-26 10:45:58 UTC (rev 9360)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentrycompletion.c	2007-01-26 11:42:19 UTC (rev 9361)
@@ -1565,8 +1565,10 @@
   gboolean done;
   gchar *prefix;
 
-  g_signal_handler_block (completion->priv->entry,
-			  completion->priv->insert_text_id);
+  if (completion->priv->insert_text_id > 0)
+    g_signal_handler_block (completion->priv->entry,
+                            completion->priv->insert_text_id);
+
   prefix = gtk_entry_completion_compute_prefix (completion);
   if (prefix)
     {
@@ -1574,8 +1576,10 @@
 		     0, prefix, &done);
       g_free (prefix);
     }
-  g_signal_handler_unblock (completion->priv->entry,
-			    completion->priv->insert_text_id);
+
+  if (completion->priv->insert_text_id > 0)
+    g_signal_handler_unblock (completion->priv->entry,
+                              completion->priv->insert_text_id);
 }
 
 /**