From d8c92944b482f288cb01f6de3d59e3f560e2f347 Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Fri, 16 Apr 2004 14:44:28 +0000 Subject: [PATCH] post branch release bump to 2.7.0 2004-04-16 Jody Goldberg * configure.in : post branch release bump to 2.7.0 2004-04-16 Jody Goldberg From paolo borelli : http://bugzilla.gnome.org/show_bug.cgi?id=139723 * gnome-keybinding-properties.c (accel_edited_callback) : fix leak --- ChangeLog | 4 ++++ capplets/keybindings/ChangeLog | 6 ++++++ capplets/keybindings/gnome-keybinding-properties.c | 13 ++++++++++--- configure.in | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f54dc2246..7ede92050 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-04-16 Jody Goldberg + + * configure.in : post branch release bump to 2.7.0 + 2004-04-15 Jody Goldberg * Release 2.6.1 diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index 3ad2979a9..d55037756 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,9 @@ +2004-04-16 Jody Goldberg + + From paolo borelli : + http://bugzilla.gnome.org/show_bug.cgi?id=139723 + * gnome-keybinding-properties.c (accel_edited_callback) : fix leak + 2004-04-15 Jody Goldberg * Release 2.6.1 diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index c6ca43aed..57fc02d2a 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -694,6 +694,7 @@ accel_edited_callback (GtkCellRendererText *cell, guint keycode, gpointer data) { + GConfClient *client; GtkTreeView *view = (GtkTreeView *)data; GtkTreeModel *model; GtkTreePath *path = gtk_tree_path_new_from_string (path_string); @@ -756,12 +757,14 @@ accel_edited_callback (GtkCellRendererText *cell, str = binding_name (keyval, keycode, mask, FALSE); - gconf_client_set_string (gconf_client_get_default(), + client = gconf_client_get_default(); + gconf_client_set_string (client, key_entry->gconf_key, str, &err); g_free (str); - + g_object_unref (G_OBJECT (client)); + if (err != NULL) { GtkWidget *dialog; @@ -785,6 +788,7 @@ accel_cleared_callback (GtkCellRendererText *cell, const char *path_string, gpointer data) { + GConfClient *client; GtkTreeView *view = (GtkTreeView *) data; GtkTreePath *path = gtk_tree_path_new_from_string (path_string); KeyEntry *key_entry; @@ -804,10 +808,13 @@ accel_cleared_callback (GtkCellRendererText *cell, return; /* Unset the key */ - gconf_client_set_string (gconf_client_get_default(), + client = gconf_client_get_default(); + gconf_client_set_string (client, key_entry->gconf_key, "disabled", &err); + g_object_unref (G_OBJECT (client)); + if (err != NULL) { GtkWidget *dialog; diff --git a/configure.in b/configure.in index b4d58f40d..580d7e56a 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ AC_INIT(control-center) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(control-center, 2.6.1) +AM_INIT_AUTOMAKE(control-center, 2.7.0) AM_MAINTAINER_MODE