# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1271271691 -7200
# Node ID 5dc0fd8225e32cd510d04561040632f04e56e056
# Parent  decf94827efec14c341b4b06fdc3b7f556fcb58b
Display a warning when the configuration file hasn't been updated
Display a message when the jid is missing and the 'username' option is
still set in the configuration file.

diff -r decf94827efe -r 5dc0fd8225e3 mcabber/mcabber/main.c
--- a/mcabber/mcabber/main.c	Mon Apr 12 23:40:14 2010 +0200
+++ b/mcabber/mcabber/main.c	Wed Apr 14 21:01:31 2010 +0200
@@ -384,8 +384,16 @@
     const char *p;
     if ((p = settings_opt_get("server")) != NULL)
       scr_log_print(LPRINT_NORMAL, "Server: %s", p);
-    if ((p = settings_opt_get("jid")) != NULL)
+    if ((p = settings_opt_get("jid")) != NULL) {
       scr_log_print(LPRINT_NORMAL, "User JID: %s", p);
+    } else if (settings_opt_get("username")) {
+      /* TODO: remove after 0.10.1/2 */
+      scr_log_print(LPRINT_NORMAL, "** ERROR: The JID is missing, but "
+                    "the variable 'username' is defined in your "
+                    "configuration file.\n"
+                    "** Please update your configuration file and set "
+                    "the 'jid' variable.");
+    }
   }
 
   /* If no password is stored, we ask for it before entering