Mercurial Mercurial > mcabber-isbear-patches / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch-to-experimental.diff
author Myhailo Danylenko <isbear@ukrpost.net>
Sat, 28 Jul 2012 22:38:18 +0300
changeset 37 fbbcfc54d4d3
parent 36 b8854e2fe147
child 38 dfd761c2ef62
permissions -rw-r--r--
Push bugfix patches to upstream
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
29
335662766a88 Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents: 26
diff changeset 
     1
 
[local] Switch to experimental branch and api version
335662766a88 Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents: 26
diff changeset 
     2
 







26






65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




     3


diff -r bd387d7410d0 mcabber/ChangeLog.api












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




     4


--- a/mcabber/ChangeLog.api	Mon Apr 30 23:21:22 2012 +0300












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




     5


+++ b/mcabber/ChangeLog.api	Mon Apr 30 23:36:31 2012 +0300












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




     6


@@ -1,3 +1,13 @@












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




     7


+












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




     8


+experimental (35)







0






633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




     9


+












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    10


+ * Change branch to "experimental".







26






65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    11


+ * Api as defined by dev:23







10






6327de0a7587
Add MCABBER_BRANCH_EXPERIMENTAL



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
4

diff
changeset




    12


+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h







0






633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    13


+ * MQ Patch: switch-to-experimental












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    14


+







26






65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    15


+  -- Myhailo Danylenko, 2012-04-30












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    16


+












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    17


 dev (23)












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    18


  * Changeset 8dc418af3e72












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    19


    Add buddy_(get|set)activeresource() functions












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    20


@@ -16,6 +26,12 @@












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    21


 












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    22


   -- Hermitifier, 2011-10-03












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    23


 












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    24


+experimental (34)












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    25


+












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    26


+ * Api as defined by dev:20












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    27


+












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    28


+  -- Myhailo Danylenko, 2011-06-01







0






633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    29


+







19






300fb879c393
Fix api defines and changelog



Mikael Berthe <mikael@lilotux.net>


parents: 
18

diff
changeset




    30


 dev (20)







0






633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    31


 







19






300fb879c393
Fix api defines and changelog



Mikael Berthe <mikael@lilotux.net>


parents: 
18

diff
changeset




    32


  * Add cmd_set_safe() and cmd_is_safe()







26






65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    33


diff -r bd387d7410d0 mcabber/configure.ac












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    34


--- a/mcabber/configure.ac	Mon Apr 30 23:21:22 2012 +0300












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    35


+++ b/mcabber/configure.ac	Mon Apr 30 23:36:31 2012 +0300







4






63ff8383721a
Rebase to newer mcabber api



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
0

diff
changeset




    36


@@ -272,7 +272,7 @@







0






633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    37


 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    38


 












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    39


 # Prepare some config.h variables












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    40


-AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    41


+AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch])












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    42


 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    43


 












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    44


 # We need _GNU_SOURCE for strptime() and strcasestr()







26






65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    45


diff -r bd387d7410d0 mcabber/mcabber/api.h












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    46


--- a/mcabber/mcabber/api.h	Mon Apr 30 23:21:22 2012 +0300












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    47


+++ b/mcabber/mcabber/api.h	Mon Apr 30 23:36:31 2012 +0300







19






300fb879c393
Fix api defines and changelog



Mikael Berthe <mikael@lilotux.net>


parents: 
18

diff
changeset




    48


@@ -3,10 +3,10 @@







4






63ff8383721a
Rebase to newer mcabber api



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
0

diff
changeset




    49


 







0






633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    50


 #include <mcabber/config.h> // For MCABBER_BRANCH












633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    51


 







26






65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    52


-#define MCABBER_API_VERSION 23












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    53


-#define MCABBER_API_MIN     21












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    54


+#define MCABBER_API_VERSION 35












65d81aec6691
Resync to mainstream, drop extend-caps



Myhailo Danylenko <isbear@ukrpost.net>


parents: 
24

diff
changeset




    55


+#define MCABBER_API_MIN     35







0






633272cbb544
Initial experimental branch commit



Myhailo Danylenko <isbear@ukrpost.net>


parents: 

diff
changeset




    56


 







19






300fb879c393
Fix api defines and changelog



Mikael Berthe <mikael@lilotux.net>


parents: 
18

diff
changeset




    57


-#define MCABBER_BRANCH_DEV  1












300fb879c393
Fix api defines and changelog



Mikael Berthe <mikael@lilotux.net>


parents: 
18

diff
changeset




    58


+#define MCABBER_BRANCH_EXPERIMENTAL 1












300fb879c393
Fix api defines and changelog



Mikael Berthe <mikael@lilotux.net>


parents: 
18

diff
changeset




    59


 







20






cb4d4d9e5d3d
Refresh patch queue



Mikael Berthe <mikael@lilotux.net>


parents: 
19

diff
changeset




    60


 #define MCABBER_API_HAVE_CMD_ID 1












cb4d4d9e5d3d
Refresh patch queue



Mikael Berthe <mikael@lilotux.net>


parents: 
19

diff
changeset




    61


 














mcabber-isbear-patches