[Xfce4-commits] <xfce4-panel:xfce-4.10> Fix icons not probably resizing when requested.

[Nick Schermer]

Updating branch refs/heads/xfce-4.10
         to a51135ef6b529e53462ed4e06825f28dcbe1d5b2 (commit)
       from 4294d606bdd87b94ab6ebc22b9ea2d1c92dd2e45 (commit)

commit a51135ef6b529e53462ed4e06825f28dcbe1d5b2
Author: Carlos Silva <r3pek at r3pek.org>
Date:   Fri Dec 14 00:14:36 2012 -0100

    Fix icons not probably resizing when requested.
    
    Looks like gdk_pixbuf_new_from_file_at_scale and gdk_pixbuf_new_from_file_at_size really don't scale the image leaving the image loaded with its original size. So, just load the file without any scale and let the scale be done later on the function.
    
    Signed-off-by: Carlos Silva <r3pek at r3pek.org>
    (cherry picked from commit 48e1016394fa6bdb1d708823a23a12641482a561)

 libxfce4panel/xfce-panel-convenience.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/libxfce4panel/xfce-panel-convenience.c b/libxfce4panel/xfce-panel-convenience.c
index 19c51bb..a3f3be1 100644
--- a/libxfce4panel/xfce-panel-convenience.c
+++ b/libxfce4panel/xfce-panel-convenience.c
@@ -170,15 +170,13 @@ xfce_panel_pixbuf_from_source_at_size (const gchar  *source,
 
   if (G_UNLIKELY (g_path_is_absolute (source)))
     {
-      pixbuf = gdk_pixbuf_new_from_file_at_scale (source, dest_width, dest_height, TRUE, &error);
+      pixbuf = gdk_pixbuf_new_from_file (source, &error);
       if (G_UNLIKELY (pixbuf == NULL))
         {
           g_message ("Failed to load image \"%s\": %s",
                      source, error->message);
           g_error_free (error);
         }
-
-      return pixbuf;
     }
   else
     {