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

post branch release bump to 2.7.0

Browse source 
2004-04-16  Jody Goldberg <jody@gnome.org>

	* configure.in : post branch release bump to 2.7.0

2004-04-16  Jody Goldberg <jody@gnome.org>

	From paolo borelli :
	http://bugzilla.gnome.org/show_bug.cgi?id=139723
	* gnome-keybinding-properties.c (accel_edited_callback) : fix leak
This commit is contained in:
Jody Goldberg 2004-04-16 14:44:28 +00:00 • committed by Jody Goldberg
parent d58e918c83
commit d8c92944b4
4 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2004-04-16 Jody Goldberg <jody@gnome.org>
* configure.in : post branch release bump to 2.7.0
2004-04-15 Jody Goldberg <jody@gnome.org> 2004-04-15 Jody Goldberg <jody@gnome.org>
* Release 2.6.1 * Release 2.6.1

6
capplets/keybindings/ChangeLog
View file

@ -1,3 +1,9 @@
2004-04-16 Jody Goldberg <jody@gnome.org>
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 <jody@gnome.org> 2004-04-15 Jody Goldberg <jody@gnome.org>
* Release 2.6.1 * Release 2.6.1

13
capplets/keybindings/gnome-keybinding-properties.c
View file

@ -694,6 +694,7 @@ accel_edited_callback (GtkCellRendererText *cell,
guint keycode, guint keycode,
gpointer data) gpointer data)
{ {
GConfClient *client;
GtkTreeView *view = (GtkTreeView *)data; GtkTreeView *view = (GtkTreeView *)data;
GtkTreeModel *model; GtkTreeModel *model;
GtkTreePath *path = gtk_tree_path_new_from_string (path_string); 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); 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, key_entry->gconf_key,
str, str,
&err); &err);
g_free (str); g_free (str);
g_object_unref (G_OBJECT (client));
if (err != NULL) if (err != NULL)
{ {
GtkWidget *dialog; GtkWidget *dialog;
@ -785,6 +788,7 @@ accel_cleared_callback (GtkCellRendererText *cell,
const char *path_string, const char *path_string,
gpointer data) gpointer data)
{ {
GConfClient *client;
GtkTreeView *view = (GtkTreeView *) data; GtkTreeView *view = (GtkTreeView *) data;
GtkTreePath *path = gtk_tree_path_new_from_string (path_string); GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
KeyEntry *key_entry; KeyEntry *key_entry;
@ -804,10 +808,13 @@ accel_cleared_callback (GtkCellRendererText *cell,
return; return;
/* Unset the key */ /* 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, key_entry->gconf_key,
"disabled", "disabled",
&err); &err);
g_object_unref (G_OBJECT (client));
if (err != NULL) if (err != NULL)
{ {
GtkWidget *dialog; GtkWidget *dialog;

2
configure.in
View file

@ -1,7 +1,7 @@
AC_INIT(control-center) AC_INIT(control-center)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(control-center, 2.6.1) AM_INIT_AUTOMAKE(control-center, 2.7.0)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE