2009-02-02 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-picker-dialog.c: (_restore_current_selection): Do not
	block/unblock the signal handler if it's not actually being used.
	Fixes some critical warnings.

diff --git a/ChangeLog b/ChangeLog
index 13542a3..5d39c76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-02  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * src/hildon-picker-dialog.c: (_restore_current_selection): Do not
+       block/unblock the signal handler if it's not actually being used.
+       Fixes some critical warnings.
+
 2009-02-02  Alberto Garcia  <agarcia@igalia.com>
 
        Based on a patch by Iván Gómez (igomez@igalia.com)

diff --git a/src/hildon-picker-dialog.c b/src/hildon-picker-dialog.c
index a92775d..bd15321 100644 (file)
--- a/src/hildon-picker-dialog.c
+++ b/src/hildon-picker-dialog.c
@@ -441,7 +441,8 @@ _restore_current_selection (HildonPickerDialog *dialog)
     return;
   }
 
-  g_signal_handler_block (selector, dialog->priv->signal_changed_id);
+  if (dialog->priv->signal_changed_id)
+    g_signal_handler_block (selector, dialog->priv->signal_changed_id);
   for (iter = current_selection, i = 0; iter; iter = g_slist_next (iter), i++) {
     selected = (GList *) (iter->data);
     model = hildon_touch_selector_get_model (selector, i);
@@ -452,7 +453,8 @@ _restore_current_selection (HildonPickerDialog *dialog)
       hildon_touch_selector_select_iter (selector, i, &tree_iter, FALSE);
     }
   }
-  g_signal_handler_unblock (selector, dialog->priv->signal_changed_id);
+  if (dialog->priv->signal_changed_id)
+    g_signal_handler_unblock (selector, dialog->priv->signal_changed_id);
 }
 
 static gboolean