summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-01-28 11:49:24 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-02-05 18:23:32 +0000
commit0f70545f38f84cc22b877654c1dd67373696f9cc (patch)
treeadc164abc29710ec171ed7bd045a95d160ba588e
parent142d1bfd218d028c2a66f6fb14429165e7bf4670 (diff)
Update GOA plugin to Empathy master
I don't have a build environment for Empathy 3.10 at the moment.
-rw-r--r--goa-mc-plugin/mcp-account-manager-goa.c5
-rw-r--r--goa-mc-plugin/mission-control-plugin.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 5072b161..74949852 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -24,14 +24,11 @@
*/
#include "config.h"
-
-#include <telepathy-glib/telepathy-glib.h>
+#include "mcp-account-manager-goa.h"
#define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
#include <goa/goa.h>
-#include "mcp-account-manager-goa.h"
-
#define DEBUG g_debug
#define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
#define DECLARE_GASYNC_CALLBACK(name) \
diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c
index 40653056..d4e8ae29 100644
--- a/goa-mc-plugin/mission-control-plugin.c
+++ b/goa-mc-plugin/mission-control-plugin.c
@@ -23,7 +23,7 @@
* Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
-#include <mission-control-plugins/mission-control-plugins.h>
+#include "config.h"
#include "mcp-account-manager-goa.h"