[Goodies-commits] r3869 - xfce4-clipman-plugin/trunk/panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2008-01-24 13:09:36 +0000 (Thu, 24 Jan 2008)
New Revision: 3869

Modified:
   xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am
   xfce4-clipman-plugin/trunk/panel-plugin/clipman.c
Log:
* panel-plugin/Makefile.am: Add stuff in INCLUDES
* panel-plugin/clipman.c: Count padding of 2 (as done by other panel plugins)
  and correct the double xthickness to x/y.


Modified: xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am	2008-01-24 13:09:29 UTC (rev 3868)
+++ xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am	2008-01-24 13:09:36 UTC (rev 3869)
@@ -1,3 +1,9 @@
+INCLUDES =								\
+	-I$(top_srcdir)							\
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+
+
+
 bin_PROGRAMS = xfce4-popup-clipman
 
 xfce4_popup_clipman_SOURCES =						\
@@ -10,9 +16,10 @@
 
 xfce4_popup_clipman_LDADD =						\
 	@LIBX11_LDFLAGS@						\
-	@LIBX11_LIBS@							\
 	@GTK_LIBS@
-	
+
+
+
 plugindir = $(libexecdir)/xfce4/panel-plugins
 plugin_PROGRAMS = xfce4-clipman-plugin
 
@@ -23,17 +30,17 @@
 	clipman.c
 
 xfce4_clipman_plugin_CFLAGS =						\
-        -I$(top_srcdir)                                                 \
-        @LIBXFCE4PANEL_CFLAGS@                                          \
-        @LIBXFCE4UTIL_CFLAGS@                                           \
-        @LIBXFCEGUI4_CFLAGS@                                            \
-        -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+	@LIBXFCE4PANEL_CFLAGS@						\
+	@LIBXFCE4UTIL_CFLAGS@						\
+	@LIBXFCEGUI4_CFLAGS@
 
 xfce4_clipman_plugin_LDADD =						\
-        @LIBXFCE4PANEL_LIBS@                                            \
-        @LIBXFCE4UTIL_LIBS@                                             \
-        @LIBXFCEGUI4_LIBS@
+	@LIBXFCE4PANEL_LIBS@						\
+	@LIBXFCE4UTIL_LIBS@						\
+	@LIBXFCEGUI4_LIBS@
 
+
+
 desktop_in_in_files = clipman.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 

Modified: xfce4-clipman-plugin/trunk/panel-plugin/clipman.c
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/clipman.c	2008-01-24 13:09:29 UTC (rev 3868)
+++ xfce4-clipman-plugin/trunk/panel-plugin/clipman.c	2008-01-24 13:09:36 UTC (rev 3869)
@@ -320,8 +320,8 @@
                          gint size)
 {
   gtk_widget_set_size_request (GTK_WIDGET (clipman_plugin->panel_plugin), size, size);
-  size -= 2 * MAX (clipman_plugin->button->style->xthickness,
-                   clipman_plugin->button->style->xthickness);
+  size -= 2 + 2 * MAX (clipman_plugin->button->style->xthickness,
+                       clipman_plugin->button->style->ythickness);
 
   GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
   GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (icon_theme, GTK_STOCK_PASTE, size, 0, NULL);