Codebase list telepathy-idle / 7e6b375
drop patch backporting Idle to telepathy-glib 0.18, no longer needed Simon McVittie 10 years ago
3 changed file(s) with 1 addition(s) and 71 deletion(s). Raw diff Collapse all Expand all
+1
-0
debian/changelog less more
11
22 * New upstream release
33 - update dependencies
4 - drop patch backporting Idle to telepathy-glib 0.18, no longer needed
45 * Remove obsolete Debian-specific man page, superseded upstream
56 * Remove update-patches.mk and README.source: this is now a perfectly
67 ordinary git-buildpackage + quilt package (and gbp-pq can be used to
+0
-70
debian/patches/0001-Don-t-use-telepathy-glib-dbus.h-with-older-telepathy.patch less more
0 From: Simon McVittie <smcv@debian.org>
1 Date: Wed, 1 May 2013 16:08:54 +0100
2 Subject: Don't use telepathy-glib-dbus.h with older telepathy-glib
3
4 Forwarded: no, this is horrible. Upstream we should just depend on 0.20.
5 ---
6 src/server-tls-channel.c | 9 ++++++++-
7 src/server-tls-manager.c | 8 +++++++-
8 src/tls-certificate.c | 9 ++++++++-
9 3 files changed, 23 insertions(+), 3 deletions(-)
10
11 diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
12 index aa2ef62..ad3de5e 100644
13 --- a/src/server-tls-channel.c
14 +++ b/src/server-tls-channel.c
15 @@ -24,7 +24,14 @@
16
17 #include <gio/gio.h>
18 #include <telepathy-glib/telepathy-glib.h>
19 -#include <telepathy-glib/telepathy-glib-dbus.h>
20 +
21 +#if TP_MAJOR_VERSION > 0 || TP_MINOR_VERSION >= 20
22 +# include <telepathy-glib/telepathy-glib-dbus.h>
23 +#else
24 +# include <telepathy-glib/gtypes.h>
25 +# include <telepathy-glib/interfaces.h>
26 +# include <telepathy-glib/svc-channel.h>
27 +#endif
28
29 #define IDLE_DEBUG_FLAG IDLE_DEBUG_TLS
30 #include "idle-debug.h"
31 diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c
32 index b14cecd..efe55e4 100644
33 --- a/src/server-tls-manager.c
34 +++ b/src/server-tls-manager.c
35 @@ -22,7 +22,13 @@
36 #include "server-tls-manager.h"
37
38 #include <telepathy-glib/telepathy-glib.h>
39 -#include <telepathy-glib/telepathy-glib-dbus.h>
40 +
41 +#if TP_MAJOR_VERSION > 0 || TP_MINOR_VERSION >= 20
42 +# include <telepathy-glib/telepathy-glib-dbus.h>
43 +#else
44 +# include <telepathy-glib/gtypes.h>
45 +# include <telepathy-glib/interfaces.h>
46 +#endif
47
48 #define IDLE_DEBUG_FLAG IDLE_DEBUG_TLS
49 #include "idle-debug.h"
50 diff --git a/src/tls-certificate.c b/src/tls-certificate.c
51 index 467d13e..2b3a940 100644
52 --- a/src/tls-certificate.c
53 +++ b/src/tls-certificate.c
54 @@ -22,7 +22,14 @@
55 #include "tls-certificate.h"
56
57 #include <telepathy-glib/telepathy-glib.h>
58 -#include <telepathy-glib/telepathy-glib-dbus.h>
59 +
60 +#if TP_MAJOR_VERSION > 0 || TP_MINOR_VERSION >= 20
61 +# include <telepathy-glib/telepathy-glib-dbus.h>
62 +#else
63 +# include <telepathy-glib/gtypes.h>
64 +# include <telepathy-glib/interfaces.h>
65 +# include <telepathy-glib/svc-tls.h>
66 +#endif
67
68 #define IDLE_DEBUG_FLAG IDLE_DEBUG_TLS
69 #include "idle-debug.h"
+0
-1
debian/patches/series less more
0 0001-Don-t-use-telepathy-glib-dbus.h-with-older-telepathy.patch