comparison: pidgin/gtkaccount.c
pidgin/gtkaccount.c
- changeset 17858
- 14d53a1be2ee
- parent 17484
- 9e134e98b42c
- parent 17855
- 0a00914d5c5a
- child 17873
- d45997872d54
equal
deleted
inserted
replaced
| 17488:b3d3b6442306 | 17858:14d53a1be2ee |
|---|---|
| 475 l != NULL && l2 != NULL; | 475 l != NULL && l2 != NULL; |
| 476 l = l->prev, l2 = l2->prev) { | 476 l = l->prev, l2 = l2->prev) { |
| 477 | 477 |
| 478 GtkWidget *entry = l->data; | 478 GtkWidget *entry = l->data; |
| 479 PurpleAccountUserSplit *split = l2->data; | 479 PurpleAccountUserSplit *split = l2->data; |
| 480 const char *value = NULL, *protocol = NULL; | 480 const char *value = NULL; |
| 481 char *c; | 481 char *c; |
| 482 | 482 |
| 483 if (dialog->account != NULL) { | 483 if (dialog->account != NULL) { |
| 484 c = strrchr(username, | 484 c = strrchr(username, |
| 485 purple_account_user_split_get_separator(split)); | 485 purple_account_user_split_get_separator(split)); |
| 495 value = purple_account_user_split_get_default_value(split); | 495 value = purple_account_user_split_get_default_value(split); |
| 496 | 496 |
| 497 /* Google Talk default domain hackery! */ | 497 /* Google Talk default domain hackery! */ |
| 498 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); | 498 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); |
| 499 item = gtk_menu_get_active(GTK_MENU(menu)); | 499 item = gtk_menu_get_active(GTK_MENU(menu)); |
| 500 protocol = g_object_get_data(G_OBJECT(item), "protocol"); | 500 if (value == NULL && g_object_get_data(G_OBJECT(item), "fake") && |
| 501 if (value == NULL && protocol != NULL && !strcmp(protocol, "prpl-fake") && | 501 !strcmp(purple_account_user_split_get_text(split), _("Domain"))) |
| 502 !strcmp(purple_account_user_split_get_text(split), _("Domain"))) | |
| 503 value = "gmail.com"; | 502 value = "gmail.com"; |
| 504 | 503 |
| 505 if (value != NULL) | 504 if (value != NULL) |
| 506 gtk_entry_set_text(GTK_ENTRY(entry), value); | 505 gtk_entry_set_text(GTK_ENTRY(entry), value); |
| 507 } | 506 } |
| 698 GtkCellRenderer *renderer; | 697 GtkCellRenderer *renderer; |
| 699 PurpleKeyValuePair *kvp; | 698 PurpleKeyValuePair *kvp; |
| 700 GList *l; | 699 GList *l; |
| 701 char buf[1024]; | 700 char buf[1024]; |
| 702 char *title; | 701 char *title; |
| 703 const char *str_value, *protocol; | 702 const char *str_value; |
| 704 gboolean bool_value; | 703 gboolean bool_value; |
| 705 | 704 |
| 706 if (dialog->protocol_frame != NULL) { | 705 if (dialog->protocol_frame != NULL) { |
| 707 gtk_widget_destroy(dialog->protocol_frame); | 706 gtk_widget_destroy(dialog->protocol_frame); |
| 708 dialog->protocol_frame = NULL; | 707 dialog->protocol_frame = NULL; |
| 824 } | 823 } |
| 825 | 824 |
| 826 /* Google Talk default domain hackery! */ | 825 /* Google Talk default domain hackery! */ |
| 827 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); | 826 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); |
| 828 item = gtk_menu_get_active(GTK_MENU(menu)); | 827 item = gtk_menu_get_active(GTK_MENU(menu)); |
| 829 protocol = g_object_get_data(G_OBJECT(item), "protocol"); | 828 if (str_value == NULL && g_object_get_data(G_OBJECT(item), "fake") && |
| 830 if (str_value == NULL && protocol != NULL && !strcmp(protocol, "prpl-fake") && | |
| 831 !strcmp(_("Connect server"), purple_account_option_get_text(option))) | 829 !strcmp(_("Connect server"), purple_account_option_get_text(option))) |
| 832 str_value = "talk.google.com"; | 830 str_value = "talk.google.com"; |
| 833 | 831 |
| 834 if (str_value != NULL) | 832 if (str_value != NULL) |
| 835 gtk_entry_set_text(GTK_ENTRY(entry), str_value); | 833 gtk_entry_set_text(GTK_ENTRY(entry), str_value); |
| 836 | 834 |
| 837 title = g_strdup_printf("%s:", | 835 title = g_strdup_printf("%s:", |
| 1462 } | 1460 } |
| 1463 | 1461 |
| 1464 if ((dialog->plugin = purple_find_prpl(dialog->protocol_id)) != NULL) | 1462 if ((dialog->plugin = purple_find_prpl(dialog->protocol_id)) != NULL) |
| 1465 dialog->prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(dialog->plugin); | 1463 dialog->prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(dialog->plugin); |
| 1466 | 1464 |
| 1467 | |
| 1468 dialog->window = win = gtk_window_new(GTK_WINDOW_TOPLEVEL); | 1465 dialog->window = win = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
| 1469 gtk_window_set_role(GTK_WINDOW(win), "account"); | 1466 gtk_window_set_role(GTK_WINDOW(win), "account"); |
| 1470 | 1467 |
| 1471 if (type == PIDGIN_ADD_ACCOUNT_DIALOG) | 1468 if (type == PIDGIN_ADD_ACCOUNT_DIALOG) |
| 1472 gtk_window_set_title(GTK_WINDOW(win), _("Add Account")); | 1469 gtk_window_set_title(GTK_WINDOW(win), _("Add Account")); |
