[Goodies-commits] r7289 - in xfce4-power-manager/trunk: . data/icons/scalable libxfpm panel-plugins po settings

[Ali Abdallah]

Author: aliov
Date: 2009-04-28 09:54:07 +0000 (Tue, 28 Apr 2009)
New Revision: 7289

Removed:
   xfce4-power-manager/trunk/data/icons/scalable/apps/
   xfce4-power-manager/trunk/panel-plugins/inhibit/
Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/configure.ac.in
   xfce4-power-manager/trunk/data/icons/scalable/Makefile.am
   xfce4-power-manager/trunk/libxfpm/hal-power.c
   xfce4-power-manager/trunk/panel-plugins/Makefile.am
   xfce4-power-manager/trunk/po/POTFILES.in
   xfce4-power-manager/trunk/settings/xfpm-settings.c
Log:
Prepare RC1 release

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-04-27 11:30:31 UTC (rev 7288)
+++ xfce4-power-manager/trunk/ChangeLog	2009-04-28 09:54:07 UTC (rev 7289)
@@ -1,4 +1,7 @@
 
+2009-04-28 11:53 Ali aliov at xfce.org 
+	 * : Prepare RC1 release
+
 2009-04-22  9:52 Ali aliov at xfce.org 
 	 * : Enable set hal power save
 

Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in	2009-04-27 11:30:31 UTC (rev 7288)
+++ xfce4-power-manager/trunk/configure.ac.in	2009-04-28 09:54:07 UTC (rev 7289)
@@ -3,7 +3,7 @@
 m4_define([xfpm_version_minor],  [8])
 m4_define([xfpm_version_micro],  [0])
 m4_define([xfpm_version_build],  [])
-m4_define([xfpm_version_tag],[r at REVISION@])
+m4_define([xfpm_version_tag],[RC1])
 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], [xfpm_version], [http://bugzilla.xfce.org/])
@@ -141,11 +141,9 @@
 settings/Makefile
 panel-plugins/Makefile
 panel-plugins/brightness/Makefile
-panel-plugins/inhibit/Makefile
 data/Makefile
 data/icons/Makefile
 data/icons/scalable/Makefile
-data/icons/scalable/apps/Makefile
 data/icons/scalable/status/Makefile
 data/icons/scalable/actions/Makefile
 doc/Makefile

Modified: xfce4-power-manager/trunk/data/icons/scalable/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/data/icons/scalable/Makefile.am	2009-04-27 11:30:31 UTC (rev 7288)
+++ xfce4-power-manager/trunk/data/icons/scalable/Makefile.am	2009-04-28 09:54:07 UTC (rev 7289)
@@ -1,2 +1,2 @@
-SUBDIRS = actions apps status
+SUBDIRS = actions status
 

Modified: xfce4-power-manager/trunk/libxfpm/hal-power.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-power.c	2009-04-27 11:30:31 UTC (rev 7288)
+++ xfce4-power-manager/trunk/libxfpm/hal-power.c	2009-04-28 09:54:07 UTC (rev 7289)
@@ -263,8 +263,6 @@
     GError          *error = NULL;
     gint             ret = 0;
     
-    g_return_val_if_fail (HAL_IS_POWER (power), FALSE);
-
     if ( hal_power_is_power_save_set () == set )
 	return TRUE;
     

Modified: xfce4-power-manager/trunk/panel-plugins/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/panel-plugins/Makefile.am	2009-04-27 11:30:31 UTC (rev 7288)
+++ xfce4-power-manager/trunk/panel-plugins/Makefile.am	2009-04-28 09:54:07 UTC (rev 7289)
@@ -1,3 +1,2 @@
 SUBDIRS = 		\
-	brightness	\
-	inhibit
+	brightness

Modified: xfce4-power-manager/trunk/po/POTFILES.in
===================================================================
--- xfce4-power-manager/trunk/po/POTFILES.in	2009-04-27 11:30:31 UTC (rev 7288)
+++ xfce4-power-manager/trunk/po/POTFILES.in	2009-04-28 09:54:07 UTC (rev 7289)
@@ -34,5 +34,3 @@
 libxfpm/xfpm-notify.c
 panel-plugins/brightness/brightness-button.c
 panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in
-panel-plugins/inhibit/inhibit-plugin.c
-panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in

Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-04-27 11:30:31 UTC (rev 7288)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-04-28 09:54:07 UTC (rev 7289)
@@ -1273,7 +1273,7 @@
 }
 
 static void
-_cursor_changed_cb(GtkIconView *view,gpointer data)
+_cursor_changed_cb(GtkTreeView *view,gpointer data)
 {
     GtkTreeSelection *sel;
     GtkTreeModel     *model;
@@ -1379,7 +1379,7 @@
     gtk_list_store_append(list_store, &iter);
     if ( pix )
     {
-	    gtk_list_store_set(list_store, &iter, 0, pix, 1, _("Advanced"), 2, i, -1);
+	    gtk_list_store_set(list_store, &iter, 0, pix, 1, _("Extended"), 2, i, -1);
 	    g_object_unref(pix);
     }
     else