Mercurial Mercurial > mcabber-isbear-patches / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix typo in ChangeLog.api
authorMyhailo Danylenko <isbear@ukrpost.net>
Fri, 02 Apr 2010 10:02:50 +0300
changeset 2 f49ea66cdffb
parent 1 024f3a2dda3e
child 3 8d7ae371ab03
Fix typo in ChangeLog.api
direct-invite file | annotate | diff | comparison | revisions 
--- a/direct-invite	Fri Apr 02 02:48:52 2010 +0300
+++ b/direct-invite	Fri Apr 02 10:02:50 2010 +0300
@@ -1,18 +1,18 @@
-diff -r 0bfd182adcb7 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Fri Apr 02 01:52:18 2010 +0300
-+++ b/mcabber/ChangeLog.api	Fri Apr 02 02:20:08 2010 +0300
+diff -r 28e29ca86694 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Fri Apr 02 02:38:41 2010 +0300
++++ b/mcabber/ChangeLog.api	Fri Apr 02 10:02:21 2010 +0300
 @@ -1,3 +1,8 @@
 +
 +experimental (14)
 +
-+ * Add NS_X_CONFERENCE (derect invitation)
++ * Add NS_X_CONFERENCE (direct invitation)
 + * MQ Patch: direct-invite
  
  experimental (13)
  
-diff -r 0bfd182adcb7 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Fri Apr 02 01:52:18 2010 +0300
-+++ b/mcabber/mcabber/api.h	Fri Apr 02 02:20:08 2010 +0300
+diff -r 28e29ca86694 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Fri Apr 02 02:38:41 2010 +0300
++++ b/mcabber/mcabber/api.h	Fri Apr 02 10:02:21 2010 +0300
 @@ -3,7 +3,7 @@
  
  #include <mcabber/config.h> // For MCABBER_BRANCH
@@ -22,9 +22,9 @@
  #define MCABBER_API_MIN     12
  
  extern const gchar *mcabber_branch;
-diff -r 0bfd182adcb7 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c	Fri Apr 02 01:52:18 2010 +0300
-+++ b/mcabber/mcabber/xmpp.c	Fri Apr 02 02:20:08 2010 +0300
+diff -r 28e29ca86694 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c	Fri Apr 02 02:38:41 2010 +0300
++++ b/mcabber/mcabber/xmpp.c	Fri Apr 02 10:02:21 2010 +0300
 @@ -1290,6 +1290,18 @@
                                     "http://jabber.org/protocol/muc#user");
      if (x && !strcmp(x->name, "x"))
@@ -44,9 +44,9 @@
    }
  
    return LM_HANDLER_RESULT_REMOVE_MESSAGE;
-diff -r 0bfd182adcb7 mcabber/mcabber/xmpp_defines.h
---- a/mcabber/mcabber/xmpp_defines.h	Fri Apr 02 01:52:18 2010 +0300
-+++ b/mcabber/mcabber/xmpp_defines.h	Fri Apr 02 02:20:08 2010 +0300
+diff -r 28e29ca86694 mcabber/mcabber/xmpp_defines.h
+--- a/mcabber/mcabber/xmpp_defines.h	Fri Apr 02 02:38:41 2010 +0300
++++ b/mcabber/mcabber/xmpp_defines.h	Fri Apr 02 10:02:21 2010 +0300
 @@ -27,6 +27,8 @@
  #define NS_BROWSE    "jabber:iq:browse"
  #define NS_EVENT     "jabber:x:event"
@@ -56,9 +56,9 @@
  #define NS_SIGNED    "jabber:x:signed"
  #define NS_ENCRYPTED "jabber:x:encrypted"
  #define NS_GATEWAY   "jabber:iq:gateway"
-diff -r 0bfd182adcb7 mcabber/mcabber/xmpp_helper.c
---- a/mcabber/mcabber/xmpp_helper.c	Fri Apr 02 01:52:18 2010 +0300
-+++ b/mcabber/mcabber/xmpp_helper.c	Fri Apr 02 02:20:08 2010 +0300
+diff -r 28e29ca86694 mcabber/mcabber/xmpp_helper.c
+--- a/mcabber/mcabber/xmpp_helper.c	Fri Apr 02 02:38:41 2010 +0300
++++ b/mcabber/mcabber/xmpp_helper.c	Fri Apr 02 10:02:21 2010 +0300
 @@ -232,6 +232,7 @@
    caps_add_feature("", NS_PING);
    caps_add_feature("", NS_COMMANDS);
@@ -67,9 +67,9 @@
    if (!settings_opt_get_int("iq_last_disable") &&
        (!settings_opt_get_int("iq_last_disable_when_notavail") ||
         status != notavail))
-diff -r 0bfd182adcb7 mcabber/mcabber/xmpp_muc.c
---- a/mcabber/mcabber/xmpp_muc.c	Fri Apr 02 01:52:18 2010 +0300
-+++ b/mcabber/mcabber/xmpp_muc.c	Fri Apr 02 02:20:08 2010 +0300
+diff -r 28e29ca86694 mcabber/mcabber/xmpp_muc.c
+--- a/mcabber/mcabber/xmpp_muc.c	Fri Apr 02 02:38:41 2010 +0300
++++ b/mcabber/mcabber/xmpp_muc.c	Fri Apr 02 10:02:21 2010 +0300
 @@ -39,6 +39,8 @@
  extern enum imstatus mystatus;
  extern gchar *mystatusmsg;
@@ -173,9 +173,9 @@
    }
    // TODO
    // handle status code = 100 ( not anonymous )
-diff -r 0bfd182adcb7 mcabber/mcabber/xmpp_muc.h
---- a/mcabber/mcabber/xmpp_muc.h	Fri Apr 02 01:52:18 2010 +0300
-+++ b/mcabber/mcabber/xmpp_muc.h	Fri Apr 02 02:20:08 2010 +0300
+diff -r 28e29ca86694 mcabber/mcabber/xmpp_muc.h
+--- a/mcabber/mcabber/xmpp_muc.h	Fri Apr 02 02:38:41 2010 +0300
++++ b/mcabber/mcabber/xmpp_muc.h	Fri Apr 02 10:02:21 2010 +0300
 @@ -6,10 +6,14 @@
    char *from;
    char *passwd;
mcabber-isbear-patches