[Goodies-commits] r7083 - in xfce4-power-manager/trunk: . panel-plugins/inhibit src

[Ali Abdallah]

Author: aliov
Date: 2009-04-01 13:54:30 +0000 (Wed, 01 Apr 2009)
New Revision: 7083

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/panel-plugins/inhibit/inhibit-plugin.c
   xfce4-power-manager/trunk/src/xfpm-manager.c
Log:
Inhibit plugin: Monitor org.freedesktop.PowerManagement name

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-04-01 12:38:27 UTC (rev 7082)
+++ xfce4-power-manager/trunk/ChangeLog	2009-04-01 13:54:30 UTC (rev 7083)
@@ -1,4 +1,7 @@
 
+2009-04-01 15:54 Ali aliov at xfce.org 
+	 * : Inhibit plugin: Monitor org.freedesktop.PowerManagement name
+
 2009-04-01  9:33 Ali aliov at xfce.org 
 	 * : Added man pages for the power manager and its settings
 

Modified: xfce4-power-manager/trunk/panel-plugins/inhibit/inhibit-plugin.c
===================================================================
--- xfce4-power-manager/trunk/panel-plugins/inhibit/inhibit-plugin.c	2009-04-01 12:38:27 UTC (rev 7082)
+++ xfce4-power-manager/trunk/panel-plugins/inhibit/inhibit-plugin.c	2009-04-01 13:54:30 UTC (rev 7083)
@@ -430,14 +430,6 @@
 	inhibit->connected = FALSE;
 	return;
     }
-    
-    if ( !xfpm_dbus_name_has_owner (dbus_g_connection_get_connection(inhibit->bus),
-				    "org.freedesktop.PowerManagement.Inhibit") )
-    {
-	gtk_widget_set_tooltip_text (inhibit->button, _("No power manager instance running"));
-	inhibit->connected = FALSE;
-	return;
-    }
 }
 
 /*
@@ -497,7 +489,7 @@
     gboolean show_notification;
     NotifyNotification *n;
 	
-    if ( g_strcmp0 (name, "org.freedesktop.PowerManagement.Inhibit") != 0)
+    if ( g_strcmp0 (name, "org.freedesktop.PowerManagement") != 0)
 	return;
 	
     if ( strlen (new) != 0 )

Modified: xfce4-power-manager/trunk/src/xfpm-manager.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-manager.c	2009-04-01 12:38:27 UTC (rev 7082)
+++ xfce4-power-manager/trunk/src/xfpm-manager.c	2009-04-01 13:54:30 UTC (rev 7083)
@@ -133,12 +133,6 @@
     xfpm_dbus_release_name (dbus_g_connection_get_connection(manager->priv->session_bus),
 			    "org.freedesktop.PowerManagement");
 				  
-    xfpm_dbus_release_name (dbus_g_connection_get_connection(manager->priv->session_bus),
-			    "org.freedesktop.PowerManagement.Inhibit");
-			    
-    xfpm_dbus_release_name (dbus_g_connection_get_connection(manager->priv->session_bus),
-			    "org.freedesktop.PowerManagement.Backlight");
-    
 }
 
 static gboolean
@@ -167,20 +161,6 @@
     
 	g_critical ("Unable to reserve bus name: PowerManagement\n");
     }
-    
-    if (!xfpm_dbus_register_name (dbus_g_connection_get_connection(manager->priv->session_bus),
-				  "org.freedesktop.PowerManagement.Inhibit") )
-    {
-    
-	g_critical ("Unable to reserve bus name: Inhibit\n");
-    }
-    
-    if (!xfpm_dbus_register_name (dbus_g_connection_get_connection(manager->priv->session_bus),
-				  "org.freedesktop.PowerManagement.Backlight") )
-    {
-    
-	g_critical ("Unable to reserve bus name: Backlight\n");
-    }
 }
 
 XfpmManager *