X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgtk%2Fmodest-ui-wizard.c;h=fbba2f96f9f1604d020df25a9ded83a864355d43;hb=00d67398f3e5d7d564c4cdf826ccfd1110728a75;hp=3edf494e3d1ac037075673f967a74f2770bf3ae3;hpb=6eb21a13a54773294a98603f0d11310b33f4ecda;p=modest

diff --git a/src/gtk/modest-ui-wizard.c b/src/gtk/modest-ui-wizard.c
index 3edf494..fbba2f9 100644
--- a/src/gtk/modest-ui-wizard.c
+++ b/src/gtk/modest-ui-wizard.c
@@ -1,6 +1,34 @@
-/* modest-ui-wizard.c */
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 
-/* insert (c)/licensing information) */
+/* modest-ui-wizard.c */
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -134,7 +162,7 @@ gchar *search_unused_account_or_identity_name(gpointer mgr, gchar *draft) {
 	tmpaccount_name=g_string_new("");
 	g_string_printf(tmpaccount_name, "%s", draft);
 	if(MODEST_IS_ACCOUNT_MGR(mgr)) {
-		for(counter=0; modest_account_mgr_server_account_exists(mgr, tmpaccount_name->str, NULL); counter++)
+		for(counter=0; modest_account_mgr_account_exists(mgr, tmpaccount_name->str, TRUE, NULL); counter++)
 			g_string_printf(tmpaccount_name, "%s%d", draft, counter);
 	}
 	else