cpw.qulogic.gtk3: 79c9bec9: Fix merge problem.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 79c9bec98bc26569dd1b6b63db4361ec98ce8628
Parent:   3e8fc66ec7cd7e398270e8c598d26b65cfc9119f
Author:   qulogic at pidgin.im
Date:     10/08/11 17:24:14
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/79c9bec98bc26569dd1b6b63db4361ec98ce8628

Changelog: 

Fix merge problem.

Changes against parent 3e8fc66ec7cd7e398270e8c598d26b65cfc9119f

  patched  pidgin/gtkaccount.c

-------------- next part --------------
============================================================
--- pidgin/gtkaccount.c	7e4d52a003c7a95da4f993c14109a8bdea609b67
+++ pidgin/gtkaccount.c	e5b729bd377b0164ab0495fefad9b182db22be3f
@@ -595,9 +595,6 @@ add_login_options(AccountPrefsDialog *di
 		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 @@ pidgin_account_uninit(void)
 
 	purple_signals_disconnect_by_handle(pidgin_account_get_handle());
 	purple_signals_unregister_by_instance(pidgin_account_get_handle());
-}
\ No newline at end of file
+}
+