AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

ComboBox: Clean up handler disconnection some more

Browse Source
This commit is contained in:
Daniel Boles 2017-09-01 11:43:44 +01:00
parent d6ae627069
commit 85ca68b1c2
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkcombobox.c
View File

@ -2791,12 +2791,8 @@ gtk_combo_box_menu_destroy (GtkComboBox *combo_box)
{
GtkComboBoxPrivate *priv = combo_box->priv;
g_signal_handlers_disconnect_by_func (priv->button,
gtk_combo_box_menu_button_press, combo_box);
g_signal_handlers_disconnect_by_func (priv->button,
gtk_combo_box_button_state_flags_changed, combo_box);
g_signal_handlers_disconnect_by_func (priv->popup_widget,
gtk_combo_box_menu_activate, combo_box);
g_signal_handlers_disconnect_by_data (priv->button, combo_box);
g_signal_handlers_disconnect_by_data (priv->popup_widget, combo_box);
/* changing the popup window will unref the menu and the children */
}
@ -3062,10 +3058,8 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box)
GtkComboBoxPrivate *priv = combo_box->priv;
/* disconnect signals */
g_signal_handlers_disconnect_by_data (priv->button, combo_box);
g_signal_handlers_disconnect_by_data (priv->tree_view, combo_box);
g_signal_handlers_disconnect_by_func (priv->button,
gtk_combo_box_list_button_pressed,
combo_box);
g_signal_handlers_disconnect_by_data (priv->popup_window, combo_box);
if (priv->cell_view)
@ -3088,8 +3082,8 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box)
}
gtk_widget_destroy (priv->tree_view);
priv->tree_view = NULL;
if (priv->popup_widget)
{
g_object_unref (priv->popup_widget);