[gnome-settings-daemon] power: Split out get_property

[Jasper St. Pierre <jstpierre src gnome org>]

commit 976344847b8c4d0eaa9a6b560dfafe396ffe4a2e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Jun 12 16:27:26 2013 -0400

    power: Split out get_property
    
    We want to add properties on the Screen iface, so remove this.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=698754

 plugins/power/gsd-power-manager.c |   37 +++++++++++++++++++++++++------------
 1 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 2c8703c..9f06aaf 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -3771,6 +3771,26 @@ handle_method_call (GDBusConnection       *connection,
 }
 
 static GVariant *
+handle_get_property_main (GsdPowerManager *manager,
+                          const gchar *property_name)
+{
+        GVariant *retval = NULL;
+
+        if (g_strcmp0 (property_name, "Icon") == 0) {
+                retval = engine_get_icon_property_variant (manager);
+        } else if (g_strcmp0 (property_name, "Tooltip") == 0) {
+                retval = engine_get_tooltip_property_variant (manager);
+        } else if (g_strcmp0 (property_name, "Percentage") == 0) {
+                gdouble percentage;
+                percentage = engine_get_percentage (manager);
+                if (percentage >= 0)
+                        retval = g_variant_new_double (percentage);
+        }
+
+        return retval;
+}
+
+static GVariant *
 handle_get_property (GDBusConnection *connection,
                      const gchar *sender,
                      const gchar *object_path,
@@ -3779,7 +3799,6 @@ handle_get_property (GDBusConnection *connection,
                      GError **error, gpointer user_data)
 {
         GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-        GVariant *retval = NULL;
 
         /* Check session pointer as a proxy for whether the manager is in the
            start or stop state */
@@ -3787,18 +3806,12 @@ handle_get_property (GDBusConnection *connection,
                 return NULL;
         }
 
-        if (g_strcmp0 (property_name, "Icon") == 0) {
-                retval = engine_get_icon_property_variant (manager);
-        } else if (g_strcmp0 (property_name, "Tooltip") == 0) {
-                retval = engine_get_tooltip_property_variant (manager);
-        } else if (g_strcmp0 (property_name, "Percentage") == 0) {
-                gdouble percentage;
-                percentage = engine_get_percentage (manager);
-                if (percentage >= 0)
-                        retval = g_variant_new_double (percentage);
+        if (g_strcmp0 (interface_name, GSD_POWER_DBUS_INTERFACE) == 0) {
+                return handle_get_property_main (manager, property_name);
+        } else {
+                g_warning ("not recognised interface: %s", interface_name);
+                return NULL;
         }
-
-        return retval;
 }
 
 static const GDBusInterfaceVTable interface_vtable =