[Xfce4-commits] r26044 - xfce4-panel/trunk/plugins/systray

[Nick Schermer]

Author: nick
Date: 2007-09-04 20:48:57 +0000 (Tue, 04 Sep 2007)
New Revision: 26044

Modified:
   xfce4-panel/trunk/plugins/systray/Makefile.am
   xfce4-panel/trunk/plugins/systray/xfce-tray-plugin.c
Log:
* #if 0 the xfce_tray_plugin_size_allocated code, 
  since if can end up in a loop.


Modified: xfce4-panel/trunk/plugins/systray/Makefile.am
===================================================================
--- xfce4-panel/trunk/plugins/systray/Makefile.am	2007-09-04 19:26:18 UTC (rev 26043)
+++ xfce4-panel/trunk/plugins/systray/Makefile.am	2007-09-04 20:48:57 UTC (rev 26044)
@@ -98,7 +98,7 @@
 	@true
 stamp-xfce-tray-marshal.h: $(srcdir)/xfce-tray-marshal.list Makefile
 	( cd $(srcdir) && glib-genmarshal \
-		--prefix="_xfce_tray_marshal" \
+		--prefix=_xfce_tray_marshal \
 		--header xfce-tray-marshal.list \
 		| sed -e 's/marshal_data);$$/marshal_data) G_GNUC_INTERNAL;/' ) >> xgen-xtmh \
 	&& ( cmp -s xgen-xtmh xfce-tray-marshal.h || cp xgen-xtmh xfce-tray-marshal.h ) \
@@ -107,7 +107,7 @@
 
 xfce-tray-marshal.c: xfce-tray-marshal.h Makefile
 	( cd $(srcdir) && glib-genmarshal \
-		--prefix="_xfce_tray_marshal" \
+		--prefix=_xfce_tray_marshal \
 		--body xfce-tray-marshal.list ) >> xgen-xtmc \
 	&& cp xgen-xtmc xfce-tray-marshal.c \
 	&& rm -f xgen-xtmc

Modified: xfce4-panel/trunk/plugins/systray/xfce-tray-plugin.c
===================================================================
--- xfce4-panel/trunk/plugins/systray/xfce-tray-plugin.c	2007-09-04 19:26:18 UTC (rev 26043)
+++ xfce4-panel/trunk/plugins/systray/xfce-tray-plugin.c	2007-09-04 20:48:57 UTC (rev 26044)
@@ -256,6 +256,7 @@
                                  GtkAllocation  *allocation,
                                  XfceTrayPlugin *plugin)
 {
+#if 0
     GtkOrientation orientation;
     gint           size;    
 
@@ -271,6 +272,7 @@
     /* if the allocated size is bigger, resize the plugin again */
     if (G_UNLIKELY (size > xfce_panel_plugin_get_size (plugin->panel_plugin)))
         xfce_tray_plugin_size_changed (plugin, size);
+#endif
 }