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

Free what we get with gtk_tree_model_get

Browse source 
2004-07-19  Rodney Dawes  <dobey@novell.com>

	* gnome-wp-item.c (gnome_wp_remove_wallpaper, gnome_wp_list_sort):
	Free what we get with gtk_tree_model_get

	Fixes #147403
This commit is contained in:
Rodney Dawes 2004-07-19 21:16:50 +00:00 • committed by Rodney Dawes
parent 80529d675e
commit 6d976698e6
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/background/ChangeLog
View file

@ -1,3 +1,10 @@
2004-07-19 Rodney Dawes <dobey@novell.com>
* gnome-wp-item.c (gnome_wp_remove_wallpaper, gnome_wp_list_sort):
Free what we get with gtk_tree_model_get
Fixes #147403
2004-07-15 Rodney Dawes <dobey@novell.com> 2004-07-15 Rodney Dawes <dobey@novell.com>
* gnome-wp-item.c (gnome_wp_item_new): * gnome-wp-item.c (gnome_wp_item_new):

16
capplets/background/gnome-wp-capplet.c
View file

@ -577,6 +577,8 @@ static void gnome_wp_remove_wallpaper (GtkWidget * widget,
item->deleted = TRUE; item->deleted = TRUE;
gtk_list_store_remove (GTK_LIST_STORE (model), &iter); gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
g_free (wpfile);
} }
first = gtk_tree_path_new_first (); first = gtk_tree_path_new_first ();
gtk_tree_view_set_cursor (GTK_TREE_VIEW (capplet->treeview), gtk_tree_view_set_cursor (GTK_TREE_VIEW (capplet->treeview),
@ -671,17 +673,25 @@ static gint gnome_wp_list_sort (GtkTreeModel * model,
GnomeWPCapplet * capplet) { GnomeWPCapplet * capplet) {
gchar * foo, * bar; gchar * foo, * bar;
gchar * desca, * descb; gchar * desca, * descb;
gint retval;
gtk_tree_model_get (model, a, 1, &desca, 2, &foo, -1); gtk_tree_model_get (model, a, 1, &desca, 2, &foo, -1);
gtk_tree_model_get (model, b, 1, &descb, 2, &bar, -1); gtk_tree_model_get (model, b, 1, &descb, 2, &bar, -1);
if (!strcmp (foo, "(none)")) { if (!strcmp (foo, "(none)")) {
return -1; retval = -1;
} else if (!strcmp (bar, "(none)")) { } else if (!strcmp (bar, "(none)")) {
return 1; retval = 1;
} else { } else {
return g_utf8_collate (desca, descb); retval = g_utf8_collate (desca, descb);
} }
g_free (desca);
g_free (descb);
g_free (foo);
g_free (bar);
return retval;
} }
static void gnome_wp_file_changed (GConfClient * client, guint id, static void gnome_wp_file_changed (GConfClient * client, guint id,