diff options
| author | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2008-10-31 07:59:46 +0000 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2008-10-31 07:59:46 +0000 |
| commit | d3cc5bf24a5f759be9b7a83e12e8229196ca8e34 (patch) | |
| tree | 71a090201ae21d68b0825085fefebf9bc2748fb0 /pidgin/gtkaccount.c | |
| parent | 65a637da9cd60700ec178cde1ed3dd24e0695f46 (diff) | |
| parent | 7902d6c9d6e8608a7147949eaa1838206a3b14ea (diff) | |
| download | pidgin-sadrul.struct.hiding.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head 328a7b5211ba8112c8978d5b81f5e39bf2ce2596)sadrul.struct.hiding
to branch 'local.struct.hiding' (head ee0f2a4594bf5beb531faa4978a7a450903a6017)
Diffstat (limited to 'pidgin/gtkaccount.c')
| -rw-r--r-- | pidgin/gtkaccount.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c index 9fa275189b..c9c4866348 100644 --- a/pidgin/gtkaccount.c +++ b/pidgin/gtkaccount.c @@ -451,7 +451,8 @@ add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent) if (dialog->account != NULL) username = g_strdup(purple_account_get_username(dialog->account)); - if (!username && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(dialog->prpl_info, get_account_text_table)) { + if (!username && dialog->prpl_info + && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(dialog->prpl_info, get_account_text_table)) { GdkColor color = {0, 34952, 35466, 34181}; GHashTable *table; const char *label; @@ -724,7 +725,7 @@ add_protocol_options(AccountPrefsDialog *dialog, GtkWidget *parent) { PurpleAccountOption *option; PurpleAccount *account; - GtkWidget *frame, *vbox, *check, *entry, *combo, *menu, *item; + GtkWidget *frame, *vbox, *check, *entry, *combo; GList *list, *node; gint i, idx, int_value; GtkListStore *model; @@ -858,13 +859,6 @@ add_protocol_options(AccountPrefsDialog *dialog, GtkWidget *parent) gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR); } - /* Google Talk default domain hackery! */ - menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); - item = gtk_menu_get_active(GTK_MENU(menu)); - if (str_value == NULL && g_object_get_data(G_OBJECT(item), "fake") && - !strcmp(_("Connect server"), purple_account_option_get_text(option))) - str_value = "talk.google.com"; - if (str_value != NULL) gtk_entry_set_text(GTK_ENTRY(entry), str_value); |