[Goodies-commits] r6104 - in xfce4-power-manager/trunk: . data/icons/scalable/apps src

[Ali Abdallah]

Author: aliov
Date: 2008-11-15 10:31:08 +0000 (Sat, 15 Nov 2008)
New Revision: 6104

Removed:
   xfce4-power-manager/trunk/data/icons/scalable/apps/xfpm-display.svg
   xfce4-power-manager/trunk/data/icons/scalable/apps/xfpm-keyboard.svg
Modified:
   xfce4-power-manager/trunk/configure.ac.in
   xfce4-power-manager/trunk/data/icons/scalable/apps/Makefile.am
   xfce4-power-manager/trunk/src/xfpm-settings.c
Log:
Use standard icon names for display and keyboard

Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in	2008-11-15 10:19:20 UTC (rev 6103)
+++ xfce4-power-manager/trunk/configure.ac.in	2008-11-15 10:31:08 UTC (rev 6104)
@@ -1,12 +1,17 @@
-m4_define([powermanager_version], [0.6.0svn])
 m4_define([intltool_minimum_version], [0.31])
+m4_define([xfpm_version_major],  [0])
+m4_define([xfpm_version_minor],  [6])
+m4_define([xfpm_version_micro],  [0])
+m4_define([xfpm_version_build],  [])
+m4_define([xfpm_version_tag],[])
+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()])])
 
-AC_INIT([xfce4-power-manager],[powermanager_version],[aliov at xfce.org])
+AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
 AC_PREREQ(2.50)
 
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
 
 # ============== basic compiler settings ============= #
 AC_PROG_CC

Modified: xfce4-power-manager/trunk/data/icons/scalable/apps/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/data/icons/scalable/apps/Makefile.am	2008-11-15 10:19:20 UTC (rev 6103)
+++ xfce4-power-manager/trunk/data/icons/scalable/apps/Makefile.am	2008-11-15 10:31:08 UTC (rev 6104)
@@ -4,7 +4,5 @@
 Datadir = $(datadir)/icons/hicolor/scalable/apps
 
 Data_DATA =				\
-	xfpm-display.svg		\
-	xfpm-keyboard.svg		\
 	xfpm-cpu.svg
 	

Deleted: xfce4-power-manager/trunk/data/icons/scalable/apps/xfpm-display.svg

Deleted: xfce4-power-manager/trunk/data/icons/scalable/apps/xfpm-keyboard.svg

Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c	2008-11-15 10:19:20 UTC (rev 6103)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c	2008-11-15 10:31:08 UTC (rev 6104)
@@ -1132,7 +1132,7 @@
     /// Battery Settings
     if ( is_laptop || ups )
     {
-        pix = xfpm_load_icon(ups ? "gpm-ups-100" : "gpm-primary-100",38);
+        pix = xfpm_load_icon(ups ? "gpm-ups-100" : "battery",38);
         gtk_list_store_append(list_store,&iter);
         if ( pix )
         {
@@ -1148,7 +1148,7 @@
     /// Keyboard Settings
     if ( is_laptop )
     {
-        pix = xfpm_load_icon("xfpm-keyboard",38);
+        pix = xfpm_load_icon("keyboard",38);
         gtk_list_store_append(list_store,&iter);
         if ( pix )
         {
@@ -1163,7 +1163,7 @@
     
     /// Dpms settings
 #ifdef HAVE_DPMS    
-    pix = xfpm_load_icon("xfpm-display",38);      
+    pix = xfpm_load_icon("display",38);      
     gtk_list_store_append(list_store,&iter);
     if ( pix ) 
     {