gnome-control-center r9093 - in trunk: . capplets/about-me capplets/appearance

[ssp svn gnome org]

Author: ssp
Date: Fri Oct 24 18:44:52 2008
New Revision: 9093
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9093&view=rev

Log:
Fri Oct 24 14:44:16 2008  SÃren Sandmann  <sandmann redhat com>

	* Use GnomeDesktopThumbnailFactory instead of
	GnomeThumbnailFactory



Modified:
   trunk/ChangeLog
   trunk/capplets/about-me/gnome-about-me.c
   trunk/capplets/appearance/appearance-desktop.c
   trunk/capplets/appearance/appearance-main.c
   trunk/capplets/appearance/appearance-themes.c
   trunk/capplets/appearance/appearance.h
   trunk/capplets/appearance/gnome-wp-info.c
   trunk/capplets/appearance/gnome-wp-info.h
   trunk/capplets/appearance/gnome-wp-item.c
   trunk/capplets/appearance/gnome-wp-item.h
   trunk/configure.in

Modified: trunk/capplets/about-me/gnome-about-me.c
==============================================================================
--- trunk/capplets/about-me/gnome-about-me.c	(original)
+++ trunk/capplets/about-me/gnome-about-me.c	Fri Oct 24 18:44:52 2008
@@ -27,7 +27,7 @@
 #include <gnome.h>
 #include <pwd.h>
 #include <gio/gio.h>
-#include <libgnomeui/gnome-thumbnail.h>
+#include <libgnomeui/gnome-desktop-thumbnail.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
 #include <pwd.h>
@@ -52,7 +52,7 @@
 
 	GdkScreen    	*screen;
 	GtkIconTheme 	*theme;
-	GnomeThumbnailFactory *thumbs;
+	GnomeDesktopThumbnailFactory *thumbs;
 
 	EContactAddress *addr1;
 	EContactAddress *addr2;
@@ -680,7 +680,7 @@
 		GFileInfo *file_info;
 
 		if (!me->thumbs)
-			me->thumbs = gnome_thumbnail_factory_new (GNOME_THUMBNAIL_SIZE_NORMAL);
+			me->thumbs = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL);
 
 		file = g_file_new_for_uri (uri);
 		file_info = g_file_query_info (file,
@@ -698,7 +698,7 @@
 
 				mime_type = g_content_type_get_mime_type (content_type);
 
-				pixbuf = gnome_thumbnail_factory_generate_thumbnail (me->thumbs,
+				pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (me->thumbs,
 										     uri,
 										     mime_type);
 				g_free (mime_type);

Modified: trunk/capplets/appearance/appearance-desktop.c
==============================================================================
--- trunk/capplets/appearance/appearance-desktop.c	(original)
+++ trunk/capplets/appearance/appearance-desktop.c	Fri Oct 24 18:44:52 2008
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 #include <string.h>
 #include <gconf/gconf-client.h>
-#include <libgnomeui/gnome-thumbnail.h>
+#include <libgnomeui/gnome-desktop-thumbnail.h>
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-bg.h>
 
@@ -858,7 +858,7 @@
 
     if (mime_type)
     {
-      pixbuf = gnome_thumbnail_factory_generate_thumbnail (data->thumb_factory,
+      pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (data->thumb_factory,
                                                            uri,
                                                            mime_type);
     }

Modified: trunk/capplets/appearance/appearance-main.c
==============================================================================
--- trunk/capplets/appearance/appearance-main.c	(original)
+++ trunk/capplets/appearance/appearance-main.c	Fri Oct 24 18:44:52 2008
@@ -33,7 +33,7 @@
 #include <libgnome/libgnome.h>
 #include <libgnomeui/gnome-ui-init.h>
 /* ---------------------------------- */
-#include <libgnomeui/gnome-thumbnail.h>
+#include <libgnomeui/gnome-desktop-thumbnail.h>
 
 static AppearanceData *
 init_appearance_data (int *argc, char ***argv)
@@ -60,7 +60,7 @@
     data = g_new (AppearanceData, 1);
     data->client = gconf_client_get_default ();
     data->xml = ui;
-    data->thumb_factory = gnome_thumbnail_factory_new (GNOME_THUMBNAIL_SIZE_NORMAL);
+    data->thumb_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL);
   }
 
   return data;

Modified: trunk/capplets/appearance/appearance-themes.c
==============================================================================
--- trunk/capplets/appearance/appearance-themes.c	(original)
+++ trunk/capplets/appearance/appearance-themes.c	Fri Oct 24 18:44:52 2008
@@ -33,7 +33,7 @@
 #include <glib/gi18n.h>
 #include <libwindow-settings/gnome-wm-manager.h>
 #include <string.h>
-#include <libgnomeui/gnome-thumbnail.h>
+#include <libgnomeui/gnome-desktop-thumbnail.h>
 
 #define CUSTOM_THEME_NAME "__custom__"
 
@@ -112,7 +112,7 @@
       /* try to share thumbs with nautilus, use themes:/// */
       path = g_strconcat ("themes:///", theme_name, NULL);
 
-      gnome_thumbnail_factory_save_thumbnail (data->thumb_factory,
+      gnome_desktop_thumbnail_factory_save_thumbnail (data->thumb_factory,
 					      pixbuf, path, mtime);
 
       g_free (path);
@@ -136,7 +136,7 @@
 
   /* try to share thumbs with nautilus, use themes:/// */
   path = g_strconcat ("themes:///", info->name, NULL);
-  thumb_filename = gnome_thumbnail_factory_lookup (data->thumb_factory,
+  thumb_filename = gnome_desktop_thumbnail_factory_lookup (data->thumb_factory,
                                                    path, mtime);
   g_free (path);
 

Modified: trunk/capplets/appearance/appearance.h
==============================================================================
--- trunk/capplets/appearance/appearance.h	(original)
+++ trunk/capplets/appearance/appearance.h	Fri Oct 24 18:44:52 2008
@@ -24,14 +24,14 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
-#include <libgnomeui/gnome-thumbnail.h>
+#include <libgnomeui/gnome-desktop-thumbnail.h>
 
 #include "gnome-theme-info.h"
 
 typedef struct {
   GConfClient *client;
   GladeXML *xml;
-  GnomeThumbnailFactory *thumb_factory;
+  GnomeDesktopThumbnailFactory *thumb_factory;
 
   /* desktop */
   GHashTable *wp_hash;

Modified: trunk/capplets/appearance/gnome-wp-info.c
==============================================================================
--- trunk/capplets/appearance/gnome-wp-info.c	(original)
+++ trunk/capplets/appearance/gnome-wp-info.c	Fri Oct 24 18:44:52 2008
@@ -25,7 +25,7 @@
 #include "gnome-wp-info.h"
 
 GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
-				 GnomeThumbnailFactory * thumbs) {
+				 GnomeDesktopThumbnailFactory * thumbs) {
   GnomeWPInfo *wp;
   GFile *file;
   GFileInfo *info;
@@ -64,7 +64,7 @@
     wp->mtime = g_file_info_get_attribute_uint64 (info,
                                                   G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
-    wp->thumburi = gnome_thumbnail_factory_lookup (thumbs,
+    wp->thumburi = gnome_desktop_thumbnail_factory_lookup (thumbs,
 						   uri,
 						   wp->mtime);
 

Modified: trunk/capplets/appearance/gnome-wp-info.h
==============================================================================
--- trunk/capplets/appearance/gnome-wp-info.h	(original)
+++ trunk/capplets/appearance/gnome-wp-info.h	Fri Oct 24 18:44:52 2008
@@ -22,7 +22,7 @@
 #define _GNOME_WP_INFO_H_
 
 #include <glib.h>
-#include <libgnomeui/gnome-thumbnail.h>
+#include <libgnomeui/gnome-desktop-thumbnail.h>
 
 typedef struct _GnomeWPInfo GnomeWPInfo;
 
@@ -38,7 +38,7 @@
 };
 
 GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
-				 GnomeThumbnailFactory * thumbs);
+				 GnomeDesktopThumbnailFactory * thumbs);
 void gnome_wp_info_free (GnomeWPInfo * info);
 
 #endif

Modified: trunk/capplets/appearance/gnome-wp-item.c
==============================================================================
--- trunk/capplets/appearance/gnome-wp-item.c	(original)
+++ trunk/capplets/appearance/gnome-wp-item.c	Fri Oct 24 18:44:52 2008
@@ -125,7 +125,7 @@
 
 GnomeWPItem * gnome_wp_item_new (const gchar * filename,
 				 GHashTable * wallpapers,
-				 GnomeThumbnailFactory * thumbnails) {
+				 GnomeDesktopThumbnailFactory * thumbnails) {
   GnomeWPItem *item = g_new0 (GnomeWPItem, 1);
 
   item->filename = g_strdup (filename);
@@ -181,7 +181,7 @@
 #define LIST_IMAGE_WIDTH 108
 
 GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
-					 GnomeThumbnailFactory * thumbs) {
+					 GnomeDesktopThumbnailFactory * thumbs) {
   GdkPixbuf *pixbuf;
   double aspect =
     (double)gdk_screen_get_height (gdk_screen_get_default()) /

Modified: trunk/capplets/appearance/gnome-wp-item.h
==============================================================================
--- trunk/capplets/appearance/gnome-wp-item.h	(original)
+++ trunk/capplets/appearance/gnome-wp-item.h	Fri Oct 24 18:44:52 2008
@@ -22,7 +22,7 @@
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtktreeview.h>
-#include <libgnomeui/gnome-thumbnail.h>
+#include <libgnomeui/gnome-desktop-thumbnail.h>
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-bg.h>
 
@@ -68,11 +68,11 @@
 
 GnomeWPItem * gnome_wp_item_new (const gchar *filename,
 				 GHashTable *wallpapers,
-				 GnomeThumbnailFactory *thumbnails);
+				 GnomeDesktopThumbnailFactory *thumbnails);
 
 void gnome_wp_item_free (GnomeWPItem *item);
 GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem *item,
-					 GnomeThumbnailFactory *thumbs);
+					 GnomeDesktopThumbnailFactory *thumbs);
 void gnome_wp_item_update (GnomeWPItem *item);
 void gnome_wp_item_update_description (GnomeWPItem *item);
 void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item);

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Oct 24 18:44:52 2008
@@ -33,6 +33,8 @@
 fi
 changequote([,])dnl
 
+CFLAGS="$CFLAGS -DGNOME_DESKTOP_USE_UNSTABLE_API"
+
 # Internationalization support
 
 IT_PROG_INTLTOOL([0.37.1])