--- xgnokii_lowlevel.c~	Tue Aug 27 14:31:11 2002
+++ xgnokii_lowlevel.c	Tue Aug 27 14:31:11 2002
@@ -249,11 +249,9 @@
 	}
 
 	/* Initialise the code for the GSM interface. */
-
-	if (error == GE_NOLINK)
-		error = gn_gsm_initialise(xgnokiiConfig.model, xgnokiiConfig.port,
-					  xgnokiiConfig.initlength, connection, RLP_DisplayF96Frame,
-					  &statemachine);
+	error = gn_gsm_initialise(xgnokiiConfig.model, xgnokiiConfig.port,
+				  xgnokiiConfig.initlength, connection, RLP_DisplayF96Frame,
+				  &statemachine);
 
 #ifdef XDEBUG
 	g_print("fbusinit: error %d\n", error);
@@ -1133,8 +1131,13 @@
 #endif
 
 	phoneMonitor.working = _("Connecting...");
-	while (fbusinit(true) != GE_NONE)
-		sleep(1);
+	if (fbusinit(true) != GE_NONE) {
+#ifdef XDEBUG
+		g_printf("Initialization failed...\n");
+#endif
+		/* FIXME: Add some popup */
+		return;
+	}
 
 #ifdef XDEBUG
 	g_print("Phone connected. Starting monitoring...\n");