Mercurial > pidgin
changeset 17224:977b9adc2757
merge of 'ccfb422853c34c69e2172bffd83d4c62bacca89c'
and 'ef3e4adbf5a904e6351d0122128e7d01e251545f'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 24 May 2007 19:47:51 +0000 |
| parents | 5d95cdb20ec4 (diff) 3cc729673b62 (current diff) |
| children | 0018ab54be9c |
| files | |
| diffstat | 1 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkaccount.c Thu May 24 19:03:37 2007 +0000 +++ b/pidgin/gtkaccount.c Thu May 24 19:47:51 2007 +0000 @@ -689,7 +689,7 @@ { PurpleAccountOption *option; PurpleAccount *account; - GtkWidget *frame, *vbox, *check, *entry, *combo; + GtkWidget *frame, *vbox, *check, *entry, *combo, *menu, *item; const GList *list, *node; gint i, idx, int_value; GtkListStore *model; @@ -699,7 +699,7 @@ GList *l; char buf[1024]; char *title; - const char *str_value; + const char *str_value, *protocol; gboolean bool_value; if (dialog->protocol_frame != NULL) { @@ -822,6 +822,14 @@ 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)); + protocol = g_object_get_data(G_OBJECT(item), "protocol"); + if (str_value == NULL && !strcmp(protocol, "prpl-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);