switch-to-experimental.diff
changeset 53 577410087c82
parent 52 887f44e99aa1
child 58 04cb7d38c438
equal deleted inserted replaced
52:887f44e99aa1 53:577410087c82
     1 [local] Switch to experimental branch and api version
     1 [local] Switch to experimental branch and api version
     2 
     2 
     3 diff -r 5f699ebd8af1 mcabber/ChangeLog.api
     3 diff -r 84ad372d8137 mcabber/ChangeLog.api
     4 --- a/mcabber/ChangeLog.api	Thu Oct 18 13:39:25 2012 +0300
     4 --- a/mcabber/ChangeLog.api	Thu Oct 18 21:48:49 2012 +0300
     5 +++ b/mcabber/ChangeLog.api	Thu Oct 18 13:43:08 2012 +0300
     5 +++ b/mcabber/ChangeLog.api	Thu Oct 18 21:48:54 2012 +0300
     6 @@ -1,9 +1,27 @@
     6 @@ -1,3 +1,12 @@
     7 +experimental (37)
     7 +experimental (37)
     8 +
     8 +
     9 + * Change branch to "experimental".
     9 + * Change branch to "experimental".
    10 + * Api as defined by dev:24
    10 + * Api as defined by dev:24
    11 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
    11 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
    13 +
    13 +
    14 +  -- Myhailo Danylenko, 2012-10-18
    14 +  -- Myhailo Danylenko, 2012-10-18
    15 +
    15 +
    16  dev (24)
    16  dev (24)
    17   * MQ patch completion-sorting.diff
    17   * MQ patch completion-sorting.diff
    18   * Add compl_set_flags() function
    18   * Change compl_add_category() to accept flags arg
       
    19 @@ -5,6 +14,15 @@
    19  
    20  
    20    -- Myhailo Danylenko, 2012-10-18
    21    -- Myhailo Danylenko, 2012-10-18
    21  
    22  
    22 +experimental (35)
    23 +experimental (35)
    23 +
    24 +
    29 +  -- Myhailo Danylenko, 2012-04-30
    30 +  -- Myhailo Danylenko, 2012-04-30
    30 +
    31 +
    31  dev (23)
    32  dev (23)
    32   * Changeset 8dc418af3e72
    33   * Changeset 8dc418af3e72
    33     Add buddy_(get|set)activeresource() functions
    34     Add buddy_(get|set)activeresource() functions
    34 @@ -22,6 +40,12 @@
    35 @@ -23,6 +41,12 @@
    35  
    36  
    36    -- Hermitifier, 2011-10-03
    37    -- Hermitifier, 2011-10-03
    37  
    38  
    38 +experimental (34)
    39 +experimental (34)
    39 +
    40 +
    42 +  -- Myhailo Danylenko, 2011-06-01
    43 +  -- Myhailo Danylenko, 2011-06-01
    43 +
    44 +
    44  dev (20)
    45  dev (20)
    45  
    46  
    46   * Add cmd_set_safe() and cmd_is_safe()
    47   * Add cmd_set_safe() and cmd_is_safe()
    47 diff -r 5f699ebd8af1 mcabber/configure.ac
    48 diff -r 84ad372d8137 mcabber/configure.ac
    48 --- a/mcabber/configure.ac	Thu Oct 18 13:39:25 2012 +0300
    49 --- a/mcabber/configure.ac	Thu Oct 18 21:48:49 2012 +0300
    49 +++ b/mcabber/configure.ac	Thu Oct 18 13:43:08 2012 +0300
    50 +++ b/mcabber/configure.ac	Thu Oct 18 21:48:54 2012 +0300
    50 @@ -272,7 +272,7 @@
    51 @@ -272,7 +272,7 @@
    51  AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
    52  AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
    52  
    53  
    53  # Prepare some config.h variables
    54  # Prepare some config.h variables
    54 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])
    55 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])
    55 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch])
    56 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch])
    56  AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
    57  AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
    57  
    58  
    58  # We need _GNU_SOURCE for strptime() and strcasestr()
    59  # We need _GNU_SOURCE for strptime() and strcasestr()
    59 diff -r 5f699ebd8af1 mcabber/mcabber/api.h
    60 diff -r 84ad372d8137 mcabber/mcabber/api.h
    60 --- a/mcabber/mcabber/api.h	Thu Oct 18 13:39:25 2012 +0300
    61 --- a/mcabber/mcabber/api.h	Thu Oct 18 21:48:49 2012 +0300
    61 +++ b/mcabber/mcabber/api.h	Thu Oct 18 13:43:08 2012 +0300
    62 +++ b/mcabber/mcabber/api.h	Thu Oct 18 21:48:54 2012 +0300
    62 @@ -3,10 +3,10 @@
    63 @@ -4,10 +4,10 @@
    63  
    64  #include <glib.h>
    64  #include <mcabber/config.h> // For MCABBER_BRANCH
    65  #include <mcabber/config.h> // For MCABBER_BRANCH
    65  
    66  
    66 -#define MCABBER_API_VERSION 24
    67 -#define MCABBER_API_VERSION 24
    67 -#define MCABBER_API_MIN     21
    68 -#define MCABBER_API_MIN     24
    68 +#define MCABBER_API_VERSION 37
    69 +#define MCABBER_API_VERSION 37
    69 +#define MCABBER_API_MIN     37
    70 +#define MCABBER_API_MIN     37
    70  
    71  
    71 -#define MCABBER_BRANCH_DEV  1
    72 -#define MCABBER_BRANCH_DEV  1
    72 +#define MCABBER_BRANCH_EXPERIMENTAL 1
    73 +#define MCABBER_BRANCH_EXPERIMENTAL 1
    73  
    74  
       
    75  // cmd_add returns gpointer id
    74  #define MCABBER_API_HAVE_CMD_ID 1
    76  #define MCABBER_API_HAVE_CMD_ID 1
    75  #define MCABBER_API_HAVE_COMPL_FLAGS 1