=== modified file 'tools/datamart/mydatamart.vfs/appinit.tcl'
--- tools/datamart/mydatamart.vfs/appinit.tcl	2011-08-05 12:31:11 +0000
+++ tools/datamart/mydatamart.vfs/appinit.tcl	2011-08-31 14:17:36 +0000
@@ -18,6 +18,9 @@
 set ::dhis(resource) [file join $starkit::topdir resource]
 set ::dhis(createQuery) [file join $::dhis(resource) sql/create.sql]
 
+# set 20s default login timeout
+set ::dhis(login_timeout) 20000
+
 # organize a place for temp stuff ...
 set tmpdir "/tmp"
 if { [info exists ::env(TMP)] } {

=== modified file 'tools/datamart/mydatamart.vfs/settings.tcl'
--- tools/datamart/mydatamart.vfs/settings.tcl	2011-08-02 19:21:56 +0000
+++ tools/datamart/mydatamart.vfs/settings.tcl	2011-08-31 14:17:36 +0000
@@ -47,7 +47,8 @@
 	-row $row -column 1 -padx 20 -pady 2 -sticky w
 
     grid [ttk::button $settingsFrame.login -text [mc "Login"] -command {
-	dhisweb::login $::dhis(url) $::dhis(username) $::dhis(password)
+	set ::dhis(status) "Logging in to $::dhis(url)"
+	dhisweb::login $::dhis(url) $::dhis(username) $::dhis(password) $::dhis(login_timeout)
 	persistLocal url $::dhis(url)
 	persistLocal username $::dhis(username)
     } ] -row $row -column 2 
@@ -176,6 +177,14 @@
 	    $::loginImage configure -image img::fail
 	    set ::dhis(status) [mc "Couldn't connect to host - check URL"]
 	}
+	TIMEOUT {
+	    $::loginImage configure -image img::fail
+	    set ::dhis(status) [mc "Timeout trying to login"]
+	}
+	default {
+	    $::loginImage configure -image img::fail
+	    set ::dhis(status) [mc "Login unknown status"]	    
+	}
     }
 }