--- a/guard-xmpp-password.diff	Wed May 15 13:32:42 2013 +0300
+++ b/guard-xmpp-password.diff	Wed Nov 12 23:04:36 2014 +0200
@@ -4,10 +4,10 @@
     restricted data, better store restricted data somewhere else
   * add xmpp_init() and xmpp_have_password (non-api)
 
-diff -r ce54b748207b mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Thu Oct 18 13:43:12 2012 +0300
-+++ b/mcabber/mcabber/commands.c	Thu Oct 18 13:43:18 2012 +0300
-@@ -2274,10 +2274,8 @@
+diff -r d5d7361a99c0 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c	Tue Nov 11 21:10:14 2014 +0200
++++ b/mcabber/mcabber/commands.c	Tue Nov 11 21:12:47 2014 +0200
+@@ -2286,10 +2286,8 @@
  
  static void list_option_cb(char *k, char *v, void *f)
  {
@@ -20,10 +20,10 @@
  }
  
  static void do_set(char *arg)
-diff -r ce54b748207b mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Thu Oct 18 13:43:12 2012 +0300
-+++ b/mcabber/mcabber/main.c	Thu Oct 18 13:43:18 2012 +0300
-@@ -381,6 +381,7 @@
+diff -r d5d7361a99c0 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Tue Nov 11 21:10:14 2014 +0200
++++ b/mcabber/mcabber/main.c	Tue Nov 11 21:12:47 2014 +0200
+@@ -389,6 +389,7 @@
    scr_init_locale_charset();
    ut_init_debug();
    help_init();
@@ -31,7 +31,7 @@
  
    /* Parsing config file... */
    ret = cfg_read_file(configFile, TRUE);
-@@ -417,8 +418,9 @@
+@@ -410,8 +411,9 @@
  
    /* If no password is stored, we ask for it before entering
       ncurses mode -- unless the username is unknown. */
@@ -42,9 +42,9 @@
      settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
      g_free(pwd);
    }
-diff -r ce54b748207b mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c	Thu Oct 18 13:43:12 2012 +0300
-+++ b/mcabber/mcabber/xmpp.c	Thu Oct 18 13:43:18 2012 +0300
+diff -r d5d7361a99c0 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c	Tue Nov 11 21:10:14 2014 +0200
++++ b/mcabber/mcabber/xmpp.c	Tue Nov 11 21:12:47 2014 +0200
 @@ -23,6 +23,8 @@
   */
  #include <stdlib.h>
@@ -54,7 +54,7 @@
  
  #include "xmpp.h"
  #include "xmpp_helper.h"
-@@ -53,6 +55,9 @@
+@@ -54,6 +56,9 @@
  static enum imstatus mywantedstatus = available;
  gchar *mystatusmsg;
  
@@ -64,7 +64,7 @@
  char imstatus2char[imstatus_size+1] = {
      '_', 'o', 'f', 'd', 'n', 'a', 'i', '\0'
  };
-@@ -891,16 +896,15 @@
+@@ -778,16 +783,15 @@
    GError *error = NULL;
  
    if (success) {
@@ -83,7 +83,7 @@
                                      connection_auth_cb, NULL, FALSE, &error)) {
        scr_LogPrint(LPRINT_LOGNORM, "Failed to authenticate: %s",
                     error->message);
-@@ -1783,13 +1787,37 @@
+@@ -1687,13 +1691,37 @@
    }
  }
  
@@ -122,15 +122,15 @@
    char *dynresource = NULL;
    char fpr[16];
    const char *proxy_host;
-@@ -1806,7 +1834,6 @@
+@@ -1710,7 +1738,6 @@
  
-   servername = settings_opt_get("server");
-   userjid    = settings_opt_get("jid");
--  password   = settings_opt_get("password");
-   resource   = settings_opt_get("resource");
-   proxy_host = settings_opt_get("proxy_host");
-   ssl_fpr    = settings_opt_get("ssl_fingerprint");
-@@ -1815,7 +1842,7 @@
+   servername  = settings_opt_get("server");
+   userjid     = settings_opt_get("jid");
+-  password    = settings_opt_get("password");
+   resource    = settings_opt_get("resource");
+   proxy_host  = settings_opt_get("proxy_host");
+   ssl_fpr     = settings_opt_get("ssl_fingerprint");
+@@ -1719,7 +1746,7 @@
      scr_LogPrint(LPRINT_LOGNORM, "Your JID has not been specified!");
      return -1;
    }
@@ -139,10 +139,10 @@
      scr_LogPrint(LPRINT_LOGNORM, "Your password has not been specified!");
      return -1;
    }
-diff -r ce54b748207b mcabber/mcabber/xmpp.h
---- a/mcabber/mcabber/xmpp.h	Thu Oct 18 13:43:12 2012 +0300
-+++ b/mcabber/mcabber/xmpp.h	Thu Oct 18 13:43:18 2012 +0300
-@@ -33,7 +33,9 @@
+diff -r d5d7361a99c0 mcabber/mcabber/xmpp.h
+--- a/mcabber/mcabber/xmpp.h	Tue Nov 11 21:10:14 2014 +0200
++++ b/mcabber/mcabber/xmpp.h	Tue Nov 11 21:12:47 2014 +0200
+@@ -34,7 +34,9 @@
  
  extern LmConnection* lconnection;
  extern LmSSL* lssl;