[next] telepathy-glib: TP_VERSION_MIN_REQUIRED should be _TP_VERSION_CUR_STABLE by default

Xavier Claessens xclaesse at kemper.freedesktop.org
Wed May 9 13:10:46 PDT 2012


Module: telepathy-glib
Branch: next
Commit: 3c7d083ac43d42bafdc0b91d1c818a219acebb3d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=3c7d083ac43d42bafdc0b91d1c818a219acebb3d

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Tue May  8 16:17:12 2012 +0200

TP_VERSION_MIN_REQUIRED should be _TP_VERSION_CUR_STABLE by default

That was a bug in glib we copied.

---

 telepathy-glib/defs.h |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h
index 85677f4..ad243b2 100644
--- a/telepathy-glib/defs.h
+++ b/telepathy-glib/defs.h
@@ -160,33 +160,25 @@ G_BEGIN_DECLS
 #if (TP_MINOR_VERSION == 99)
   /* special case for telepathy-glib 1.0 prereleases */
 # define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1, 0))
-# define _TP_VERSION_PREV_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1, 0))
 #elif (TP_MINOR_VERSION == 0)
   /* special case for telepathy-glib 1.0 itself */
 # define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0))
-# define _TP_VERSION_PREV_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0))
 #elif (TP_MICRO_VERSION >= 99 && (TP_MINOR_VERSION % 2) == 0)
   /* development branch about to start (0.18.999.1) */
 # define _TP_VERSION_CUR_STABLE \
   (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION + 2))
-# define _TP_VERSION_PREV_STABLE \
-  (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION))
 #elif (TP_MINOR_VERSION % 2)
   /* development branch */
 # define _TP_VERSION_CUR_STABLE \
   (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION + 1))
-# define _TP_VERSION_PREV_STABLE \
-  (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION - 1))
 #else
   /* stable branch */
 # define _TP_VERSION_CUR_STABLE \
   (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION))
-# define _TP_VERSION_PREV_STABLE \
-  (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION - 2))
 #endif
 
 #ifndef TP_VERSION_MIN_REQUIRED
-# define TP_VERSION_MIN_REQUIRED (_TP_VERSION_PREV_STABLE)
+# define TP_VERSION_MIN_REQUIRED (_TP_VERSION_CUR_STABLE)
 #endif
 
 #ifndef TP_VERSION_MAX_ALLOWED



More information about the telepathy-commits mailing list