Merge lp:~mgarrido-deactivatedaccount/ubuntu/natty/indicator-me/indicator-me.fix-682153 into lp:ubuntu/natty/indicator-me

[Manuel J. Garrido]

By default shows real name instead of username. Fixes bug https://bugs.launchpad.net/ubuntu/+source/indicator-me/+bug/682153

[Dustin Kirkland  (kirkland)]

Looks good to me! Sponsoring as today's patchpilot. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-22 18:35:49 +0000
+++ debian/changelog	2010-12-07 20:38:43 +0000
@@ -1,3 +1,9 @@
+indicator-me (0.2.10-0ubuntu2) natty; urgency=low
+
+  * Show real name instead of username (LP: #682153) 
+
+ -- Manuel J. Garrido <[e-mail]>  Tue, 07 Dec 2010 20:37:55 +0100
+
 indicator-me (0.2.10-0ubuntu1) maverick; urgency=low
 
   * New upstream release
 
=== modified file 'src/me-service.c'
--- src/me-service.c	2010-09-16 12:00:28 +0000
+++ src/me-service.c	2010-12-07 20:38:43 +0000
@@ -322,7 +322,7 @@
   g_return_if_fail (context != NULL);
 
   GConfValue *option = gconf_client_get (context, GCONF_DISPLAY, NULL);
-  gint value = 1; /* username, by default */
+  gint value = 2; /* real name, by default */
 
   g_debug ("display_mode_changed");