telepathy-mission-control: Fix missing includes to build with recent libaccounts-glib

Xavier Claessens xclaesse at kemper.freedesktop.org
Thu Jul 12 02:15:08 PDT 2012


Module: telepathy-mission-control
Branch: master
Commit: cae1b270732bab16cb3324e912fc2956baa784bc
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=cae1b270732bab16cb3324e912fc2956baa784bc

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Thu Jul 12 11:12:30 2012 +0200

Fix missing includes to build with recent libaccounts-glib

---

 src/mcd-account-manager-sso.c     |    3 +++
 src/mcd-account-manager-sso.h     |    1 -
 tests/account-store-libaccounts.c |    8 +++++---
 tests/account-store-libaccounts.h |    6 ++++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/mcd-account-manager-sso.c b/src/mcd-account-manager-sso.c
index 45a7cbe..a562a2a 100644
--- a/src/mcd-account-manager-sso.c
+++ b/src/mcd-account-manager-sso.c
@@ -25,6 +25,9 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
+#include <libaccounts-glib/ag-account.h>
+#include <libaccounts-glib/ag-service.h>
+
 #include <string.h>
 #include <ctype.h>
 
diff --git a/src/mcd-account-manager-sso.h b/src/mcd-account-manager-sso.h
index 108d070..12e616f 100644
--- a/src/mcd-account-manager-sso.h
+++ b/src/mcd-account-manager-sso.h
@@ -21,7 +21,6 @@
 
 #include <mission-control-plugins/mission-control-plugins.h>
 #include <libaccounts-glib/ag-manager.h>
-#include <libaccounts-glib/ag-account.h>
 
 #ifndef __MCD_ACCOUNT_MANAGER_SSO_H__
 #define __MCD_ACCOUNT_MANAGER_SSO_H__
diff --git a/tests/account-store-libaccounts.c b/tests/account-store-libaccounts.c
index 11c2400..249b847 100644
--- a/tests/account-store-libaccounts.c
+++ b/tests/account-store-libaccounts.c
@@ -19,11 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <string.h>
+#include "account-store-libaccounts.h"
+
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-account.h>
-#include <glib.h>
-#include "account-store-libaccounts.h"
+#include <libaccounts-glib/ag-service.h>
+
+#include <string.h>
 
 #undef  G_LOG_DOMAIN
 #define G_LOG_DOMAIN "account-store-libaccounts"
diff --git a/tests/account-store-libaccounts.h b/tests/account-store-libaccounts.h
index cb2352b..8e88f69 100644
--- a/tests/account-store-libaccounts.h
+++ b/tests/account-store-libaccounts.h
@@ -19,9 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <glib-object.h>
+
 #ifndef _ACCOUNT_STORE_LIBACCOUNTS_H_
 #define _ACCOUNT_STORE_LIBACCOUNTS_H_
 
+G_BEGIN_DECLS
+
 gchar * libaccounts_get (const gchar *mc_account,
     const gchar *key);
 
@@ -35,4 +39,6 @@ gboolean libaccounts_exists (const gchar *mc_account);
 
 GStrv libaccounts_list (void);
 
+G_END_DECLS
+
 #endif



More information about the telepathy-commits mailing list