empathy r1601 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Oct 17 12:46:12 2008
New Revision: 1601
URL: http://svn.gnome.org/viewvc/empathy?rev=1601&view=rev

Log:
Name imported accounts in the same way as a new account does. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/src/empathy-import-dialog.c

Modified: trunk/src/empathy-import-dialog.c
==============================================================================
--- trunk/src/empathy-import-dialog.c	(original)
+++ trunk/src/empathy-import-dialog.c	Fri Oct 17 12:46:12 2008
@@ -143,12 +143,12 @@
 {
   McProfile *profile;
   McAccount *account;
-  const gchar *unique_name;
   gchar *key_char;
   GHashTableIter iter;
   gpointer key, value;
   EmpathyImportSetting *set;
-
+  gchar *display_name;
+  gchar *username;
 
   DEBUG ("Looking up profile with protocol '%s'", protocol_name);
   profile = mc_profile_lookup (protocol_name);
@@ -158,9 +158,6 @@
 
   account = mc_account_create (profile);
 
-  unique_name = mc_account_get_unique_name (account);
-  mc_account_set_display_name (account, unique_name);
-
   g_hash_table_iter_init (&iter, settings);
   while (g_hash_table_iter_next (&iter, &key, &value))
     {
@@ -190,6 +187,14 @@
             break;
         }
     }
+
+  mc_account_get_param_string (account, "account", &username);
+  display_name = g_strdup_printf ("%s (%s)", username,
+      mc_profile_get_display_name (profile));
+  mc_account_set_display_name (account, display_name);
+
+  g_free (username);
+  g_free (display_name);
   g_object_unref (account);
   g_object_unref (profile);
   return TRUE;