Merge lp:~charlesk/indicator-session/lp-1076271 into lp:indicator-session/13.04

[Charles Kerr]

Show the login name if an account has no real name set

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:373
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=quantal,flavor=amd64/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=quantal,flavor=i386/31/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:373
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=quantal,flavor=amd64/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=quantal,flavor=i386/33/console

review: Approve (continuous-integration)

[Allan LeSage (allanlesage)]

Needed the inline packaging to land first; please proceed with reviews and set to "approve" at will.

[Lars Karlitski (larsu)]

Looks & works great, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

=== modified file 'src/session-menu-mgr.c'
--- src/session-menu-mgr.c	2012-11-06 15:08:31 +0000
+++ src/session-menu-mgr.c	2012-11-15 17:41:23 +0000
@@ -700,9 +700,10 @@
   GString * gstr = g_string_new (accounts_user_get_real_name (user));
 
   if (user_has_name_collision (user))
-    {
-      g_string_append_printf (gstr, " (%s)", accounts_user_get_user_name(user));
-    }
+    g_string_append_printf (gstr, " (%s)", accounts_user_get_user_name(user));
+
+  if (!gstr->len)
+    g_string_assign (gstr, accounts_user_get_user_name(user));
 
   dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, gstr->str);
   g_string_free (gstr, TRUE);