Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-power/upstream into lp:~ubuntu-desktop/indicator-power/ubuntu

[Ted Gould]

Woot! Fixes!

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-14 22:25:10 +0000
+++ ChangeLog	2012-02-23 06:38:19 +0000
@@ -1,5 +1,37 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	1.91
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fix accessible descriptions
+
[phone]  Charles Kerr  <[e-mail]>
+
+	when a new entry is added, ensure that its accessible_string is properly set
+
[phone]  Charles Kerr  <[e-mail]>
+
+	fix trivial indentation error
+
[phone]  Charles Kerr  <[e-mail]>
+
+	fix trivial misspelling
+
[phone]  Charles Kerr  <[e-mail]>
+
+	fix set_accessible_desc() to update the entries' accessible_desc fields and emit the accessible-desc-changed signal
+
[phone]  Charles Kerr  <[e-mail]>
+
+	Listen for the "g-properties-changed" signal instead of the "g-signal" signal from its GDBusProxy to fix bug #933466.
+
[phone]  Charles Kerr  <[e-mail]>
+
+	register for g-properties-changed rather than g-signal
+
 2012-02-14  Ted Gould  <[e-mail]>
 
 	1.90

=== modified file 'configure'
--- configure	2012-02-14 22:25:10 +0000
+++ configure	2012-02-23 06:38:19 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-power 1.90.
+# Generated by GNU Autoconf 2.68 for indicator-power 1.91.
 #
 # Report bugs to <http://bugs.launchpad.net/indicator-power>.
 #
@@ -570,8 +570,8 @@
 # Identity of this package.
 PACKAGE_NAME='indicator-power'
 PACKAGE_TARNAME='indicator-power'
-PACKAGE_VERSION='1.90'
-PACKAGE_STRING='indicator-power 1.90'
+PACKAGE_VERSION='1.91'
+PACKAGE_STRING='indicator-power 1.91'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-power'
 PACKAGE_URL='http://launchpad.net/indicator-power'
 
@@ -1384,7 +1384,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-power 1.90 to adapt to many kinds of systems.
+\`configure' configures indicator-power 1.91 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1454,7 +1454,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-power 1.90:";;
+     short | recursive ) echo "Configuration of indicator-power 1.91:";;
    esac
   cat <<\_ACEOF
 
@@ -1586,7 +1586,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-power configure 1.90
+indicator-power configure 1.91
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1864,7 +1864,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-power $as_me 1.90, which was
+It was created by indicator-power $as_me 1.91, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2688,7 +2688,7 @@
 
 # Define the identity of the package.
  PACKAGE='indicator-power'
- VERSION='1.90'
+ VERSION='1.91'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15492,7 +15492,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-power $as_me 1.90, which was
+This file was extended by indicator-power $as_me 1.91, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15559,7 +15559,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-power config.status 1.90
+indicator-power config.status 1.91
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2012-02-14 22:26:21 +0000
+++ configure.ac	2012-02-23 06:38:19 +0000
@@ -1,5 +1,5 @@
 AC_INIT([indicator-power],
-        [1.90],
+        [1.91],
         [http://bugs.launchpad.net/indicator-power],
         [indicator-power],
         [http://launchpad.net/indicator-power])

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-17 15:46:54 +0000
+++ debian/changelog	2012-02-23 06:38:19 +0000
@@ -1,3 +1,11 @@
+indicator-power (1.91-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream release.
+    * Fix for the icon not changing when state changes (LP: #933466)
+    * Fix accessible descriptions (LP: #891932)
+
+ -- Ted Gould <[e-mail]>  Thu, 23 Feb 2012 00:35:31 -0600
+
 indicator-power (1.90-0ubuntu2) precise; urgency=low
 
   * src/indicator-power.c

=== modified file 'src/indicator-power.c'
--- src/indicator-power.c	2012-02-17 15:46:54 +0000
+++ src/indicator-power.c	2012-02-23 06:38:19 +0000
@@ -103,6 +103,8 @@
 static void             update_visibility               (IndicatorPower * self);
 static gboolean         should_be_visible               (IndicatorPower * self);
 
+static void             on_entry_added                  (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
+
 static void gsd_appeared_callback (GDBusConnection *connection, const gchar *name, const gchar *name_owner, gpointer user_data);
 
 G_DEFINE_TYPE (IndicatorPower, indicator_power, INDICATOR_OBJECT_TYPE);
@@ -144,6 +146,9 @@
   g_object_set (G_OBJECT(self),
                 INDICATOR_OBJECT_DEFAULT_VISIBILITY, FALSE,
                 NULL);
+
+  g_signal_connect (INDICATOR_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,
+                    G_CALLBACK(on_entry_added), NULL);
 }
 
 static void
@@ -329,7 +334,7 @@
                            gdouble         percentage,
                            gchar         **short_details,
                            gchar         **details,
-                           gchar         **accesible_name)
+                           gchar         **accessible_name)
 {
   gchar *short_timestring = NULL;
   gchar *detailed_timestring = NULL;
@@ -343,8 +348,8 @@
       if (state == UP_DEVICE_STATE_CHARGING)
         {
           /* TRANSLATORS: %2 is a time string, e.g. "1 hour 5 minutes" */
-          *accesible_name = g_strdup_printf (_("%s (%s to charge (%.0lf%%))"),
-                                             device_name, detailed_timestring, percentage);
+          *accessible_name = g_strdup_printf (_("%s (%s to charge (%.0lf%%))"),
+                                              device_name, detailed_timestring, percentage);
           *details = g_strdup_printf (_("%s (%s to charge)"),
                                       device_name, short_timestring);
           *short_details = g_strdup_printf ("(%s)", short_timestring);
@@ -355,14 +360,14 @@
 
           if (time > 43200) /* 12 hours */
             {
-              *accesible_name = g_strdup_printf (_("%s"), device_name);
+              *accessible_name = g_strdup_printf (_("%s"), device_name);
               *details = g_strdup_printf (_("%s"), device_name);
             }
           else
             {
               /* TRANSLATORS: %2 is a time string, e.g. "1 hour 5 minutes" */
-              *accesible_name = g_strdup_printf (_("%s (%s left (%.0lf%%))"),
-                                                 device_name, detailed_timestring, percentage);
+              *accessible_name = g_strdup_printf (_("%s (%s left (%.0lf%%))"),
+                                                  device_name, detailed_timestring, percentage);
               *details = g_strdup_printf (_("%s (%s left)"),
                                           device_name, short_timestring);
             }
@@ -376,7 +381,7 @@
       if (state == UP_DEVICE_STATE_FULLY_CHARGED)
         {
           *details = g_strdup_printf (_("%s (charged)"), device_name);
-          *accesible_name = g_strdup (*details);
+          *accessible_name = g_strdup (*details);
           *short_details = g_strdup ("");
         }
       else if (percentage > 0)
@@ -385,29 +390,62 @@
            * used when we don't have a time value */
           *details = g_strdup_printf (_("%s (%.0lf%%)"),
                                       device_name, percentage);
-          *accesible_name = g_strdup (*details);
+          *accessible_name = g_strdup (*details);
           *short_details = g_strdup_printf (_("(%.0lf%%)"),
                                             percentage);
         }
       else
         {
           *details = g_strdup_printf (_("%s (not present)"), device_name);
-          *accesible_name = g_strdup (*details);
+          *accessible_name = g_strdup (*details);
           *short_details = g_strdup (_("(not present)"));
         }
     }
 }
 
-static void
-set_accessible_desc (IndicatorPower *self,
-                     const gchar    *desc)
-{
-  if (desc == NULL || desc[0] == '\0')
-    return;
-
-  g_free (self->accessible_desc);
-
-  self->accessible_desc = g_strdup (desc);
+/* ensure that the entry is using self's accessible description */
+static void
+refresh_entry_accessible_desc (IndicatorPower * self, IndicatorObjectEntry * entry)
+{
+  const char * newval = self->accessible_desc;
+
+  if (entry->accessible_desc != newval)
+  {
+    g_debug ("%s: setting entry %p accessible description to '%s'", G_STRFUNC, entry, newval);
+    entry->accessible_desc = newval;
+    g_signal_emit (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID, 0, entry);
+  }
+}
+
+static void
+on_entry_added (IndicatorObject       * io,
+                IndicatorObjectEntry  * entry,
+                gpointer                user_data G_GNUC_UNUSED)
+{
+  refresh_entry_accessible_desc (INDICATOR_POWER(io), entry);
+}
+
+static void
+set_accessible_desc (IndicatorPower *self, const gchar *desc)
+{
+  g_debug ("%s: setting accessible description to '%s'", G_STRFUNC, desc);
+
+  if (desc && *desc)
+  {
+    /* update our copy of the string */
+    char * oldval = self->accessible_desc;
+    self->accessible_desc = g_strdup (desc);
+
+    /* ensure that the entries are using self's accessible description */
+    GList * l;
+    GList * entries = indicator_object_get_entries(INDICATOR_OBJECT(self));
+    for (l=entries; l!=NULL; l=l->next)
+      refresh_entry_accessible_desc (self, l->data);
+
+    /* cleanup */
+    g_list_free (entries);
+    g_free (oldval);
+  }
 }
 
 static const gchar *
@@ -522,7 +560,7 @@
   const gchar *device_name;
   gchar *short_details = NULL;
   gchar *details = NULL;
-  gchar *accesible_name = NULL;
+  gchar *accessible_name = NULL;
 
   if (device == NULL)
     return;
@@ -548,7 +586,7 @@
 
   device_name = device_kind_to_localised_string (kind);
 
-  build_device_time_details (device_name, time, state, percentage, &short_details, &details, &accesible_name);
+  build_device_time_details (device_name, time, state, percentage, &short_details, &details, &accessible_name);
 
   /* Create menu item */
   item = gtk_image_menu_item_new ();
@@ -568,7 +606,7 @@
 
   g_free (short_details);
   g_free (details);
-  g_free (accesible_name);
+  g_free (accessible_name);
   g_free (device_icon);
   g_free (object_path);
 }
@@ -746,7 +784,7 @@
   GIcon *device_gicons;
   gchar *short_details = NULL;
   gchar *details = NULL;
-  gchar *accesible_name = NULL;
+  gchar *accessible_name = NULL;
   gchar *device_icon = NULL;
   gchar *object_path = NULL;
   gdouble percentage;
@@ -777,15 +815,15 @@
   device_name = device_kind_to_localised_string (kind);
 
   /* get the description */
-  build_device_time_details (device_name, time, state, percentage, &short_details, &details, &accesible_name);
+  build_device_time_details (device_name, time, state, percentage, &short_details, &details, &accessible_name);
 
   gtk_label_set_label (GTK_LABEL (self->label),
                        short_details);
-  set_accessible_desc (self, accesible_name);
+  set_accessible_desc (self, accessible_name);
 
   g_free (short_details);
   g_free (details);
-  g_free (accesible_name);
+  g_free (accessible_name);
   g_free (device_icon);
   g_free (object_path);
 }