Attachment 93483 Details for Bug 74581 – [Empathy] GOA plugin: implement both MC 5.16 and MC 5.18 APIs

[patch] [Empathy] GOA plugin: implement both MC 5.16 and MC 5.18 APIs

0001-Update-GOA-plugin-to-Empathy-master.patch (text/plain), 1.44 KB, created by Simon McVittie on 2014-02-05 18:59:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-02-05 18:59:48 UTC

Size: 1.44 KB

patch

obsolete

>From c743dbae99665048b29b1e74b9158c446f09c1a6 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 28 Jan 2014 11:49:24 +0000
>Subject: [PATCH 1/4] Update GOA plugin to Empathy master
>
>I don't have a build environment for Empathy 3.10 at the moment.
>---
> goa-mc-plugin/mcp-account-manager-goa.c | 5 +----
> goa-mc-plugin/mission-control-plugin.c  | 2 +-
> 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 5072b16..7494985 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 4065305..d4e8ae2 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"
> 
>-- 
>1.9.rc1
>

Actions: View | Splinter Review

Attachments on bug 74581: 93478 | 93479 | 93480 | 93481 | 93482 | 93483 | 93484

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.