From 8b03674c7f622f790e65cea59343c31865451c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 15 Jul 2011 11:43:00 +0200 Subject: Always select a device, doesnt matter Its charging/discharging or not Fixes https://bugs.launchpad.net/ubuntu/+source/indicator-power/+bug/810872 --- src/indicator-power.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/indicator-power.c b/src/indicator-power.c index a81b791..8180d38 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -498,9 +498,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 +516,10 @@ get_primary_device (GVariant *devices) primary_device_charging = device; } } + else + { + primary_device = device; + } } if (discharging) -- cgit v1.2.3 From 99c94ace2b89cbef26d72dac5edfd3f309ba2269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 18 Jul 2011 15:40:17 +0200 Subject: Use the new D-Bus interface if gnome-settings-daemon is new enough Prepare the indicator-power about the changes upstream, where the code from gnome-power-manager is being moved to gnome-settings-daemon --- src/indicator-power.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/indicator-power.c b/src/indicator-power.c index 8180d38..4c70b7d 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -38,6 +38,18 @@ with this program. If not, see . #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)) @@ -705,9 +717,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); -- cgit v1.2.3 From 13d993e0026366d430f8ecad0aef772951f4bdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 18 Jul 2011 16:09:41 +0200 Subject: Do not draw a separator between the configuration options in the menu --- src/indicator-power.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/indicator-power.c b/src/indicator-power.c index 4c70b7d..5649473 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -452,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); -- cgit v1.2.3