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

region: Fix memory leaks and destroy dialogue properly

Browse source 
There's no top-level dialogue any more, so we need some way to
clean up after ourselves.
This commit is contained in:
Bastien Nocera 2011-01-24 17:31:47 +00:00
parent cc172a4754
commit 0c8dd1aebc
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
panels/region/cc-region-panel.c
View file

@ -65,6 +65,8 @@ cc_region_panel_dispose (GObject * object)
CcRegionPanelPrivate *priv = CC_REGION_PANEL (object)->priv; CcRegionPanelPrivate *priv = CC_REGION_PANEL (object)->priv;
if (priv->builder) { if (priv->builder) {
GtkBuilder *dialog = priv->builder;
gtk_widget_destroy (WID ("region_notebook"));
g_object_unref (priv->builder); g_object_unref (priv->builder);
priv->builder = NULL; priv->builder = NULL;
} }

12
panels/region/gnome-region-panel-xkb.c
View file

@ -99,13 +99,16 @@ setup_model_entry (GtkBuilder * dialog)
} }
static void static void
cleanup_xkb_tabs (GtkBuilder * dialog) cleanup_xkb_tabs (GtkBuilder * dialog,
GObject *where_the_object_wa)
{ {
g_message ("cleanup_xkb_tabs running");
gkbd_desktop_config_term (&desktop_config); gkbd_desktop_config_term (&desktop_config);
gkbd_keyboard_config_term (&initial_config); gkbd_keyboard_config_term (&initial_config);
g_object_unref (G_OBJECT (config_registry)); g_object_unref (G_OBJECT (config_registry));
config_registry = NULL; config_registry = NULL;
g_object_unref (G_OBJECT (engine)); /* Don't unref it here, or we'll crash if open the panel again */
engine = NULL; engine = NULL;
g_object_unref (G_OBJECT (xkb_keyboard_settings)); g_object_unref (G_OBJECT (xkb_keyboard_settings));
g_object_unref (G_OBJECT (xkb_desktop_settings)); g_object_unref (G_OBJECT (xkb_desktop_settings));
@ -225,9 +228,8 @@ setup_xkb_tabs (GtkBuilder * dialog)
xkb_layouts_register_conf_listener (dialog); xkb_layouts_register_conf_listener (dialog);
xkb_options_register_conf_listener (dialog); xkb_options_register_conf_listener (dialog);
g_signal_connect (G_OBJECT (WID ("region_dialog")), g_object_weak_ref (G_OBJECT (WID ("region_notebook")),
"destroy", G_CALLBACK (cleanup_xkb_tabs), (GWeakNotify) cleanup_xkb_tabs, dialog);
dialog);
enable_disable_restoring (dialog); enable_disable_restoring (dialog);
} }