Add brightness panel plugin directory with the required dependencies

(Old svn revision: 6712)

ChangeLog

+2009-02-18 11:00 Ali
+
+	*: Added a panel brightness plugin directory,
+	   Changed the version to 0.9.0 (Next version)
+
+/* We start doing real Changelog from 18-02-2009 */
 2009-02-06
 	*: 0.6.1 release
 

Makefile.am

-SUBDIRS = src data po doc
+@SET_MAKE@
+
+if BUILD_PANEL_PLUGINS
+plugins_dir = panel-plugins
+endif
+
+SUBDIRS =        \
+	src 	     \
+	$(plugins_dir) \
+	data         \
+	po           \
+	doc
 
 EXTRA_DIST = \
 	intltool-extract.in \
@@ -34,4 +45,4 @@ snapshot: dist
 
 snapshot-bz2: dist-bz2
 	mv $(PACKAGE)-$(VERSION).tar.bz2 \
-	$(PACKAGE)-$(VERSION)-r@REVISION@.tar.bz2         
\ No newline at end of file
+	$(PACKAGE)-$(VERSION)-r@REVISION@.tar.bz2         

configure.ac.in

 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major],  [0])
-m4_define([xfpm_version_minor],  [6])
-m4_define([xfpm_version_micro],  [1])
+m4_define([xfpm_version_minor],  [9])
+m4_define([xfpm_version_micro],  [0])
 m4_define([xfpm_version_build],  [r@REVISION@])
 m4_define([xfpm_version_tag],[svn])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [svn], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
@@ -9,30 +9,46 @@ m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_versio
 AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
 AC_PREREQ(2.50)
 
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE()
+AM_MAINTAINER_MODE
 
-# ============== basic compiler settings ============= #
+# ===================================================== #
+#               Check for UNIX variants                 #
+# ===================================================== #
+AC_AIX
+AC_ISC_POSIX
+AC_MINIX
+
+# ===================================================== #
+#               Basic compiler settings                 #
+# ===================================================== #
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_PROG_LD
 AC_PROG_INSTALL
 AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
 
 # ===================================================== #
-# 		Check for i18n support 			#
+#               Initialize libtool                      #
 # ===================================================== #
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
 
-XDT_I18N([@LINGUAS@])
-
-
-# ============== look for dependencies =============== #
-# check for headers needed for standard interfaces     #
+# ==================================================== #
+#   Check for headers needed for standard interfaces   #
+# ==================================================== #
 AC_HEADER_STDC
 AC_CHECK_HEADERS([errno.h signal.h stddef.h \
                   string.h sys/stat.h sys/types.h sys/wait.h time.h \
                   unistd.h])
 
+# ===================================================== #
+# 		Check for i18n support 			#
+# ===================================================== #
+
+XDT_I18N([@LINGUAS@])
+
 #==================================================== #
 #          Check for required packages 		      #
 #=====================================================#
@@ -43,17 +59,19 @@ m4_define([hal_minimum_version], [0.5.6])
 m4_define([xfconf_minimum_version], [4.5.90])
 m4_define([libxfcegui4_minimum_version],[4.4.1])
 m4_define([libxfce4util_minimum_version],[4.4.1])
+m4_define([libxfce4panel_minimum_version],[4.4.0])
 m4_define([dbus_glib_minimum_version], [0.70])
 m4_define([libnotify_minimum_version], [0.4.1])
 
+
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
 XDT_CHECK_PACKAGE([HAL], [hal], [hal_minimum_version])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0],[xfconf_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCEGUI], [libxfcegui4-1.0],[libxfcegui4_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCEUTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4GUI], [libxfcegui4-1.0],[libxfcegui4_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
 
 #=======================================================#
 #           Check for DPMS support                      #
@@ -82,6 +100,24 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY],
                        [libnotify], 
                        [libnotify library], [yes])
 
+#=======================================================#
+#                 Panel plugins ?                       #
+#=======================================================#
+AC_ARG_ENABLE([panel_plugins],
+	[AC_HELP_STRING([--disable-panel-plugins],
+		[Do not build panel plugins (default=enabled)])],
+	[ac_cv_enable_panel_plugins=$enableval],
+	[ac_cv_enable_panel_plugins=yes])
+if test "x$ac_cv_enable_panel_plugins" = "xno"; then
+	build_panel_plugins="no"
+else
+	build_panel_plugins="yes"
+	XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0],
+		[libxfce4panel_minimum_version])
+fi
+AM_CONDITIONAL([BUILD_PANEL_PLUGINS], [test "x$build_panel_plugins" = "xyes"])
+
+
 #=======================================================#
 #              Check for debugging support              #
 #=======================================================#
@@ -91,6 +127,8 @@ XDT_FEATURE_DEBUG
 AC_OUTPUT([
 Makefile
 src/Makefile
+panel-plugins/Makefile
+panel-plugins/brightness/Makefile
 data/Makefile
 data/icons/Makefile
 data/icons/scalable/Makefile
@@ -106,9 +144,10 @@ po/Makefile.in
 echo "----------------------------------------"
 echo 	 "   Build Configuration"
 echo 
-echo "   Debug  support          $enable_debug   "
-echo "   DPMS   support          $have_dpms      "
+echo "   DPMS         support    $have_dpms      "
 echo "   Notification support    $LIBNOTIFY_FOUND"
+echo "   Build panel  plugins    $build_panel_plugins"
+echo "   Debug        support    $enable_debug   "
 echo
 echo "----------------------------------------"  
 echo

panel-plugins/Makefile.am

+SUBDIRS = brightness

panel-plugins/brightness/Makefile.am

+plugindir = $(libexecdir)/xfce4/panel-plugins
+plugin_PROGRAMS = xfce4-brightness-plugin
+
+xfce4_brightness_plugin_SOURCES =							\
+									main.c
+	
+xfce4_brightness_plugin_CFLAGS =							      \
+									-DLOCALEDIR=\"$(localedir)\"  \
+									$(LIBXFCE4PANEL_CFLAGS)       \
+									$(LIBXFCE4UTIL_CFLAGS)        \
+									$(GTK_CFLAGS)			      \
+									$(GLIB_CFLAGS)			      \
+									$(HAL_CFLAGS)
+
+xfce4_brightness_plugin_LDADD =								\
+									$(LIBXFCE4PANEL_LIBS)   \
+									$(LIBXFCE4UTIL_LIBS)	\
+									$(GTK_LIBS)   			\
+									$(GLIB_LIBS)			\
+									$(HAL_LIBS)
+
+#
+# Desktop file
+#
+desktopdir = $(datadir)/xfce4/panel-plugins
+desktop_in_in_files = xfce4-brightness-plugin.desktop.in.in
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST =                                                            \
+        $(desktop_in_in_files)
+
+CLEANFILES =                                                            \
+        $(desktop_in_files)                                             \
+        $(desktop_DATA)
+
+%.desktop.in: %.desktop.in.in
+	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@

panel-plugins/brightness/main.c

+/*
+ *
+ * * Copyright (C) 2008 Ali <aliov@xfce.org>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <glib.h>
+
+#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4util/libxfce4util.h>
+
+#include <hal/libhal.h>
+
+static void
+register_plugin(XfcePanelPlugin *plugin)
+{
+    
+}
+
+
+XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(register_plugin);

panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in

+[Xfce Panel]
+Type=X-XFCE-PanelPlugin
+_Name=Brightness plugin
+X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-brightness-plugin
+X-XFCE-Unique=TRUE

po/POTFILES.in

@@ -9,3 +9,4 @@ src/xfpm-driver.c
 src/xfpm-hal.c
 src/xfpm-dbus-messages.c
 src/xfce4-power-manager.desktop.in
+panel-plugins/brightness/main.c

src/Makefile.am

@@ -52,8 +52,8 @@ xfce4_power_manager_CFLAGS =					\
 			$(DBUS_CFLAGS)				\
 			$(DBUS_GLIB_CFLAGS)			\
 			$(HAL_CFLAGS)				\
-			$(LIBXFCEGUI_CFLAGS)			\
-			$(LIBXFCEUTIL_CFLAGS)			\
+			$(LIBXFCE4GUI_CFLAGS)			\
+			$(LIBXFCE4UTIL_CFLAGS)			\
 			$(XFCONF_CFLAGS)			\
 			$(LIBNOTIFY_CFLAGS)			\
 			$(DPMS_CFLAGS)              	
@@ -63,8 +63,8 @@ xfce4_power_manager_LDADD   =					\
 			$(GLIB_LIBS)				\
 			$(DBUS_LIBS)				\
 			$(DBUS_GLIB_LIBS)			\
-			$(LIBXFCEGUI_LIBS)			\
-			$(LIBXFCEUTIL_LIBS)			\
+			$(LIBXFCE4GUI_LIBS)			\
+			$(LIBXFCE4UTIL_LIBS)			\
 			$(HAL_LIBS)				\
 			$(XFCONF_LIBS)				\
 			$(LIBNOTIFY_LIBS)			\