diff options
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-customization-data.c | 14 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-canvas-item.c | 13 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-thumbnails.c | 63 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-undo.c | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-vfs-file.c | 1 |
6 files changed, 48 insertions, 59 deletions
diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c index e3a384470..371bebe62 100644 --- a/libnautilus-private/nautilus-customization-data.c +++ b/libnautilus-private/nautilus-customization-data.c @@ -41,7 +41,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <glib.h> #include <gtk/gtk.h> -#include <librsvg/rsvg.h> #include <glib/gi18n.h> #include <libxml/parser.h> #include <stdlib.h> @@ -230,14 +229,11 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD image_file_name = get_file_path_for_mode (data, g_file_info_get_name (current_file_info)); - orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name, NULL); - - if (orig_pixbuf == NULL) { - orig_pixbuf = rsvg_pixbuf_from_file_at_max_size (image_file_name, - data->maximum_icon_width, - data->maximum_icon_height, - NULL); - } + orig_pixbuf = gdk_pixbuf_new_from_file_at_scale (image_file_name, + data->maximum_icon_width, + data->maximum_icon_height, + TRUE, + NULL); g_free (image_file_name); if (orig_pixbuf == NULL) { diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index ecfdb40b8..03b00917b 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -32,6 +32,10 @@ #include <stdarg.h> #include <locale.h> #include <math.h> +#include <unistd.h> +#include <sys/types.h> +#include <stdlib.h> + #include "nautilus-file-operations.h" #include "nautilus-debug-log.h" @@ -46,10 +50,9 @@ #include <eel/eel-gtk-extensions.h> #include <eel/eel-stock-dialogs.h> #include <eel/eel-vfs-extensions.h> -#include <eel/eel-mount-operation.h> +#include <glib/gi18n.h> #include <glib/gstdio.h> -#include <gnome.h> #include <gdk/gdkdnd.h> #include <gtk/gtk.h> #include <gio/gio.h> diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index e18eba920..7110af8d0 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -44,7 +44,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gtk/gtk.h> #include <gdk/gdk.h> -#include <librsvg/rsvg.h> #include <glib/gi18n.h> #include <eel/eel-canvas-util.h> #include <atk/atkimage.h> @@ -1798,7 +1797,7 @@ real_map_pixbuf (NautilusIconCanvasItem *icon_item) char *audio_filename; NautilusIconContainer *container; GdkPixbuf *temp_pixbuf, *old_pixbuf, *audio_pixbuf; - double zoom; + int emblem_size; guint render_mode, saturation, brightness, lighten; temp_pixbuf = icon_item->details->pixbuf; @@ -1838,14 +1837,14 @@ real_map_pixbuf (NautilusIconCanvasItem *icon_item) /* if the icon is currently being previewed, superimpose an image to indicate that */ /* audio is the only kind of previewing right now, so this code isn't as general as it could be */ if (icon_item->details->is_active) { - zoom = (double) gdk_pixbuf_get_width (temp_pixbuf) / NAUTILUS_ICON_SIZE_STANDARD; + emblem_size = nautilus_icon_get_emblem_size_for_icon_size (gdk_pixbuf_get_width (temp_pixbuf)); /* Load the audio symbol. */ audio_filename = nautilus_pixmap_file ("audio.svg"); if (audio_filename != NULL) { - audio_pixbuf = rsvg_pixbuf_from_file_at_zoom_with_max (audio_filename, zoom, zoom, - NAUTILUS_ICON_MAXIMUM_SIZE, - NAUTILUS_ICON_MAXIMUM_SIZE, - NULL); + audio_pixbuf = gdk_pixbuf_new_from_file_at_scale (audio_filename, + emblem_size, emblem_size, + TRUE, + NULL); } else { audio_pixbuf = NULL; } diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c index 15166f5f3..b62e8d39d 100644 --- a/libnautilus-private/nautilus-thumbnails.c +++ b/libnautilus-private/nautilus-thumbnails.c @@ -26,6 +26,8 @@ #include <config.h> #include "nautilus-thumbnails.h" +#define GNOME_DESKTOP_USE_UNSTABLE_API + #include "nautilus-directory-notify.h" #include "nautilus-global-preferences.h" #include "nautilus-file-utilities.h" @@ -35,7 +37,6 @@ #include <eel/eel-string.h> #include <eel/eel-vfs-extensions.h> #include <gtk/gtk.h> -#include <librsvg/rsvg.h> #include <errno.h> #include <stdio.h> #include <string.h> @@ -43,7 +44,7 @@ #include <sys/wait.h> #include <unistd.h> #include <signal.h> -#include <libgnomeui/gnome-thumbnail.h> +#include <libgnomeui/gnome-desktop-thumbnail.h> #include "nautilus-file-private.h" @@ -112,7 +113,7 @@ static GHashTable *thumbnails_to_make_hash = NULL; * to avoid adding it again. Lock thumbnails_mutex when accessing this. */ static NautilusThumbnailInfo *currently_thumbnailing = NULL; -static GnomeThumbnailFactory *thumbnail_factory = NULL; +static GnomeDesktopThumbnailFactory *thumbnail_factory = NULL; static const char *types [] = { "image/x-bmp", "image/x-ico", "image/jpeg", "image/gif", @@ -151,13 +152,13 @@ free_thumbnail_info (NautilusThumbnailInfo *info) g_free (info); } -static GnomeThumbnailFactory * +static GnomeDesktopThumbnailFactory * get_thumbnail_factory (void) { - static GnomeThumbnailFactory *thumbnail_factory = NULL; + static GnomeDesktopThumbnailFactory *thumbnail_factory = NULL; if (thumbnail_factory == NULL) { - thumbnail_factory = gnome_thumbnail_factory_new (GNOME_THUMBNAIL_SIZE_NORMAL); + thumbnail_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL); } return thumbnail_factory; @@ -211,10 +212,10 @@ nautilus_update_thumbnail_file_copied (const char *source_file_uri, char *old_thumbnail_path; GdkPixbuf *pixbuf; GFileInfo *file_info; - GnomeThumbnailFactory *factory; + GnomeDesktopThumbnailFactory *factory; GFile *destination_file; - old_thumbnail_path = gnome_thumbnail_path_for_uri (source_file_uri, GNOME_THUMBNAIL_SIZE_NORMAL); + old_thumbnail_path = gnome_desktop_thumbnail_path_for_uri (source_file_uri, GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL); if (old_thumbnail_path != NULL && g_file_test (old_thumbnail_path, G_FILE_TEST_EXISTS)) { destination_file = g_file_new_for_uri (destination_file_uri); @@ -223,12 +224,12 @@ nautilus_update_thumbnail_file_copied (const char *source_file_uri, if (file_info != NULL) { pixbuf = gdk_pixbuf_new_from_file (old_thumbnail_path, NULL); - if (pixbuf && gnome_thumbnail_has_uri (pixbuf, source_file_uri)) { + if (pixbuf && gnome_desktop_thumbnail_has_uri (pixbuf, source_file_uri)) { factory = get_thumbnail_factory (); - gnome_thumbnail_factory_save_thumbnail (factory, - pixbuf, - destination_file_uri, - g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_TIME_MODIFIED)); + gnome_desktop_thumbnail_factory_save_thumbnail (factory, + pixbuf, + destination_file_uri, + g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_TIME_MODIFIED)); } if (pixbuf) { @@ -254,7 +255,7 @@ nautilus_remove_thumbnail_for_file (const char *file_uri) { char *thumbnail_path; - thumbnail_path = gnome_thumbnail_path_for_uri (file_uri, GNOME_THUMBNAIL_SIZE_NORMAL); + thumbnail_path = gnome_desktop_thumbnail_path_for_uri (file_uri, GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL); if (thumbnail_path != NULL) { unlink (thumbnail_path); } @@ -769,7 +770,7 @@ nautilus_thumbnail_is_mimetype_limited_by_size (const char *mime_type) gboolean nautilus_can_thumbnail (NautilusFile *file) { - GnomeThumbnailFactory *factory; + GnomeDesktopThumbnailFactory *factory; gboolean res; char *uri; time_t mtime; @@ -780,10 +781,10 @@ nautilus_can_thumbnail (NautilusFile *file) mtime = nautilus_file_get_mtime (file); factory = get_thumbnail_factory (); - res = gnome_thumbnail_factory_can_thumbnail (factory, - uri, - mime_type, - mtime); + res = gnome_desktop_thumbnail_factory_can_thumbnail (factory, + uri, + mime_type, + mtime); g_free (mime_type); g_free (uri); @@ -793,14 +794,14 @@ nautilus_can_thumbnail (NautilusFile *file) gboolean nautilus_has_valid_failed_thumbnail (NautilusFile *file) { - GnomeThumbnailFactory *factory; + GnomeDesktopThumbnailFactory *factory; char *uri; gboolean res; factory = get_thumbnail_factory (); uri = nautilus_file_get_uri (file); - res = gnome_thumbnail_factory_has_valid_failed_thumbnail (factory, uri, file->details->mtime); + res = gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail (factory, uri, file->details->mtime); g_free (uri); return res; @@ -978,20 +979,20 @@ thumbnail_thread_start (gpointer data) info->image_uri); #endif - pixbuf = gnome_thumbnail_factory_generate_thumbnail (thumbnail_factory, - info->image_uri, - info->mime_type); + pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (thumbnail_factory, + info->image_uri, + info->mime_type); if (pixbuf) { - gnome_thumbnail_factory_save_thumbnail (thumbnail_factory, - pixbuf, - info->image_uri, - current_orig_mtime); + gnome_desktop_thumbnail_factory_save_thumbnail (thumbnail_factory, + pixbuf, + info->image_uri, + current_orig_mtime); g_object_unref (pixbuf); } else { - gnome_thumbnail_factory_create_failed_thumbnail (thumbnail_factory, - info->image_uri, - current_orig_mtime); + gnome_desktop_thumbnail_factory_create_failed_thumbnail (thumbnail_factory, + info->image_uri, + current_orig_mtime); } /* We need to call nautilus_file_changed(), but I don't think that is thread safe. So add an idle handler and do it from the main loop. */ diff --git a/libnautilus-private/nautilus-undo.c b/libnautilus-private/nautilus-undo.c index 1fe7dad3f..2dac0d4c6 100644 --- a/libnautilus-private/nautilus-undo.c +++ b/libnautilus-private/nautilus-undo.c @@ -29,7 +29,6 @@ #include "nautilus-undo-private.h" #include "nautilus-undo-transaction.h" #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> #define NAUTILUS_UNDO_MANAGER_DATA "Nautilus undo manager" @@ -174,14 +173,6 @@ nautilus_undo_get_undo_manager (GObject *start_object) } } - /* In the case of a canvas item, try the canvas. */ - if (GNOME_IS_CANVAS_ITEM (start_object)) { - manager = nautilus_undo_get_undo_manager (G_OBJECT (GNOME_CANVAS_ITEM (start_object)->canvas)); - if (manager != NULL) { - return manager; - } - } - /* Found nothing. I can live with that. */ return NULL; } diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c index a70d17cdc..2b92cb1fe 100644 --- a/libnautilus-private/nautilus-vfs-file.c +++ b/libnautilus-private/nautilus-vfs-file.c @@ -30,7 +30,6 @@ #include "nautilus-file-private.h" #include "nautilus-autorun.h" #include <eel/eel-gtk-macros.h> -#include <eel/eel-mount-operation.h> #include <glib/gi18n.h> static void nautilus_vfs_file_init (gpointer object, |