45a77d648e
===================================================================
--- gnome-settings-daemon/ChangeLog (revision 8392)
+++ gnome-settings-daemon/ChangeLog (working copy)
@@ -1,3 +1,9 @@
+2008-01-14 Soren Sandmann <sandmann@daimi.au.dk>
+
+ * gnome-settings-background.c: Use GnomeBG from gnome-desktop
+
+
+
2008-01-14 Denis Washington <denisw@svn.gnome.org>
* gnome-settings-mouse.c:
===================================================================
--- libbackground/ChangeLog (revision 8336)
+++ libbackground/ChangeLog (working copy)
@@ -1,3 +1,9 @@
+2008-01-14 Soren Sandmann <sandmann@daimi.au.dk>
+
+ * applier.[ch]: Delete these files
+
+ * Makefile.am: Remove them here.
+
2007-04-16 Jens Granseuer <jensgr@gmx.net>
Patch by: Erich Schubert <erich@debian.org>
Index: capplets/appearance/ChangeLog
===================================================================
--- capplets/appearance/ChangeLog (revision 8392)
+++ capplets/appearance/ChangeLog (working copy)
@@ -1,3 +1,13 @@
+2008-01-14 Soren Sandmann <sandmann@redhat.com>
+
+ * appearance-desktop.c: Update list model when the background
+ changes.
+ * gnome-wp-item.c: Create a GnomeBG for the item.
+ * gnome-wp-item.h: Add a GnomeBG field - Remove
+ gnome_wp_item_dup() function.
+ * gnome-wp-info.c: Delete gnome_wp_item_dup() function.
+ * gnome-wp-xml.c: Ensure that a GnomeBG exists.
+
2007-12-22 Thomas Wood <thos@gnome.org>
* theme-installer.c: (transfer_done_tgz_tbz),
svn path=/trunk/; revision=8393
82 lines
2.2 KiB
C
82 lines
2.2 KiB
C
/*
|
|
* Authors: Rodney Dawes <dobey@ximian.com>
|
|
*
|
|
* Copyright 2003-2006 Novell, Inc. (www.novell.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of version 2 of the GNU General Public License
|
|
* as published by the Free Software Foundation
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <gnome.h>
|
|
#include "gnome-wp-info.h"
|
|
|
|
GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
|
|
GnomeThumbnailFactory * thumbs) {
|
|
GnomeWPInfo * new;
|
|
GnomeVFSFileInfo * info;
|
|
GnomeVFSResult result;
|
|
gchar * escaped_path;
|
|
|
|
info = gnome_vfs_file_info_new ();
|
|
escaped_path = gnome_vfs_escape_path_string (uri);
|
|
|
|
result = gnome_vfs_get_file_info (escaped_path, info,
|
|
GNOME_VFS_FILE_INFO_DEFAULT |
|
|
GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
|
|
GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
|
|
if (info == NULL || info->mime_type == NULL || result != GNOME_VFS_OK) {
|
|
if (!strcmp (uri, "(none)")) {
|
|
new = g_new0 (GnomeWPInfo, 1);
|
|
|
|
new->mime_type = g_strdup ("image/x-no-data");
|
|
new->uri = g_strdup (uri);
|
|
new->name = g_strdup (_("No Wallpaper"));
|
|
new->size = 0;
|
|
} else {
|
|
new = NULL;
|
|
}
|
|
} else {
|
|
new = g_new0 (GnomeWPInfo, 1);
|
|
|
|
new->uri = g_strdup (uri);
|
|
|
|
new->thumburi = gnome_thumbnail_factory_lookup (thumbs,
|
|
escaped_path,
|
|
info->mtime);
|
|
new->name = g_strdup (info->name);
|
|
new->mime_type = g_strdup (info->mime_type);
|
|
|
|
new->size = info->size;
|
|
new->mtime = info->mtime;
|
|
}
|
|
g_free (escaped_path);
|
|
gnome_vfs_file_info_unref (info);
|
|
|
|
return new;
|
|
}
|
|
|
|
void gnome_wp_info_free (GnomeWPInfo * info) {
|
|
if (info == NULL) {
|
|
return;
|
|
}
|
|
|
|
g_free (info->uri);
|
|
g_free (info->thumburi);
|
|
g_free (info->name);
|
|
g_free (info->mime_type);
|
|
|
|
info = NULL;
|
|
}
|
|
|