Mercurial > pidgin
changeset 32674:8f2715fc36db
Fix merge problem.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 08 Oct 2011 21:24:14 +0000 |
| parents | 787609e41f20 |
| children | 59b0cf585038 |
| files | pidgin/gtkaccount.c |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkaccount.c Sat Oct 08 21:13:43 2011 +0000 +++ b/pidgin/gtkaccount.c Sat Oct 08 21:24:14 2011 +0000 @@ -595,9 +595,6 @@ if (!strcmp(_("Domain"), purple_account_user_split_get_text(split)) && !value) value = google_talk_default_domain_hackery(dialog->protocol_menu, "gmail.com"); - if (!strcmp(_("Domain"), purple_account_user_split_get_text(split)) && !value) - value = - if (value != NULL) gtk_entry_set_text(GTK_ENTRY(entry), value); } @@ -2748,4 +2745,5 @@ purple_signals_disconnect_by_handle(pidgin_account_get_handle()); purple_signals_unregister_by_instance(pidgin_account_get_handle()); -} \ No newline at end of file +} +