Import upstream version 0.4

1 files changed, 20 insertions, 11 deletions

diff --git a/src/indicator-power.c b/src/indicator-power.c
index a81b791..5649473 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -38,6 +38,18 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DEFAULT_ICON   "gpm-battery-missing"
 
+#if HAVE_GSD
+#define DBUS_SERVICE                "org.gnome.SettingsDaemon"
+#define DBUS_PATH                   "/org/gnome/SettingsDaemon"
+#define POWER_DBUS_PATH             DBUS_PATH "/Power"
+#define POWER_DBUS_INTERFACE        "org.gnome.SettingsDaemon.Power"
+#else
+#define DBUS_SERVICE                "org.gnome.PowerManager"
+#define DBUS_PATH                   "/org/gnome/PowerManager"
+#define POWER_DBUS_PATH             DBUS_PATH
+#define POWER_DBUS_INTERFACE        "org.gnome.PowerManager"
+#endif
+
 #define INDICATOR_POWER_TYPE            (indicator_power_get_type ())
 #define INDICATOR_POWER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_POWER_TYPE, IndicatorPower))
 #define INDICATOR_POWER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_POWER_TYPE, IndicatorPowerClass))
@@ -440,15 +452,11 @@ build_menu (IndicatorPower *self)
     }
 
   /* options */
-  item = gtk_check_menu_item_new_with_label (_("Show Time Remaining"));
+  item = gtk_check_menu_item_new_with_label (_("Show Time in Menu Bar"));
   g_signal_connect (G_OBJECT (item), "toggled",
                     G_CALLBACK (option_toggled_cb), self);
   gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item);
 
-  /* separator */
-  item = gtk_separator_menu_item_new ();
-  gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item);
-
   /* preferences */
   item = gtk_image_menu_item_new_with_mnemonic (_("Power Settings ..."));
   image = gtk_image_new_from_icon_name (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
@@ -498,9 +506,6 @@ get_primary_device (GVariant *devices)
 
       g_debug ("%s: got data from object %s", G_STRFUNC, object_path);
 
-      if (primary_device == NULL && kind == UP_DEVICE_KIND_BATTERY)
-        primary_device = device;
-
       if (state == UP_DEVICE_STATE_DISCHARGING)
         {
           discharging = TRUE;
@@ -519,6 +524,10 @@ get_primary_device (GVariant *devices)
               primary_device_charging = device;
             }
         }
+      else
+        {
+          primary_device = device;
+        }
     }
 
   if (discharging)
@@ -704,9 +713,9 @@ indicator_power_init (IndicatorPower *self)
   g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                             G_DBUS_PROXY_FLAGS_NONE,
                             NULL,
-                            "org.gnome.PowerManager",
-                            "/org/gnome/PowerManager",
-                            "org.gnome.PowerManager",
+                            DBUS_SERVICE,
+                            POWER_DBUS_PATH,
+                            POWER_DBUS_INTERFACE,
                             priv->proxy_cancel,
                             service_proxy_cb,
                             self);