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

Prevent some memory leaks

Browse source 
2007-07-29  Thomas Wood  <thos@gnome.org>

	* appearance-style.c: (cursor_theme_sort_func), (prepare_list),
	(style_init): Prevent some memory leaks

2007-07-29  Thomas Wood  <thos@gnome.org>

	* gnome-theme-apply.c: (gnome_meta_theme_set):
	* gtkrc-utils.c: (gtkrc_get_details), (gtkrc_get_color_scheme):

	Prevent some memory leaks

svn path=/trunk/; revision=7920
This commit is contained in:
Thomas Wood 2007-07-29 13:05:29 +00:00 • committed by Thomas Wood
parent 930245a60b
commit 23c161aa35
5 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/appearance/ChangeLog
View file

@ -1,3 +1,8 @@
2007-07-29 Thomas Wood <thos@gnome.org>
* appearance-style.c: (cursor_theme_sort_func), (prepare_list),
(style_init): Prevent some memory leaks
2007-07-29 Thomas Wood <thos@gnome.org> 2007-07-29 Thomas Wood <thos@gnome.org>
* theme-installer.c: (file_theme_type), (gnome_theme_install_real): * theme-installer.c: (file_theme_type), (gnome_theme_install_real):

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

@ -135,9 +135,10 @@ cursor_theme_sort_func (GtkTreeModel *model,
GtkTreeIter *b, GtkTreeIter *b,
gpointer user_data) gpointer user_data)
{ {
const gchar *a_label = NULL; gchar *a_label = NULL;
const gchar *b_label = NULL; gchar *b_label = NULL;
const gchar *default_label; const gchar *default_label;
gint result;
gtk_tree_model_get (model, a, COL_LABEL, &a_label, -1); gtk_tree_model_get (model, a, COL_LABEL, &a_label, -1);
gtk_tree_model_get (model, b, COL_LABEL, &b_label, -1); gtk_tree_model_get (model, b, COL_LABEL, &b_label, -1);
@ -145,11 +146,16 @@ cursor_theme_sort_func (GtkTreeModel *model,
default_label = _("Default Pointer"); default_label = _("Default Pointer");
if (!strcmp (a_label, default_label)) if (!strcmp (a_label, default_label))
return -1; result = -1;
else if (!strcmp (b_label, default_label)) else if (!strcmp (b_label, default_label))
return 1; result = 1;
else else
return strcmp (a_label, b_label); result = strcmp (a_label, b_label);
g_free (a_label);
g_free (b_label);
return result;
} }
static void static void
@ -856,6 +862,7 @@ style_init (AppearanceData *data)
GtkSettings *settings; GtkSettings *settings;
GtkWidget *w; GtkWidget *w;
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
gchar *label;
data->gtk_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/gtk-theme-thumbnailing.png", NULL); data->gtk_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/gtk-theme-thumbnailing.png", NULL);
data->window_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/window-theme-thumbnailing.png", NULL); data->window_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/window-theme-thumbnailing.png", NULL);
@ -889,9 +896,14 @@ style_init (AppearanceData *data)
g_object_set (G_OBJECT (adjustment), "page-size", 0.0, NULL); g_object_set (G_OBJECT (adjustment), "page-size", 0.0, NULL);
w = glade_xml_get_widget (data->xml, "cursor_size_small_label"); w = glade_xml_get_widget (data->xml, "cursor_size_small_label");
gtk_label_set_markup (GTK_LABEL (w), g_strdup_printf ("<small><i>%s</i></small>", gtk_label_get_text (GTK_LABEL (w)))); label = g_strdup_printf ("<small><i>%s</i></small>", gtk_label_get_text (GTK_LABEL (w)));
gtk_label_set_markup (GTK_LABEL (w), label);
g_free (label);
w = glade_xml_get_widget (data->xml, "cursor_size_large_label"); w = glade_xml_get_widget (data->xml, "cursor_size_large_label");
gtk_label_set_markup (GTK_LABEL (w), g_strdup_printf ("<small><i>%s</i></small>", gtk_label_get_text (GTK_LABEL (w)))); label = g_strdup_printf ("<small><i>%s</i></small>", gtk_label_get_text (GTK_LABEL (w)));
gtk_label_set_markup (GTK_LABEL (w), label);
g_free (label);
#else #else
w = glade_xml_get_widget (data->xml, "cursor_size_hbox"); w = glade_xml_get_widget (data->xml, "cursor_size_hbox");
gtk_widget_set_no_show_all (w, TRUE); gtk_widget_set_no_show_all (w, TRUE);

7
capplets/common/ChangeLog
View file

@ -1,3 +1,10 @@
2007-07-29 Thomas Wood <thos@gnome.org>
* gnome-theme-apply.c: (gnome_meta_theme_set):
* gtkrc-utils.c: (gtkrc_get_details), (gtkrc_get_color_scheme):
Prevent some memory leaks
2007-07-28 Denis Washington <denisw@svn.gnome.org> 2007-07-28 Denis Washington <denisw@svn.gnome.org>
* gnome-theme-info.h: * gnome-theme-info.h:

1
capplets/common/gnome-theme-apply.c
View file

@ -75,6 +75,7 @@ gnome_meta_theme_set (GnomeThemeMetaInfo *meta_theme_info)
{ {
gconf_client_set_string (client, COLOR_SCHEME_KEY, newval, NULL); gconf_client_set_string (client, COLOR_SCHEME_KEY, newval, NULL);
} }
g_free (gtkcols);
} }
g_free (old_key); g_free (old_key);

7
capplets/common/gtkrc-utils.c
View file

@ -154,6 +154,9 @@ gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors)
} }
} }
g_slist_foreach (read_files, (GFunc) g_free, NULL);
g_slist_free (read_files);
g_scanner_destroy (scanner); g_scanner_destroy (scanner);
} }
@ -209,6 +212,10 @@ gtkrc_get_color_scheme (gchar *filename)
} }
} }
} }
g_slist_foreach (read_files, (GFunc) g_free, NULL);
g_slist_free (read_files);
g_scanner_destroy (scanner); g_scanner_destroy (scanner);
return result; return result;
} }