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

[Ali Abdallah]

Author: aliov
Date: 2009-06-06 12:22:30 +0000 (Sat, 06 Jun 2009)
New Revision: 7470

Modified:
   xfce4-power-manager/trunk/AUTHORS
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/src/xfpm-main.c
   xfce4-power-manager/trunk/src/xfpm-xfconf.c
   xfce4-power-manager/trunk/src/xfpm-xfconf.h
Log:
	*: Use the channel in the private data.
	*: Don't show popup message if xfmp is already running and
	a new instance is trying to load for some reason.

Modified: xfce4-power-manager/trunk/AUTHORS
===================================================================
--- xfce4-power-manager/trunk/AUTHORS	2009-06-06 12:22:29 UTC (rev 7469)
+++ xfce4-power-manager/trunk/AUTHORS	2009-06-06 12:22:30 UTC (rev 7470)
@@ -1,3 +1,7 @@
-Ali Abdallah aliov at xfce.org
+Ali Abdallah 		aliov at xfce.org
 
-Special Thanks to Fabian Nowak.
\ No newline at end of file
+Special Thanks to:
+------------------
+* Yves-Alexis Perez 	corsac at debian.org.
+* Mike Masonnet 	mmassonnet at xfce.org.
+* Fabian Nowak 		timystery at arcor.de.

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-06-06 12:22:29 UTC (rev 7469)
+++ xfce4-power-manager/trunk/ChangeLog	2009-06-06 12:22:30 UTC (rev 7470)
@@ -1,3 +1,8 @@
+2009-06-04: 15:00 Ali aliov at xfce.org
+	*: Use the channel in the private data.
+	*: Don't show popup message if xfmp is already running and
+	a new instance is trying to load for some reason.
+
 2009-06-04: 12:00 Ali aliov at xfce.org
 	*: Reset the idle counter when we switch from battery to AC and vise versa.
 

Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c	2009-06-06 12:22:29 UTC (rev 7469)
+++ xfce4-power-manager/trunk/src/xfpm-main.c	2009-06-06 12:22:30 UTC (rev 7470)
@@ -267,9 +267,10 @@
     
     if (xfpm_dbus_name_has_owner (dbus_g_connection_get_connection(bus), "org.freedesktop.PowerManagement") )
     {
-	
-	xfpm_info(_("Xfce Power Manager"),
-		  _("Another power manager is already running"));
+	g_print ("%s: %s\n", 
+		 _("Xfce Power Manager"),
+		 _("Another power manager is already running"));
+		  
     }
     else if (xfpm_dbus_name_has_owner(dbus_g_connection_get_connection(bus), 
 				      "org.xfce.PowerManager"))

Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-06-06 12:22:29 UTC (rev 7469)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-06-06 12:22:30 UTC (rev 7470)
@@ -29,6 +29,8 @@
 #include <glib.h>
 #include <libxfce4util/libxfce4util.h>
 
+#include <xfconf/xfconf.h>
+
 #include "libxfpm/xfpm-string.h"
 #include "libxfpm/xfpm-common.h"
 
@@ -600,7 +602,6 @@
 			  G_CALLBACK (xfpm_xfconf_property_changed_cb), conf);
 	xfpm_xfconf_load_configuration (conf);
     }
-    conf->channel = xfconf_channel_new ("xfce4-power-manager");
 }
 
 static void

Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.h	2009-06-06 12:22:29 UTC (rev 7469)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.h	2009-06-06 12:22:30 UTC (rev 7470)
@@ -23,8 +23,6 @@
 
 #include <glib-object.h>
 
-#include <xfconf/xfconf.h>
-
 G_BEGIN_DECLS
 
 #define XFPM_TYPE_XFCONF        (xfpm_xfconf_get_type () )
@@ -36,7 +34,6 @@
 typedef struct
 {
     GObject		  parent;
-    XfconfChannel        *channel;
     XfpmXfconfPrivate    *priv;
     
 } XfpmXfconf;