applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wacom: Destroy button mapping dialogue on unplug

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=676790
This commit is contained in:
Bastien Nocera 2012-05-25 11:19:37 +01:00
parent 0b782b5633
commit aa161bacc9
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
panels/wacom/cc-wacom-page.c
View file

@ -69,6 +69,7 @@ struct _CcWacomPagePrivate
/* Button mapping */ /* Button mapping */
GtkBuilder *mapping_builder; GtkBuilder *mapping_builder;
GtkWidget *button_map;
/* Display mapping */ /* Display mapping */
GtkWidget *mapping; GtkWidget *mapping;
@ -679,6 +680,9 @@ map_buttons_button_clicked_cb (GtkButton *button,
G_CALLBACK (button_mapping_dialog_closed), page); G_CALLBACK (button_mapping_dialog_closed), page);
gtk_widget_show (dialog); gtk_widget_show (dialog);
priv->button_map = dialog;
g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &priv->button_map);
} }
static void static void
@ -835,6 +839,11 @@ cc_wacom_page_dispose (GObject *object)
priv->area = NULL; priv->area = NULL;
} }
if (priv->button_map) {
gtk_widget_destroy (priv->button_map);
priv->button_map = NULL;
}
if (priv->builder) { if (priv->builder) {
g_object_unref (priv->builder); g_object_unref (priv->builder);
priv->builder = NULL; priv->builder = NULL;