Use cairo image surfaces instead of GDK pixbufs for drawing pages and

[evince.git] / shell / ev-sidebar-attachments.c

diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c
index 4bdf5d96acdd6d0fb069b6666b0af47e503ca38a..5d2beff317e1ab722450284b9654eeca99f03846 100644 (file)
--- a/shell/ev-sidebar-attachments.c
+++ b/shell/ev-sidebar-attachments.c
@@ -29,8 +29,8 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <string.h>
-#include <libgnomeui/gnome-icon-lookup.h>
 
+#include "ev-file-helpers.h"
 #include "ev-sidebar-attachments.h"
 #include "ev-sidebar-page.h"
 
@@ -98,20 +98,28 @@ static GdkPixbuf *
 icon_theme_get_pixbuf_from_mime_type (GtkIconTheme *icon_theme,
                                      const gchar  *mime_type)
 {
-       GdkPixbuf *pixbuf = NULL;
-       gchar     *icon;
-
-       icon = gnome_icon_lookup (icon_theme,
-                                 NULL, NULL,
-                                 NULL, NULL,
-                                 mime_type,
-                                 GNOME_ICON_LOOKUP_FLAGS_NONE,
-                                 NULL);
-
-       pixbuf = gtk_icon_theme_load_icon (icon_theme,
-                                          icon, 48, 0, NULL);
-       g_free (icon);
-
+       const char *separator;
+       GString *icon_name;
+       GdkPixbuf *pixbuf;
+
+       separator = strchr (mime_type, '/');
+       if (!separator)
+               return NULL; /* maybe we should return a GError with "invalid MIME-type" */
+
+       icon_name = g_string_new ("gnome-mime-");
+       g_string_append_len (icon_name, mime_type, separator - mime_type);
+       g_string_append_c (icon_name, '-');
+       g_string_append (icon_name, separator + 1);
+       pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name->str, 48, 0, NULL);
+       g_string_free (icon_name, TRUE);
+       if (pixbuf)
+               return pixbuf;
+       
+       icon_name = g_string_new ("gnome-mime-");
+       g_string_append_len (icon_name, mime_type, separator - mime_type);
+       pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name->str, 48, 0, NULL);
+       g_string_free (icon_name, TRUE);
+       
        return pixbuf;
 }
 
@@ -409,7 +417,7 @@ ev_sidebar_attachments_drag_data_get (GtkWidget        *widget,
                                    COLUMN_ATTACHMENT, &attachment,
                                    -1);
 
-               filename = g_build_filename (g_get_tmp_dir (),
+               filename = g_build_filename (ev_tmp_dir (),
                                             ev_attachment_get_name (attachment),
                                             NULL);