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

only declare variables at the beginning of a code block... ... and fix a

Browse source 
2008-01-24  Jens Granseuer  <jensgr@gmx.net>

	* appearance-desktop.c: (on_item_changed): only declare variables at
	the beginning of a code block...
	* gnome-wp-item.c: (gnome_wp_item_update_description): ... and fix a
	constness warning
	* gnome-wp-xml.c: (gnome_wp_xml_load_xml): remove unused variable

svn path=/trunk/; revision=8410
This commit is contained in:
Jens Granseuer 2008-01-24 18:55:18 +00:00 • committed by Jens Granseuer
parent 6e0ad68523
commit 2824523e94
4 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/appearance/ChangeLog
View file

@ -1,3 +1,11 @@
2008-01-24 Jens Granseuer <jensgr@gmx.net>
* appearance-desktop.c: (on_item_changed): only declare variables at
the beginning of a code block...
* gnome-wp-item.c: (gnome_wp_item_update_description): ... and fix a
constness warning
* gnome-wp-xml.c: (gnome_wp_xml_load_xml): remove unused variable
2008-01-14 Soren Sandmann <sandmann@redhat.com>
* appearance-desktop.c: Update list model when the background

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

@ -131,14 +131,16 @@ static void on_item_changed (GnomeBG *bg, AppearanceData *data) {
if (!item)
return;
model = gtk_tree_row_reference_get_model (item->rowref);
path = gtk_tree_row_reference_get_path (item->rowref);
if (gtk_tree_model_get_iter (model, &iter, path)) {
GdkPixbuf *pixbuf;
g_signal_handlers_block_by_func (bg, G_CALLBACK (on_item_changed), data);
GdkPixbuf *pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
if (pixbuf) {
gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter,
0, pixbuf,

17
capplets/appearance/gnome-wp-item.c
View file

@ -36,7 +36,7 @@ static void set_bg_properties (GnomeWPItem *item)
GnomeBGPlacement placement;
color = GNOME_BG_COLOR_SOLID;
if (item->shade_type) {
if (!strcmp (item->shade_type, "horizontal-gradient")) {
color = GNOME_BG_COLOR_H_GRADIENT;
@ -46,7 +46,7 @@ static void set_bg_properties (GnomeWPItem *item)
}
placement = GNOME_BG_PLACEMENT_TILED;
if (item->options) {
if (!strcmp (item->options, "centered")) {
placement = GNOME_BG_PLACEMENT_CENTERED;
@ -138,7 +138,7 @@ GnomeWPItem * gnome_wp_item_new (const gchar * filename,
if (item) {
gnome_wp_item_ensure_gnome_bg (item);
}
g_object_unref (client);
return item;
@ -225,15 +225,15 @@ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
GnomeThumbnailFactory * thumbs) {
GdkPixbuf *pixbuf;
double aspect =
(double)gdk_screen_get_height (gdk_screen_get_default()) /
(double)gdk_screen_get_height (gdk_screen_get_default()) /
gdk_screen_get_width (gdk_screen_get_default());
set_bg_properties (item);
pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect);
gnome_bg_get_image_size (item->bg, thumbs, &item->width, &item->height);
return pixbuf;
}
@ -243,13 +243,14 @@ void gnome_wp_item_update_description (GnomeWPItem * item) {
if (!strcmp (item->filename, "(none)")) {
item->description = g_strdup (item->name);
} else {
gchar *description;
const gchar *description;
gchar *dirname = g_path_get_dirname (item->filename);
if (strcmp (item->fileinfo->mime_type, "application/xml") == 0)
description = _("Slide Show");
else
description = gnome_vfs_mime_get_description (item->fileinfo->mime_type);
gchar *dirname = g_path_get_dirname (item->filename);
/* translators: <b>wallpaper name</b>
* mime type, x pixel(s) by y pixel(s)
* Folder: /path/to/file

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

@ -103,7 +103,6 @@ static void gnome_wp_xml_load_xml (AppearanceData *data,
xmlChar * nodelang;
const gchar * const * syslangs;
GdkColor color1, color2;
GnomeWPItem * item;
gint i;
wplist = xmlParseFile (filename);