--- a/guard-xmpp-password.diff	Sat Jul 28 22:38:18 2012 +0300
+++ b/guard-xmpp-password.diff	Wed Aug 01 00:22:13 2012 +0300
@@ -4,10 +4,10 @@
     restricted data, better store restricted data somewhere else
   * add xmpp_init() and xmpp_have_password (non-api)
 
-diff -r c290165bc534 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Mon Apr 30 23:37:25 2012 +0300
-+++ b/mcabber/mcabber/commands.c	Mon Apr 30 23:38:20 2012 +0300
-@@ -2272,10 +2272,8 @@
+diff -r f383a4ded11f mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c	Wed Aug 01 00:02:59 2012 +0300
++++ b/mcabber/mcabber/commands.c	Wed Aug 01 00:03:06 2012 +0300
+@@ -2275,10 +2275,8 @@
  
  static void list_option_cb(char *k, char *v, void *f)
  {
@@ -20,9 +20,9 @@
  }
  
  static void do_set(char *arg)
-diff -r c290165bc534 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Mon Apr 30 23:37:25 2012 +0300
-+++ b/mcabber/mcabber/main.c	Mon Apr 30 23:38:20 2012 +0300
+diff -r f383a4ded11f mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Wed Aug 01 00:02:59 2012 +0300
++++ b/mcabber/mcabber/main.c	Wed Aug 01 00:03:06 2012 +0300
 @@ -381,6 +381,7 @@
    scr_init_locale_charset();
    ut_init_debug();
@@ -42,9 +42,9 @@
      settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
      g_free(pwd);
    }
-diff -r c290165bc534 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c	Mon Apr 30 23:37:25 2012 +0300
-+++ b/mcabber/mcabber/xmpp.c	Mon Apr 30 23:38:20 2012 +0300
+diff -r f383a4ded11f mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c	Wed Aug 01 00:02:59 2012 +0300
++++ b/mcabber/mcabber/xmpp.c	Wed Aug 01 00:03:06 2012 +0300
 @@ -23,6 +23,8 @@
   */
  #include <stdlib.h>
@@ -139,9 +139,9 @@
      scr_LogPrint(LPRINT_LOGNORM, "Your password has not been specified!");
      return -1;
    }
-diff -r c290165bc534 mcabber/mcabber/xmpp.h
---- a/mcabber/mcabber/xmpp.h	Mon Apr 30 23:37:25 2012 +0300
-+++ b/mcabber/mcabber/xmpp.h	Mon Apr 30 23:38:20 2012 +0300
+diff -r f383a4ded11f mcabber/mcabber/xmpp.h
+--- a/mcabber/mcabber/xmpp.h	Wed Aug 01 00:02:59 2012 +0300
++++ b/mcabber/mcabber/xmpp.h	Wed Aug 01 00:03:06 2012 +0300
 @@ -33,7 +33,9 @@
  
  extern LmConnection* lconnection;
@@ -150,5 +150,5 @@
  
 +void xmpp_init(void); /* private */
  int  xmpp_connect(void);
- void xmpp_disconnect(void);
+ void xmpp_disconnect(const char *message);
  gboolean xmpp_is_online(void);