menu plugin oddity

[Pasi Orovuo]

Hi,

On Thu, Nov 03, 2005 at 04:55:53PM +0530, Biju Chacko wrote:
> Brian J. Tarricone wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> > 
> > Biju Chacko wrote:
> > 
> >>Hi,
> >>
> >>With my latest build of svn trunk, the menu plugin has stopped 
> >>displaying the icon properly.
> > 
> > 
> > Define "properly".  Screenshots help too.
> 
> s/properly//.
> 
> ie. No icon at all. Plugin is resized to minimum height (I use a 
> vertical panel). Still works fine if you click on it. Text Label appears 
> if you enable it.
> 
> -- b

I just last night upgraded xfdesktop, and am experiencing the same
problem. The reason for this is indeed in the non-square icon stuff,
as Brian suspected. gtk_pixbuf_new_from_file_at_scale() does not allow
negative (don't constrain the size) width/height values on Gtk+ 2.6, and
thus fails. The simple fix is to change the #ifdef's to match Gtk+ 2.8
(see attached patch), but Brian might want to do other magic as well.

-Pasi

-------------- next part --------------
Index: panel-plugin/desktop-menu-plugin.c
===================================================================
--- panel-plugin/desktop-menu-plugin.c	(revision 18665)
+++ panel-plugin/desktop-menu-plugin.c	(working copy)
@@ -138,7 +138,7 @@
     if(!filename)
         return NULL;
     
-#if GTK_CHECK_VERSION(2, 6, 0)
+#if GTK_CHECK_VERSION(2, 8, 0)
     w = orientation == GTK_ORIENTATION_HORIZONTAL ? -1 : size;
     h = orientation == GTK_ORIENTATION_VERTICAL ? -1 : size;
     pix = gdk_pixbuf_new_from_file_at_scale(filename, w, h, TRUE, NULL);