Merge lp:~charlesk/indicator-session/lp-1331873-use-etc-release-for-distro-name into lp:indicator-session/14.10

[Charles Kerr]

Add support for getting the distro name from /etc/os-release.

Add support for getting the distro name from /etc/os-release.

get_os_release() returns a string-to-string GHashTable of the parsed file with unescaped value strings.

We only need one key out of this file, so a GHashTable is admittedly a bit of overkill, but separating the parser code from the use code like this makes the code more readable and makes the parser code self-contained.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/140/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Needs Fixing

[lp:~charlesk/indicator-session/lp-1331873-use-etc-release-for-distro-name]

450. By Charles Kerr on 2014-07-16

don't mark 'Ubuntu' for translation.

451. By Charles Kerr on 2014-07-16

better i18n markup of the help string

452. By Charles Kerr on 2014-07-16

make the os-release parser slightly less unreadable.

453. By Charles Kerr on 2014-07-16

make the os-release parser slightly more readable.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:453
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/141/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/141/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/indicator-session/lp-1331873-use-etc-release-for-distro-name]

454. By Charles Kerr on 2014-07-16

tweak unescape comment for readability

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:454
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/142/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/indicator-session/lp-1331873-use-etc-release-for-distro-name]

455. By Charles Kerr on 2014-07-16

use g_shell_unquote() to unmunge the values in /etc/os-release

[Ted Gould (ted)]

Great!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/143/rebuild

review: Approve (continuous-integration)

=== modified file 'src/service.c'
--- src/service.c	2014-04-02 15:02:59 +0000
+++ src/service.c	2014-07-16 16:32:32 +0000
@@ -329,14 +329,90 @@
 ****
 ***/
 
+static GHashTable*
+get_os_release (void)
+{
+  static const char * const os_release = "/etc/os-release";
+  GHashTable * hash;
+  GIOChannel * io;
+
+  hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+
+  if ((io = g_io_channel_new_file (os_release, "r", NULL)))
+    {
+      GString * key = g_string_new (NULL);
+
+      for (;;)
+        {
+          GIOStatus status;
+          char * in;
+          GError * error;
+          gchar * val;
+
+          /* read a line */
+          status = g_io_channel_read_line_string (io, key, NULL, NULL);
+          if (status == G_IO_STATUS_EOF)
+            break;
+
+          /* ignore blank lines & comments */
+          if (!key->len || key->str[0]=='#')
+            continue;
+
+          /* split into key=value */
+          in = strchr(key->str, '=');
+          if (!in)
+            continue;
+          *in++ = '\0';
+
+          /* unmunge the value component */
+          g_strstrip(in); /* eat linefeed */
+          error = NULL;
+          val = g_shell_unquote (in, &error);
+          if (error != NULL)
+            {
+              g_warning("Unable to unquote \"%s\": %s", in, error->message);
+              val = g_strdup(in);
+              g_clear_error(&error);
+            }
+ 
+          g_debug("from \"%s\": key [%s] val [%s]", os_release, key->str, val); 
+          g_hash_table_insert (hash, g_strdup(key->str), val); /* hash owns val now */
+        }
+
+      g_string_free(key, TRUE);
+      g_io_channel_unref(io);
+    }
+
+  return hash;
+}
+
+static const char*
+get_distro_name (void)
+{
+  static char * distro_name = NULL;
+
+  if (distro_name == NULL)
+    {
+      GHashTable * os_release = get_os_release();
+      gpointer value = g_hash_table_lookup(os_release, "NAME");
+      if (value == NULL)
+        value = "Ubuntu"; /* fallback value */
+      distro_name = g_strdup(value);
+      g_hash_table_destroy(os_release);
+    }
+
+  return distro_name;
+}
+
 static GMenuModel *
 create_admin_section (void)
 {
   GMenu * menu;
-
+  gchar * help_label = g_strdup_printf(_("%s Help"), get_distro_name());
   menu = g_menu_new ();
   g_menu_append (menu, _("About This Computer"), "indicator.about");
-  g_menu_append (menu, _("Ubuntu Help"), "indicator.help");
+  g_menu_append (menu, help_label, "indicator.help");
+  g_free (help_label);
   return G_MENU_MODEL (menu);
 }