[totem/gnome-2-32] Use GIcon for the recent menu items' icons

[Bastien Nocera <hadess src gnome org>]

commit 187a38e58180720e25d5f15e57029595ba26d48c
Author: Christian Persch <chpe gnome org>
Date:   Thu Apr 29 19:28:55 2010 +0200

    Use GIcon for the recent menu items' icons
    
    Bug #617199.

 src/totem-menu.c |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)
---
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 5d977cd..869545b 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -366,10 +366,6 @@ connect_proxy_cb (GtkActionGroup *action_group,
                   gpointer data)
 {
         GtkLabel *label;
-        GtkRecentInfo *recent_info;
-        GdkPixbuf *icon;
-        GtkWidget *image = NULL;
-        gint w, h;
 
         if (!GTK_IS_MENU_ITEM (proxy))
                 return;
@@ -378,23 +374,6 @@ connect_proxy_cb (GtkActionGroup *action_group,
 
         gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
         gtk_label_set_max_width_chars (label,TOTEM_MAX_RECENT_ITEM_LEN);
-
-        if (!GTK_IS_IMAGE_MENU_ITEM (proxy))
-                return;
-
-        recent_info = g_object_get_data (G_OBJECT (action), "recent-info");
-        g_assert (recent_info != NULL);
-
-        gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
-
-        icon = gtk_recent_info_get_icon (recent_info, w);
-        if (icon != NULL) {
-                image = gtk_image_new_from_pixbuf (icon);
-                g_object_unref (icon);
-        }
-
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
-        gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (proxy), TRUE);
 }
 
 static void
@@ -484,6 +463,9 @@ totem_recent_manager_changed_callback (GtkRecentManager *recent_manager, Totem *
                 const char    *display_name;
                 char          *label;
                 char          *escaped_label;
+                const gchar   *mime_type;
+                gchar         *content_type;
+                GIcon         *icon = NULL;
 
                 info = (GtkRecentInfo *) l->data;
 
@@ -506,6 +488,18 @@ totem_recent_manager_changed_callback (GtkRecentManager *recent_manager, Totem *
                                   G_CALLBACK (on_recent_file_item_activated),
                                   totem);
 
+                mime_type = gtk_recent_info_get_mime_type (info);
+                content_type = g_content_type_from_mime_type (mime_type);
+                if (content_type != NULL) {
+                        icon = g_content_type_get_icon (content_type);
+                        g_free (content_type);
+                }
+                if (icon != NULL) {
+                        gtk_action_set_gicon (action, icon);
+                        gtk_action_set_always_show_image (action, TRUE);
+                        g_object_unref (icon);
+                }
+
                 gtk_action_group_add_action (totem->recent_action_group,
                                             action);
                 g_object_unref (action);