From 00b23ef1afa417fda5d7656e178e4d49bd5e0a33 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 10 Jan 2007 17:34:03 +0000 Subject: [PATCH] Fixes #394824 2007-01-10 Rodrigo Moya Fixes #394824 Patch by Jens Granseuer * gnome-keybinding-properties.c (key_entry_controlling_key_changed, setup_dialog, main): fixed leaks. svn path=/trunk/; revision=7129 --- capplets/keybindings/ChangeLog | 9 +++++++++ capplets/keybindings/gnome-keybinding-properties.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index 4a005904e..62a12e47e 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,12 @@ +2007-01-10 Rodrigo Moya + + Fixes #394824 + + Patch by Jens Granseuer + + * gnome-keybinding-properties.c (key_entry_controlling_key_changed, + setup_dialog, main): fixed leaks. + 2007-01-08 Rodrigo Moya * gnome-keybinding-properties.c (create_dialog, clear_old_model): diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 4786724c9..1918c4f05 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -575,7 +575,9 @@ key_entry_controlling_key_changed (GConfClient *client, GConfEntry *entry, gpointer user_data) { - reload_key_entries (wm_common_get_current_window_manager(), user_data); + gchar *wm_name = wm_common_get_current_window_manager(); + reload_key_entries (wm_name, user_data); + g_free (wm_name); } static gboolean @@ -881,6 +883,7 @@ setup_dialog (GladeXML *dialog) GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkWidget *widget; + gchar *wm_name; client = gconf_client_get_default (); @@ -932,7 +935,9 @@ setup_dialog (GladeXML *dialog) g_object_unref (client); /* set up the dialog */ - reload_key_entries (wm_common_get_current_window_manager(), dialog); + wm_name = wm_common_get_current_window_manager(); + reload_key_entries (wm_name, dialog); + g_free (wm_name); widget = WID ("gnome-keybinding-dialog"); capplet_set_icon (widget, "gnome-settings-keybindings"); @@ -969,6 +974,8 @@ main (int argc, char *argv[]) gtk_main (); - g_object_unref(program); + clear_old_model (dialog, WID ("shortcut_treeview")); + g_object_unref (dialog); + g_object_unref (program); return 0; }