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

use gdk_color_to_string instead of g_strdup_printf remove check for old

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

	* appearance-desktop.c: (wp_color_changed): use gdk_color_to_string
	instead of g_strdup_printf
	* gnome-wp-xml.c: (gnome_wp_xml_load_xml),
	(gnome_wp_xml_load_list): remove check for old glib version that
	would result in bogus code, and save an unnecessary alloc

svn path=/trunk/; revision=7956
This commit is contained in:
Jens Granseuer 2007-08-03 21:02:47 +00:00 • committed by Jens Granseuer
parent b7ad0952dc
commit 54d446ae88
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/appearance/ChangeLog
View file

@ -1,3 +1,11 @@
2007-08-03 Jens Granseuer <jensgr@gmx.net>
* appearance-desktop.c: (wp_color_changed): use gdk_color_to_string
instead of g_strdup_printf
* gnome-wp-xml.c: (gnome_wp_xml_load_xml),
(gnome_wp_xml_load_list): remove check for old glib version that
would result in bogus code, and save an unnecessary alloc
2007-08-03 Jens Granseuer <jensgr@gmx.net> 2007-08-03 Jens Granseuer <jensgr@gmx.net>
* appearance-desktop.c: (wp_props_load_wallpaper), (wp_add_image), * appearance-desktop.c: (wp_props_load_wallpaper), (wp_add_image),

10
capplets/appearance/appearance-desktop.c
View file

@ -406,19 +406,13 @@ wp_color_changed (AppearanceData *data,
gtk_color_button_get_color (GTK_COLOR_BUTTON (data->wp_pcpicker), item->pcolor); gtk_color_button_get_color (GTK_COLOR_BUTTON (data->wp_pcpicker), item->pcolor);
item->pri_color = g_strdup_printf ("#%02X%02X%02X", item->pri_color = gdk_color_to_string (item->pcolor);
item->pcolor->red >> 8,
item->pcolor->green >> 8,
item->pcolor->blue >> 8);
g_free (item->sec_color); g_free (item->sec_color);
gtk_color_button_get_color (GTK_COLOR_BUTTON (data->wp_scpicker), item->scolor); gtk_color_button_get_color (GTK_COLOR_BUTTON (data->wp_scpicker), item->scolor);
item->sec_color = g_strdup_printf ("#%02X%02X%02X", item->sec_color = gdk_color_to_string (item->scolor);
item->scolor->red >> 8,
item->scolor->green >> 8,
item->scolor->blue >> 8);
if (update) if (update)
{ {

14
capplets/appearance/gnome-wp-xml.c
View file

@ -106,15 +106,13 @@ static void gnome_wp_xml_load_xml (AppearanceData *data,
GnomeWPItem * item; GnomeWPItem * item;
gint i; gint i;
#if GLIB_CHECK_VERSION (2, 6, 0)
syslangs = g_get_language_names ();
#endif
wplist = xmlParseFile (filename); wplist = xmlParseFile (filename);
if (!wplist) if (!wplist)
return; return;
syslangs = g_get_language_names ();
root = xmlDocGetRootElement (wplist); root = xmlDocGetRootElement (wplist);
for (list = root->children; list != NULL; list = list->next) { for (list = root->children; list != NULL; list = list->next) {
@ -264,7 +262,8 @@ static void gnome_wp_file_changed (GnomeVFSMonitorHandle * handle,
void gnome_wp_xml_load_list (AppearanceData *data) { void gnome_wp_xml_load_list (AppearanceData *data) {
GnomeVFSMonitorHandle * handle; GnomeVFSMonitorHandle * handle;
GList * list, * l; GList * list, * l;
gchar * wpdbfile, * xdgdirslist; const gchar * xdgdirslist;
gchar * wpdbfile;
gchar ** xdgdirs; gchar ** xdgdirs;
gint i; gint i;
@ -287,9 +286,9 @@ void gnome_wp_xml_load_list (AppearanceData *data) {
} }
g_free (wpdbfile); g_free (wpdbfile);
xdgdirslist = g_strdup (g_getenv ("XDG_DATA_DIRS")); xdgdirslist = g_getenv ("XDG_DATA_DIRS");
if (xdgdirslist == NULL || strlen (xdgdirslist) == 0) if (xdgdirslist == NULL || strlen (xdgdirslist) == 0)
xdgdirslist = g_strdup ("/usr/local/share:/usr/share"); xdgdirslist = "/usr/local/share:/usr/share";
xdgdirs = g_strsplit (xdgdirslist, ":", -1); xdgdirs = g_strsplit (xdgdirslist, ":", -1);
for (i = 0; xdgdirs && xdgdirs[i]; i++) { for (i = 0; xdgdirs && xdgdirs[i]; i++) {
@ -322,7 +321,6 @@ void gnome_wp_xml_load_list (AppearanceData *data) {
g_free (datadir); g_free (datadir);
} }
g_strfreev (xdgdirs); g_strfreev (xdgdirs);
g_free (xdgdirslist);
if (g_file_test (WALLPAPER_DATADIR, G_FILE_TEST_IS_DIR)) { if (g_file_test (WALLPAPER_DATADIR, G_FILE_TEST_IS_DIR)) {
gnome_vfs_directory_list_load (&list, WALLPAPER_DATADIR, gnome_vfs_directory_list_load (&list, WALLPAPER_DATADIR,