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
author Myhailo Danylenko <isbear@ukrpost.net>
Sun, 04 Apr 2010 01:33:42 +0300
changeset 4 63ff8383721a
parent 0 633272cbb544
child 10 6327de0a7587
permissions -rw-r--r--
Rebase to newer mcabber api * Api versions shift: dev:12, 12, 13, 14 -> dev:13, 15, 16, 17
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
     1
 
diff -r fdb2f88b908b mcabber/ChangeLog.api
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
     2
 
--- a/mcabber/ChangeLog.api	Sun Apr 04 00:15:53 2010 +0200
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
     3
 
+++ b/mcabber/ChangeLog.api	Sun Apr 04 01:22:16 2010 +0300
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
     4
 
@@ -1,3 +1,11 @@
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
     5
 
+experimental (15)
0
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
     6
 
+
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
     7
 
+ * Change branch to "experimental".
4
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
     8
 
+ * Api as defined by dev:13
0
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
     9
 
+ * MQ Patch: switch-to-experimental
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    10
 
+
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    11
 
+  -- Myhailo Danylenko, 2010-04-01
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    12
 
+
4
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    13
 
 dev (13)
0
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    14
4
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    15
 
  * Rename jep00{22,85} to xep00{22,85}
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    16
 
diff -r fdb2f88b908b mcabber/configure.ac
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    17
 
--- a/mcabber/configure.ac	Sun Apr 04 00:15:53 2010 +0200
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    18
 
+++ b/mcabber/configure.ac	Sun Apr 04 01:22:16 2010 +0300
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    19
 
@@ -272,7 +272,7 @@
0
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    20
 
 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    21
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    22
 
 # Prepare some config.h variables
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    23
 
-AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    24
 
+AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch])
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    25
 
 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    26
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    27
 
 # We need _GNU_SOURCE for strptime() and strcasestr()
4
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    28
 
diff -r fdb2f88b908b mcabber/mcabber/api.h
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    29
 
--- a/mcabber/mcabber/api.h	Sun Apr 04 00:15:53 2010 +0200
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    30
 
+++ b/mcabber/mcabber/api.h	Sun Apr 04 01:22:16 2010 +0300
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    31
 
@@ -3,8 +3,8 @@
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    32
0
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    33
 
 #include <mcabber/config.h> // For MCABBER_BRANCH
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    34
4
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    35
 
-#define MCABBER_API_VERSION 13
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    36
 
-#define MCABBER_API_MIN     13
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    37
 
+#define MCABBER_API_VERSION 15
63ff8383721a Rebase to newer mcabber api
Myhailo Danylenko <isbear@ukrpost.net>
parents: 0
diff changeset 
    38
 
+#define MCABBER_API_MIN     15
0
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    39
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    40
 
 extern const gchar *mcabber_branch;
633272cbb544 Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset 
    41
 
 extern const guint mcabber_api_version;
mcabber-isbear-patches