The 'destroyed' signal is called to late, we have to disconnect those signals
before destroying the live search object.
https://bugzilla.gnome.org/show_bug.cgi?id=692105
gtk_widget_set_sensitive (priv->select_button, sensitive);
}
gtk_widget_set_sensitive (priv->select_button, sensitive);
}
-static void
-dialog_destroy_cb (GtkWidget *widget,
- EmpathyIrcNetworkChooserDialog *self)
-{
- EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-
- g_signal_handler_disconnect (priv->search, priv->search_sig);
- g_signal_handler_disconnect (priv->search, priv->activate_sig);
-}
-
static void
add_clicked_cb (GtkToolButton *button,
EmpathyIrcNetworkChooserDialog *self)
static void
add_clicked_cb (GtkToolButton *button,
EmpathyIrcNetworkChooserDialog *self)
g_signal_connect (self, "response",
G_CALLBACK (dialog_response_cb), self);
g_signal_connect (self, "response",
G_CALLBACK (dialog_response_cb), self);
- g_signal_connect (self, "destroy",
- G_CALLBACK (dialog_destroy_cb), self);
/* Request a side ensuring to display at least some networks */
gtk_widget_set_size_request (GTK_WIDGET (self), -1, 300);
/* Request a side ensuring to display at least some networks */
gtk_widget_set_size_request (GTK_WIDGET (self), -1, 300);
EmpathyIrcNetworkManager *self = (EmpathyIrcNetworkManager *) object;
EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
EmpathyIrcNetworkManager *self = (EmpathyIrcNetworkManager *) object;
EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
+ if (priv->search_sig != 0)
+ {
+ g_signal_handler_disconnect (priv->search, priv->search_sig);
+ priv->search_sig = 0;
+ }
+
+ if (priv->activate_sig != 0)
+ {
+ g_signal_handler_disconnect (priv->search, priv->activate_sig);
+ priv->activate_sig = 0;
+ }
+
tp_clear_object (&priv->settings);
tp_clear_object (&priv->network);
tp_clear_object (&priv->network_manager);
tp_clear_object (&priv->settings);
tp_clear_object (&priv->network);
tp_clear_object (&priv->network_manager);