# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1318109054 0
# Node ID 8f2715fc36dbd3ae7f6db4dae710da2c92e624cb
# Parent  787609e41f20009edd5940f9848f76740708d157
Fix merge problem.

diff -r 787609e41f20 -r 8f2715fc36db pidgin/gtkaccount.c
--- 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
+}
+