diff --git a/ChangeLog b/ChangeLog index 54b5c8831..8828051a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 24 14:44:16 2008 Søren Sandmann + + * Use GnomeDesktopThumbnailFactory instead of + GnomeThumbnailFactory + 2008-10-19 Matthias Clasen Bug 556977 – avoid duplicate custom keybindings diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c index b44aa3f41..c5bdc78dc 100644 --- a/capplets/about-me/gnome-about-me.c +++ b/capplets/about-me/gnome-about-me.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ typedef struct { GdkScreen *screen; GtkIconTheme *theme; - GnomeThumbnailFactory *thumbs; + GnomeDesktopThumbnailFactory *thumbs; EContactAddress *addr1; EContactAddress *addr2; @@ -680,7 +680,7 @@ about_me_update_preview (GtkFileChooser *chooser, 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 @@ about_me_update_preview (GtkFileChooser *chooser, 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); diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index a7064eb7e..847e85d9e 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #define GNOME_DESKTOP_USE_UNSTABLE_API #include @@ -858,7 +858,7 @@ wp_update_preview (GtkFileChooser *chooser, 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); } diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index bac95a3c6..09cedc9c9 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -33,7 +33,7 @@ #include #include /* ---------------------------------- */ -#include +#include static AppearanceData * init_appearance_data (int *argc, char ***argv) @@ -60,7 +60,7 @@ init_appearance_data (int *argc, char ***argv) 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; diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c index 590cec782..b0f5b4bad 100644 --- a/capplets/appearance/appearance-themes.c +++ b/capplets/appearance/appearance-themes.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #define CUSTOM_THEME_NAME "__custom__" @@ -112,7 +112,7 @@ theme_thumbnail_update (GdkPixbuf *pixbuf, /* 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 @@ theme_get_thumbnail_from_cache (GnomeThemeMetaInfo *info, AppearanceData *data) /* 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); diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h index adcbdc8e8..cfdbe1f07 100644 --- a/capplets/appearance/appearance.h +++ b/capplets/appearance/appearance.h @@ -24,14 +24,14 @@ #include #include #include -#include +#include #include "gnome-theme-info.h" typedef struct { GConfClient *client; GladeXML *xml; - GnomeThumbnailFactory *thumb_factory; + GnomeDesktopThumbnailFactory *thumb_factory; /* desktop */ GHashTable *wp_hash; diff --git a/capplets/appearance/gnome-wp-info.c b/capplets/appearance/gnome-wp-info.c index be1a79317..597caa369 100644 --- a/capplets/appearance/gnome-wp-info.c +++ b/capplets/appearance/gnome-wp-info.c @@ -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 @@ GnomeWPInfo * gnome_wp_info_new (const gchar * uri, 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); diff --git a/capplets/appearance/gnome-wp-info.h b/capplets/appearance/gnome-wp-info.h index 8ca76e613..ea1051e28 100644 --- a/capplets/appearance/gnome-wp-info.h +++ b/capplets/appearance/gnome-wp-info.h @@ -22,7 +22,7 @@ #define _GNOME_WP_INFO_H_ #include -#include +#include typedef struct _GnomeWPInfo GnomeWPInfo; @@ -38,7 +38,7 @@ struct _GnomeWPInfo { }; GnomeWPInfo * gnome_wp_info_new (const gchar * uri, - GnomeThumbnailFactory * thumbs); + GnomeDesktopThumbnailFactory * thumbs); void gnome_wp_info_free (GnomeWPInfo * info); #endif diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c index 25d85e84e..f5b498d83 100644 --- a/capplets/appearance/gnome-wp-item.c +++ b/capplets/appearance/gnome-wp-item.c @@ -125,7 +125,7 @@ void gnome_wp_item_update (GnomeWPItem *item) { 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 @@ void gnome_wp_item_free (GnomeWPItem * item) { #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()) / diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h index c6dd8ec80..49c1de0ea 100644 --- a/capplets/appearance/gnome-wp-item.h +++ b/capplets/appearance/gnome-wp-item.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #define GNOME_DESKTOP_USE_UNSTABLE_API #include @@ -68,11 +68,11 @@ struct _GnomeWPItem { 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); diff --git a/configure.in b/configure.in index b317720bc..2dab4d3ea 100644 --- a/configure.in +++ b/configure.in @@ -33,6 +33,8 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl +CFLAGS="$CFLAGS -DGNOME_DESKTOP_USE_UNSTABLE_API" + # Internationalization support IT_PROG_INTLTOOL([0.37.1])