[Goodies-commits] r7871 - in xfce4-places-plugin/trunk: . panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2009-07-31 05:02:34 +0000 (Fri, 31 Jul 2009)
New Revision: 7871

Modified:
   xfce4-places-plugin/trunk/ChangeLog
   xfce4-places-plugin/trunk/panel-plugin/view.c
Log:
view.c: Honor menu icon size. See bug #4744.

Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2009-07-31 05:02:22 UTC (rev 7870)
+++ xfce4-places-plugin/trunk/ChangeLog	2009-07-31 05:02:34 UTC (rev 7871)
@@ -2,6 +2,7 @@
 
 	* button.c: Use gtk_box_pack_{start,end} directly, as _defaults
 	variants are deprecated in GTK 2.14.
+	* view.c: Honor menu icon size. See bug #4744.
 
 2009-05-27	Diego Ongaro <ongardie at gmail.com>
 

Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c	2009-07-31 05:02:22 UTC (rev 7870)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c	2009-07-31 05:02:34 UTC (rev 7871)
@@ -2,7 +2,7 @@
  *
  *  This file handles the GUI. It "owns" the model and cfg.
  *
- *  Copyright (c) 2007-2008 Diego Ongaro <ongardie at gmail.com>
+ *  Copyright (c) 2007-2009 Diego Ongaro <ongardie at gmail.com>
  *
  *  Largely based on:
  *
@@ -505,8 +505,14 @@
 
     /* try to set icon */
     if(view->cfg->show_icons && bookmark->icon != NULL){
-        pb = xfce_themed_icon_load(bookmark->icon, 16);
-        
+        gint icon_size;
+        gint width, height;
+        if (gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height))
+                icon_size = MAX(width, height);
+        else
+                icon_size = 32;
+        pb = xfce_themed_icon_load(bookmark->icon, icon_size);
+
         if(G_LIKELY(pb != NULL)){
             image = gtk_image_new_from_pixbuf(pb);
             g_object_unref(pb);