[gnome-power-manager: 2/3] Correct a few places where the interface names were wrong

[Richard Hughes <rhughes src gnome org>]

commit bcd0eb6343ff0f78a73af78f16951a8a30d7f23e
Author: Richard Hughes <richard hughsie com>
Date:   Thu Jul 23 12:14:23 2009 +0100

    Correct a few places where the interface names were wrong

 src/gpm-backlight.c  |    6 +++---
 src/gpm-common.h     |   10 ++--------
 src/gpm-main.c       |    1 +
 src/gpm-manager.h    |    4 ----
 src/gpm-statistics.c |    2 +-
 5 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
index b789c2c..1bb4503 100644
--- a/src/gpm-backlight.c
+++ b/src/gpm-backlight.c
@@ -161,7 +161,7 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
 	/* we emit a signal for the brightness applet */
 	if (ret && hw_changed) {
 		egg_debug ("emitting brightness-changed : %i", percentage);
-//		g_signal_emit (backlight, signals [BRIGHTNESS_CHANGED], 0, percentage);
+		g_signal_emit (backlight, signals [BRIGHTNESS_CHANGED], 0, percentage);
 	}
 	return ret;
 }
@@ -360,7 +360,7 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
 		/* we emit a signal for the brightness applet */
 		if (ret && hw_changed) {
 			egg_debug ("emitting brightness-changed : %i", percentage);
-//			g_signal_emit (backlight, signals [BRIGHTNESS_CHANGED], 0, percentage);
+			g_signal_emit (backlight, signals [BRIGHTNESS_CHANGED], 0, percentage);
 		}
 	} else if (strcmp (type, GPM_BUTTON_BRIGHT_DOWN) == 0) {
 		/* go up down step */
@@ -377,7 +377,7 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
 		/* we emit a signal for the brightness applet */
 		if (ret && hw_changed) {
 			egg_debug ("emitting brightness-changed : %i", percentage);
-//			g_signal_emit (backlight, signals [BRIGHTNESS_CHANGED], 0, percentage);
+			g_signal_emit (backlight, signals [BRIGHTNESS_CHANGED], 0, percentage);
 		}
 	} else if (strcmp (type, GPM_BUTTON_LID_OPEN) == 0) {
 		/* make sure we undim when we lift the lid */
diff --git a/src/gpm-common.h b/src/gpm-common.h
index 373466a..301b17c 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -33,15 +33,9 @@ G_BEGIN_DECLS
 
 #define	GPM_DBUS_SERVICE		"org.gnome.PowerManager"
 #define	GPM_DBUS_INTERFACE		"org.gnome.PowerManager"
-#define	GPM_DBUS_INTERFACE_WIDGET	"org.gnome.PowerManager.Widget"
 #define	GPM_DBUS_INTERFACE_BACKLIGHT	"org.gnome.PowerManager.Backlight"
-#define	GPM_DBUS_INTERFACE_STATS	"org.gnome.PowerManager.Statistics"
-#define	GPM_DBUS_INTERFACE_INHIBIT	"org.gnome.PowerManager.Inhibit"
-#define	GPM_DBUS_PATH			"/org.gnome.PowerManager"
-#define	GPM_DBUS_PATH_BACKLIGHT		"/org.gnome.PowerManager/Backlight"
-#define	GPM_DBUS_PATH_WIDGET		"/org.gnome.PowerManager/Widget"
-#define	GPM_DBUS_PATH_STATS		"/org.gnome.PowerManager/Statistics"
-#define	GPM_DBUS_PATH_INHIBIT		"/org.gnome.PowerManager/Inhibit"
+#define	GPM_DBUS_PATH			"/org/gnome/PowerManager"
+#define	GPM_DBUS_PATH_BACKLIGHT		"/org/gnome/PowerManager/Backlight"
 
 /* common descriptions of this program */
 #define GPM_NAME 			_("Power Manager")
diff --git a/src/gpm-main.c b/src/gpm-main.c
index 98259bd..163cbd3 100644
--- a/src/gpm-main.c
+++ b/src/gpm-main.c
@@ -251,6 +251,7 @@ main (int argc, char *argv[])
 		return 0;
 	}
 
+	/* register to be a policy agent, just like kpackagekit does */
 	ret = dbus_bus_request_name(dbus_g_connection_get_connection(system_connection),
 				    "org.freedesktop.Policy.Power",
 				    DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
diff --git a/src/gpm-manager.h b/src/gpm-manager.h
index b2bf3f1..c027362 100644
--- a/src/gpm-manager.h
+++ b/src/gpm-manager.h
@@ -26,10 +26,6 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 
-#define	GPM_DBUS_SERVICE		"org.gnome.PowerManager"
-#define	GPM_DBUS_PATH			"/org.gnome.PowerManager"
-#define	GPM_DBUS_INTERFACE		"org.gnome.PowerManager"
-
 G_BEGIN_DECLS
 
 #define GPM_TYPE_MANAGER	 (gpm_manager_get_type ())
diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
index 2b23712..28fa9be 100644
--- a/src/gpm-statistics.c
+++ b/src/gpm-statistics.c
@@ -1489,7 +1489,7 @@ main (int argc, char *argv[])
 
 	/* are we already activated? */
 	egg_unique = egg_unique_new ();
-	ret = egg_unique_assign (egg_unique, "org.freedesktop.DeviceKit.Gnome");
+	ret = egg_unique_assign (egg_unique, "org.gnome.PowerManager.Statistics");
 	if (!ret)
 		goto unique_out;
 	g_signal_connect (egg_unique, "activated",