← Back to branch summary

~bcurtiswx/ubuntu/precise/empathy/3.4.2.1-0ubuntu1

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-account-widget.c

Tags: upstream-2.23.6
Import upstream version 2.23.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-account-widget.c
60
60
                gtk_entry_set_text (GTK_ENTRY (widget), value ? value : "");
61
61
                g_free (value);
62
62
        } else {
 
63
                McProfile   *profile;
 
64
                const gchar *domain = NULL;
 
65
                gchar       *dup_str = NULL;
 
66
 
 
67
                profile = mc_account_get_profile (account);
 
68
                if (mc_profile_get_capabilities (profile) &
 
69
                    MC_PROFILE_CAPABILITY_SPLIT_ACCOUNT) {
 
70
                        domain = mc_profile_get_default_account_domain (profile);
 
71
                }
 
72
 
 
73
                if (domain && !strstr (str, "@") &&
 
74
                    strcmp (param_name, "account") == 0) {
 
75
                        DEBUG ("Adding @%s suffix to account", domain);
 
76
                        str = dup_str = g_strconcat (str, "@", domain, NULL);
 
77
                        gtk_entry_set_text (GTK_ENTRY (widget), str);
 
78
                }
63
79
                DEBUG ("Setting %s to %s", param_name,
64
80
                        strstr (param_name, "password") ? "***" : str);
65
81
                mc_account_set_param_string (account, param_name, str);
 
82
                g_free (dup_str);
 
83
                g_object_unref (profile);
66
84
        }
67
85
 
68
86
        return FALSE;
675
693
                        "entry_id", "account",
676
694
                        "entry_password", "password",
677
695
                        "entry_server", "server",
678
 
                        "entry_serverjp", "serverjp",
679
696
                        "entry_locale", "room-list-locale",
680
697
                        "entry_charset", "charset",
681
698
                        "spinbutton_port", "port",