[Xfce4-commits] <xfce4-panel:master> Fix crash when disconnecting a signal from the wrong object.

[Nick Schermer]

Updating branch refs/heads/master
         to 8d85235930cdb9cac9dd5ce8e902991f52c751a9 (commit)
       from 339a1e30c038c06cadd457b142622878c9a2ce3f (commit)

commit 8d85235930cdb9cac9dd5ce8e902991f52c751a9
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jun 13 21:18:07 2010 +0200

    Fix crash when disconnecting a signal from the wrong object.

 panel/panel-preferences-dialog.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c
index 1e80f49..3f956b1 100644
--- a/panel/panel-preferences-dialog.c
+++ b/panel/panel-preferences-dialog.c
@@ -373,9 +373,6 @@ panel_preferences_dialog_bindings_update (PanelPreferencesDialog *dialog)
   gchar       *name, *title;
   gboolean     span_monitors_sensitive = FALSE;
 
-  /* remove all the active bindings */
-  panel_preferences_dialog_bindings_unbind (dialog);
-
   /* leave when there is no active panel */
   panel_return_if_fail (G_IS_OBJECT (dialog->active));
   if (dialog->active == NULL)
@@ -690,6 +687,9 @@ panel_preferences_dialog_panel_combobox_changed (GtkComboBox            *combobo
       g_signal_handler_disconnect (G_OBJECT (itembar), dialog->items_changed_handler_id);
     }
 
+  /* remove all the active bindings */
+  panel_preferences_dialog_bindings_unbind (dialog);
+
   /* set the selected window */
   nth = gtk_combo_box_get_active (combobox);
   dialog->active = panel_application_get_nth_window (dialog->application, nth);