[Pkg-telepathy-commits] [empathy] 04/12: Imported Upstream version 3.12.0+66+g529cd04

Simon McVittie smcv at debian.org
Wed May 14 12:06:53 UTC 2014


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch telepathy1
in repository empathy.

commit 7829430110a5b7e91e26e9749e1a42e3da32ba15
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Apr 3 19:39:29 2014 +0100

    Imported Upstream version 3.12.0+66+g529cd04
---
 ChangeLog                            | 27 ++++++++++++++++++++++-----
 libempathy-gtk/empathy-plist.c       |  1 +
 libempathy-gtk/empathy-theme-adium.c |  1 +
 libempathy-gtk/empathy-tls-dialog.c  |  1 +
 libempathy/empathy-contact.c         |  1 +
 libempathy/empathy-tls-verifier.c    |  1 +
 src/empathy-auth-client.c            |  1 +
 src/empathy-import-pidgin.c          |  1 +
 src/empathy-import-utils.c           |  1 +
 9 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7390b33..7d26aff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,23 @@
-commit 221954db989d01c30961434acd87563ca3105ee0
+commit 529cd04c8c816271e924f695054b082fc8113d64
 Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date:   2014-04-02 20:37:24 +0100
+Date:   2014-04-03 12:59:47 +0100
+
+    Include telepathy-glib-dbus.h where needed for tp_asv_*,
+    tp_g_value_slice_*
+
+ libempathy-gtk/empathy-plist.c       | 1 +
+ libempathy-gtk/empathy-theme-adium.c | 1 +
+ libempathy-gtk/empathy-tls-dialog.c  | 1 +
+ libempathy/empathy-contact.c         | 1 +
+ libempathy/empathy-tls-verifier.c    | 1 +
+ src/empathy-auth-client.c            | 1 +
+ src/empathy-import-pidgin.c          | 1 +
+ src/empathy-import-utils.c           | 1 +
+ 8 files changed, 8 insertions(+)
+
+commit 1dfa999e9a68135feb888786ebe054b325a768ae
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date:   2014-04-02 20:38:52 +0100
 
     Update for removal of TpDBusDaemon
 
@@ -11,9 +28,9 @@ Date:   2014-04-02 20:37:24 +0100
 
  libempathy/empathy-client-factory.c                |  10 +-
  libempathy/empathy-tp-chat.c                       |   1 -
- libempathy/empathy-utils.c                         |  16 ++--
+ libempathy/empathy-utils.c                         |  16 +--
  src/empathy-auth-client.c                          |  13 ++-
- src/empathy-debug-window.c                         | 106
+ src/empathy-debug-window.c                         | 108
  ++++++++++++---------
  telepathy-account-widgets                          |   2 +-
  tests/empathy-tls-test.c                           |  18 ++--
@@ -21,7 +38,7 @@ Date:   2014-04-02 20:37:24 +0100
  .../account-plugins/empathy-accounts-plugin.h      |   1 +
  .../cc-plugins/app-plugin/empathy-app-plugin.c     |  26 ++---
  .../cc-plugins/app-plugin/empathy-app-plugin.h     |   1 +
- 11 files changed, 129 insertions(+), 93 deletions(-)
+ 11 files changed, 129 insertions(+), 95 deletions(-)
 
 commit c9631171f8f4c38765dcbcdc552f08e0708976b8
 Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index e1113a0..65626f0 100644
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <libxml/tree.h>
 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static GValue *empathy_plist_parse_node (xmlNode *a_node);
 
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index a870702..e014b1a 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -23,6 +23,7 @@
 #include "empathy-theme-adium.h"
 
 #include <glib/gi18n-lib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <tp-account-widgets/tpaw-images.h>
 #include <tp-account-widgets/tpaw-time.h>
 #include <tp-account-widgets/tpaw-pixbuf-utils.h>
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index df47c50..c24c774 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -23,6 +23,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <gcr/gcr.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index fa59cb4..88cbfdb 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -22,6 +22,7 @@
 #include "config.h"
 #include "empathy-contact.h"
 
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <tp-account-widgets/tpaw-utils.h>
 
 #ifdef HAVE_GEOCODE
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index fcbc559..616a758 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -23,6 +23,7 @@
 #include "empathy-tls-verifier.h"
 
 #include <gcr/gcr.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "empathy-utils.h"
 
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 5ee20db..e3f7a4e 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -23,6 +23,7 @@
 
 #include <glib/gi18n.h>
 #include <gnutls/gnutls.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "empathy-auth-factory.h"
 #include "empathy-bad-password-dialog.h"
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index e98897c..e48d63f 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -23,6 +23,7 @@
 #include "empathy-import-pidgin.h"
 
 #include <glib/gstdio.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-import-utils.h"
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index ab7847c..f3e2dba 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -22,6 +22,7 @@
 #include "config.h"
 #include "empathy-import-utils.h"
 
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <tp-account-widgets/tpaw-connection-managers.h>
 #include <tp-account-widgets/tpaw-utils.h>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git



More information about the Pkg-telepathy-commits mailing list