[Goodies-commits] r6833 - in xfce4-power-manager/trunk: . po src

Ali Abdallah aliov at xfce.org
Mon Mar 2 14:28:56 CET 2009


Author: aliov
Date: 2009-03-02 13:28:56 +0000 (Mon, 02 Mar 2009)
New Revision: 6833

Removed:
   xfce4-power-manager/trunk/panel-plugins/
Modified:
   xfce4-power-manager/trunk/Makefile.am
   xfce4-power-manager/trunk/NEWS
   xfce4-power-manager/trunk/configure.ac.in
   xfce4-power-manager/trunk/po/POTFILES.in
   xfce4-power-manager/trunk/src/xfpm-main.c
Log:
Remove the panel plugin directory for now since it will only be available with the dkp based version

Modified: xfce4-power-manager/trunk/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/Makefile.am	2009-03-02 11:22:10 UTC (rev 6832)
+++ xfce4-power-manager/trunk/Makefile.am	2009-03-02 13:28:56 UTC (rev 6833)
@@ -1,12 +1,7 @@
 @SET_MAKE@
 
-if BUILD_PANEL_PLUGINS
-plugins_dir = panel-plugins
-endif
-
 SUBDIRS =        \
 	src 	     \
-	$(plugins_dir) \
 	data         \
 	po           \
 	doc

Modified: xfce4-power-manager/trunk/NEWS
===================================================================
--- xfce4-power-manager/trunk/NEWS	2009-03-02 11:22:10 UTC (rev 6832)
+++ xfce4-power-manager/trunk/NEWS	2009-03-02 13:28:56 UTC (rev 6833)
@@ -3,11 +3,11 @@
 "on battery power" and "on ac power", desktop users still can change 
 DPMS settings and CPU frequency using the settings dialog.
 
-First release will be 0.6.0 supports the following features:
+The following features are supported:
 
 Battery monitoring
 Cpu frequency settings
 Monitor DPMS settings
 Suspend/Hibernate via HAL
 LCD brightness
-Lid,sleep and power switches control
\ No newline at end of file
+Lid,sleep and power switches control

Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in	2009-03-02 11:22:10 UTC (rev 6832)
+++ xfce4-power-manager/trunk/configure.ac.in	2009-03-02 13:28:56 UTC (rev 6833)
@@ -25,16 +25,9 @@
 # ===================================================== #
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_PROG_LD
 AC_PROG_INSTALL
 AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
 
-# ===================================================== #
-#               Initialize libtool                      #
-# ===================================================== #
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
 # ==================================================== #
 #   Check for headers needed for standard interfaces   #
 # ==================================================== #
@@ -59,7 +52,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])
 
@@ -101,24 +93,6 @@
                        [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              #
 #=======================================================#
 XDT_FEATURE_DEBUG
@@ -127,8 +101,6 @@
 AC_OUTPUT([
 Makefile
 src/Makefile
-panel-plugins/Makefile
-panel-plugins/brightness/Makefile
 data/Makefile
 data/icons/Makefile
 data/icons/scalable/Makefile
@@ -146,7 +118,6 @@
 echo 
 echo "   DPMS         support    $have_dpms      "
 echo "   Notification support    $LIBNOTIFY_FOUND"
-echo "   Build panel  plugins    $build_panel_plugins"
 echo "   Debug        support    $enable_debug   "
 echo
 echo "----------------------------------------"  

Modified: xfce4-power-manager/trunk/po/POTFILES.in
===================================================================
--- xfce4-power-manager/trunk/po/POTFILES.in	2009-03-02 11:22:10 UTC (rev 6832)
+++ xfce4-power-manager/trunk/po/POTFILES.in	2009-03-02 13:28:56 UTC (rev 6833)
@@ -10,4 +10,3 @@
 src/xfpm-dbus-messages.c
 src/xfpm-settings-main.c
 src/xfce4-power-manager.desktop.in
-panel-plugins/brightness/main.c

Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c	2009-03-02 11:22:10 UTC (rev 6832)
+++ xfce4-power-manager/trunk/src/xfpm-main.c	2009-03-02 13:28:56 UTC (rev 6833)
@@ -93,15 +93,18 @@
         return;
     }
     
-    gchar *file;
-    file = g_strdup_printf("%s/.config/autostart",home);
+    gchar *dir_file;
     
-    if ( !g_file_test(file,G_FILE_TEST_IS_DIR) )
+    dir_file = g_strdup_printf("%s/.config/autostart", home);
+    
+    if ( !g_file_test(dir_file,G_FILE_TEST_IS_DIR) )
     {
-        g_mkdir_with_parents(file,0700);
+        g_mkdir_with_parents(dir_file, 0700);
     }
     
-    file = g_strdup_printf("%s/xfce4-power-manager.desktop",file);
+    gchar *file;
+    file = g_strdup_printf("%s/xfce4-power-manager.desktop",dir_file);
+    g_free(dir_file);
     
     if ( g_file_test(file,G_FILE_TEST_EXISTS) )
     {




More information about the Goodies-commits mailing list