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

make sure we have a selection before trying to get the data (bug #465431)

Browse source 
2007-08-11  Jens Granseuer  <jensgr@gmx.net>

	* appearance-style.c: (conv_from_widget_cb): make sure we have a
	selection before trying to get the data (bug #465431)

svn path=/trunk/; revision=7987
This commit is contained in:
Jens Granseuer 2007-08-11 13:17:31 +00:00 • committed by Jens Granseuer
parent 6b148c2959
commit 91a555aa0c
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/appearance/ChangeLog
View file

@ -1,3 +1,8 @@
2007-08-11 Jens Granseuer <jensgr@gmx.net>
* appearance-style.c: (conv_from_widget_cb): make sure we have a
selection before trying to get the data (bug #465431)
2007-08-11 Jens Granseuer <jensgr@gmx.net> 2007-08-11 Jens Granseuer <jensgr@gmx.net>
* theme-installer.c: (gnome_theme_install_from_uri): fix leak * theme-installer.c: (gnome_theme_install_from_uri): fix leak

21
capplets/appearance/appearance-style.c
View file

@ -115,23 +115,26 @@ conv_to_widget_cb (GConfPropertyEditor *peditor, const GConfValue *value)
static GConfValue * static GConfValue *
conv_from_widget_cb (GConfPropertyEditor *peditor, const GConfValue *value) conv_from_widget_cb (GConfPropertyEditor *peditor, const GConfValue *value)
{ {
GConfValue *new_value; GConfValue *new_value = NULL;
gchar *list_value = NULL;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeSelection *selection; GtkTreeSelection *selection;
GtkTreeModel *model; GtkTreeModel *model;
GtkTreeView *list; GtkTreeView *list;
list = GTK_TREE_VIEW (gconf_property_editor_get_ui_control (peditor)); list = GTK_TREE_VIEW (gconf_property_editor_get_ui_control (peditor));
model = gtk_tree_view_get_model (list);
selection = gtk_tree_view_get_selection (list); selection = gtk_tree_view_get_selection (list);
gtk_tree_selection_get_selected (selection, NULL, &iter);
gtk_tree_model_get (model, &iter, COL_NAME, &list_value, -1);
new_value = gconf_value_new (GCONF_VALUE_STRING); if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
gconf_value_set_string (new_value, list_value); gchar *list_value;
g_free (list_value);
gtk_tree_model_get (model, &iter, COL_NAME, &list_value, -1);
if (list_value) {
new_value = gconf_value_new (GCONF_VALUE_STRING);
gconf_value_set_string (new_value, list_value);
g_free (list_value);
}
}
return new_value; return new_value;
} }