[totem/gnome-3-14] Revert "icon-helpers: Fix frames not getting applied for new thumbnails"

[Bastien Nocera <hadess src gnome org>]

commit 8aac3d265b152bc2559d81ed60f24e39b134b95f
Author: Bastien Nocera <hadess hadess net>
Date:   Thu May 7 12:36:10 2015 +0200

    Revert "icon-helpers: Fix frames not getting applied for new thumbnails"
    
    This reverts commit 26a0ad7711e6bccc4e70d617bad4bb90e3742bb4.

 src/icon-helpers.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/src/icon-helpers.c b/src/icon-helpers.c
index f0e7d4b..f073f26 100644
--- a/src/icon-helpers.c
+++ b/src/icon-helpers.c
@@ -156,7 +156,7 @@ thumbnail_media_async_thread (GTask    *task,
                              gpointer  user_data)
 {
        GrlMedia *media;
-       GdkPixbuf *pixbuf, *tmp_pixbuf;
+       GdkPixbuf *pixbuf;
        const char *uri;
        GDateTime *mtime;
 
@@ -184,23 +184,19 @@ thumbnail_media_async_thread (GTask    *task,
                return;
        }
 
-       tmp_pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, uri, 
"video/x-totem-stream");
+       pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, uri, "video/x-totem-stream");
 
-       if (!tmp_pixbuf) {
+       if (!pixbuf) {
                g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Thumbnailing failed");
                g_object_unref (task);
                return;
        }
 
-       gnome_desktop_thumbnail_factory_save_thumbnail (factory, tmp_pixbuf, uri, g_date_time_to_unix 
(mtime));
+       gnome_desktop_thumbnail_factory_save_thumbnail (factory, pixbuf, uri, g_date_time_to_unix (mtime));
 
        /* Save the thumbnail URL for the bookmarks source */
        save_bookmark_thumbnail (media, uri);
 
-       /* Add frame */
-       pixbuf = load_icon (tmp_pixbuf, FALSE, FILL_MOVIE);
-       g_object_unref (tmp_pixbuf);
-
        g_task_return_pointer (task, pixbuf, g_object_unref);
        g_object_unref (task);
 }