--- a/guard-xmpp-password	Sun Jul 17 23:05:54 2011 +0300
+++ b/guard-xmpp-password	Sun Jul 17 23:27:33 2011 +0300
@@ -1,7 +1,7 @@
-diff -r 0142406a60e3 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Sun Mar 27 19:13:23 2011 +0200
-+++ b/mcabber/mcabber/commands.c	Sun Mar 27 19:13:27 2011 +0200
-@@ -2193,10 +2193,8 @@
+diff -r 430cdecabdf2 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c	Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/mcabber/commands.c	Sun Jul 17 23:26:32 2011 +0300
+@@ -2194,10 +2194,8 @@
  
  static void list_option_cb(char *k, char *v, void *f)
  {
@@ -14,10 +14,10 @@
  }
  
  static void do_set(char *arg)
-diff -r 0142406a60e3 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Sun Mar 27 19:13:23 2011 +0200
-+++ b/mcabber/mcabber/main.c	Sun Mar 27 19:13:27 2011 +0200
-@@ -380,6 +380,7 @@
+diff -r 430cdecabdf2 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/mcabber/main.c	Sun Jul 17 23:26:32 2011 +0300
+@@ -381,6 +381,7 @@
    scr_init_locale_charset();
    ut_init_debug();
    help_init();
@@ -25,7 +25,7 @@
  
    /* Parsing config file... */
    ret = cfg_read_file(configFile, TRUE);
-@@ -416,8 +417,9 @@
+@@ -417,8 +418,9 @@
  
    /* If no password is stored, we ask for it before entering
       ncurses mode -- unless the username is unknown. */
@@ -36,9 +36,9 @@
      settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
      g_free(pwd);
    }
-diff -r 0142406a60e3 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c	Sun Mar 27 19:13:23 2011 +0200
-+++ b/mcabber/mcabber/xmpp.c	Sun Mar 27 19:13:27 2011 +0200
+diff -r 430cdecabdf2 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c	Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/mcabber/xmpp.c	Sun Jul 17 23:26:32 2011 +0300
 @@ -23,6 +23,8 @@
   */
  #include <stdlib.h>
@@ -58,7 +58,7 @@
  char imstatus2char[imstatus_size+1] = {
      '_', 'o', 'f', 'd', 'n', 'a', 'i', '\0'
  };
-@@ -893,16 +898,15 @@
+@@ -887,16 +892,15 @@
    GError *error = NULL;
  
    if (success) {
@@ -77,7 +77,7 @@
                                      connection_auth_cb, NULL, FALSE, &error)) {
        scr_LogPrint(LPRINT_LOGNORM, "Failed to authenticate: %s",
                     error->message);
-@@ -1697,13 +1701,37 @@
+@@ -1699,13 +1703,37 @@
    }
  }
  
@@ -116,7 +116,7 @@
    char *dynresource = NULL;
    char fpr[16];
    const char *proxy_host;
-@@ -1720,7 +1748,6 @@
+@@ -1722,7 +1750,6 @@
  
    servername = settings_opt_get("server");
    userjid    = settings_opt_get("jid");
@@ -124,7 +124,7 @@
    resource   = settings_opt_get("resource");
    proxy_host = settings_opt_get("proxy_host");
    ssl_fpr    = settings_opt_get("ssl_fingerprint");
-@@ -1729,7 +1756,7 @@
+@@ -1731,7 +1758,7 @@
      scr_LogPrint(LPRINT_LOGNORM, "Your JID has not been specified!");
      return -1;
    }
@@ -133,9 +133,9 @@
      scr_LogPrint(LPRINT_LOGNORM, "Your password has not been specified!");
      return -1;
    }
-diff -r 0142406a60e3 mcabber/mcabber/xmpp.h
---- a/mcabber/mcabber/xmpp.h	Sun Mar 27 19:13:23 2011 +0200
-+++ b/mcabber/mcabber/xmpp.h	Sun Mar 27 19:13:27 2011 +0200
+diff -r 430cdecabdf2 mcabber/mcabber/xmpp.h
+--- a/mcabber/mcabber/xmpp.h	Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/mcabber/xmpp.h	Sun Jul 17 23:26:32 2011 +0300
 @@ -33,7 +33,9 @@
  
  extern LmConnection* lconnection;