[Goodies-commits] r3872 - in xfce4-clipman-plugin/trunk: . panel-plugin

[Nick Schermer]

Author: nick
Date: 2008-01-25 19:59:24 +0000 (Fri, 25 Jan 2008)
New Revision: 3872

Modified:
   xfce4-clipman-plugin/trunk/ChangeLog
   xfce4-clipman-plugin/trunk/README
   xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am
   xfce4-clipman-plugin/trunk/panel-plugin/clipman.c
Log:
	
	* panel-plugin/clipman.c: Fix missing include.
	* panel-plugin/Makefile.am: Some improvements.
	* README: Small improvement.

Modified: xfce4-clipman-plugin/trunk/ChangeLog
===================================================================
--- xfce4-clipman-plugin/trunk/ChangeLog	2008-01-24 13:09:47 UTC (rev 3871)
+++ xfce4-clipman-plugin/trunk/ChangeLog	2008-01-25 19:59:24 UTC (rev 3872)
@@ -1,3 +1,9 @@
+2008-01-25  Nick Schermer <nick at xfce.org>
+	
+	* panel-plugin/clipman.c: Fix missing include.
+	* panel-plugin/Makefile.am: Some improvements.
+	* README: Small improvement.
+
 2008-01-24	Mike Massonnet <mmassonnet at gmail.com>
 
 	* panel-plugin/clipman.c(clipman_plugin_set_size): Scale pixbuf.

Modified: xfce4-clipman-plugin/trunk/README
===================================================================
--- xfce4-clipman-plugin/trunk/README	2008-01-24 13:09:47 UTC (rev 3871)
+++ xfce4-clipman-plugin/trunk/README	2008-01-25 19:59:24 UTC (rev 3872)
@@ -1 +1 @@
-This is a simple cliboard history for XFCE4 Panel
+This is a simple cliboard history for Xfce Panel

Modified: xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am	2008-01-24 13:09:47 UTC (rev 3871)
+++ xfce4-clipman-plugin/trunk/panel-plugin/Makefile.am	2008-01-25 19:59:24 UTC (rev 3872)
@@ -1,27 +1,39 @@
+# $Id$
+
 INCLUDES =								\
 	-I$(top_srcdir)							\
+	-DG_LOG_DOMAIN=\"xfce4-clipman-plugin\"				\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
+#
+# Clipman popup command
+#
+bin_PROGRAMS =								\
+	xfce4-popup-clipman
 
-
-bin_PROGRAMS = xfce4-popup-clipman
-
 xfce4_popup_clipman_SOURCES =						\
 	xfce4-popup-clipman.h						\
 	xfce4-popup-clipman.c
 
 xfce4_popup_clipman_CFLAGS =						\
-	@LIBX11_CFLAGS@							\
-	@GTK_CFLAGS@
+	$(LIBX11_CFLAGS)						\
+	$(GTK_CFLAGS)
 
 xfce4_popup_clipman_LDADD =						\
-	@LIBX11_LDFLAGS@						\
-	@GTK_LIBS@
+	$(LIBX11_LIBS)							\
+	$(GTK_LIBS)
 
+xfce4_popup_clipman_LDFLAGS =						\
+	$(LIBX11_LDFLAGS)
 
+#
+# Clipman plugin
+#
+plugindir =								\
+	$(libexecdir)/xfce4/panel-plugins
 
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-clipman-plugin
+plugin_PROGRAMS =							\
+	xfce4-clipman-plugin
 
 xfce4_clipman_plugin_SOURCES =						\
 	clipman-dialogs.h						\
@@ -30,17 +42,19 @@
 	clipman.c
 
 xfce4_clipman_plugin_CFLAGS =						\
-	@LIBXFCE4PANEL_CFLAGS@						\
-	@LIBXFCE4UTIL_CFLAGS@						\
-	@LIBXFCEGUI4_CFLAGS@
+	$(LIBXFCE4PANEL_CFLAGS)						\
+	$(LIBXFCE4UTIL_CFLAGS)						\
+	$(LIBXFCEGUI4_CFLAGS)
 
 xfce4_clipman_plugin_LDADD =						\
-	@LIBXFCE4PANEL_LIBS@						\
-	@LIBXFCE4UTIL_LIBS@						\
-	@LIBXFCEGUI4_LIBS@
+	$(LIBXFCE4PANEL_LIBS)						\
+	$(LIBXFCE4UTIL_LIBS)						\
+	$(LIBXFCEGUI4_LIBS)
 
 
-
+#
+# Desktop file
+#
 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:47 UTC (rev 3871)
+++ xfce4-clipman-plugin/trunk/panel-plugin/clipman.c	2008-01-25 19:59:24 UTC (rev 3872)
@@ -22,6 +22,7 @@
 #include <config.h>
 #endif
 
+#include <gdk/gdkx.h>
 #include <libxfce4util/libxfce4util.h>
 #include <libxfce4panel/xfce-panel-convenience.h>