From: Alexander Butenko <a.butenka@gmail.com>
Date: Tue, 24 Aug 2010 21:50:47 +0000 (+0200)
Subject: Protect proxy combo box notifications against recursion
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=672b7ab70a61ad5b5833cfadb3109c3912e6cc59;p=midori

Protect proxy combo box notifications against recursion

This can happen when switching between custom and other elements.
---

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index dc7f7946..8e98ef43 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -247,10 +247,14 @@ proxy_combo_box_changed_cb (GtkComboBox* button,
         }
         else if (value != custom_value && GTK_IS_ENTRY (child))
         {
+            g_signal_handlers_block_by_func (
+                button, proxy_combo_box_changed_cb, object);
             /* Force the combo to change the item again */
             gtk_widget_destroy (child);
             gtk_combo_box_set_active (button, value + 1);
             gtk_combo_box_set_active (button, value);
+            g_signal_handlers_unblock_by_func (
+                button, proxy_combo_box_changed_cb, object);
         }
     }