summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEitan Isaacson <eitan.isaacson@collabora.co.uk>2010-07-18 22:52:21 -0700
committerEitan Isaacson <eitan.isaacson@collabora.co.uk>2010-08-02 17:34:21 -0700
commit49e5b5fd70eb7bcd110171b8562697ce99bb7cd3 (patch)
treee44ebbdf68d4da183af76c4b7cdc9494168e0dfa /src
parentd7569ccc7fa071790afa2de54fb34605b857963e (diff)
Remove references to McSvcAccountInterfaceStorage
Diffstat (limited to 'src')
-rw-r--r--src/mcd-account-manager.c1
-rw-r--r--src/mcd-account-priv.h1
-rw-r--r--src/mcd-account.c6
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index a8e07a23..d8836f02 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -59,6 +59,7 @@
#include "mcd-dbusprop.h"
#include "mcd-master-priv.h"
#include "mcd-misc.h"
+#include "mission-control-plugins/mission-control-plugins.h"
#include "mission-control-plugins/implementation.h"
#include "plugin-account.h"
#include "plugin-loader.h"
diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h
index 8b339d94..01aa3310 100644
--- a/src/mcd-account-priv.h
+++ b/src/mcd-account-priv.h
@@ -37,7 +37,6 @@
#include "_gen/svc-Account_Interface_ChannelRequests.h"
#include "_gen/svc-Account_Interface_Compat.h"
#include "_gen/svc-Account_Interface_Conditions.h"
-#include "_gen/svc-Account_Interface_Storage.h"
#include "_gen/svc-Account_Interface_Stats.h"
G_GNUC_INTERNAL void _mcd_account_maybe_autoconnect (McdAccount *account);
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 271f6eb3..3c4595ad 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -68,7 +68,7 @@ static void properties_iface_init (TpSvcDBusPropertiesClass *iface,
static void account_avatar_iface_init (TpSvcAccountInterfaceAvatarClass *iface,
gpointer iface_data);
static void account_storage_iface_init (
- McSvcAccountInterfaceStorageClass *iface,
+ TpSvcAccountInterfaceStorageClass *iface,
gpointer iface_data);
static const McdDBusProp account_properties[];
@@ -1819,7 +1819,7 @@ static void
get_storage_restrictions (TpSvcDBusProperties *self,
const gchar *name, GValue *value)
{
- guint flags;
+ TpStorageRestrictionFlags flags;
McdAccount *account = MCD_ACCOUNT (self);
McdAccountPrivate *priv = account->priv;
@@ -1875,7 +1875,7 @@ account_avatar_iface_init (TpSvcAccountInterfaceAvatarClass *iface,
}
static void
-account_storage_iface_init (McSvcAccountInterfaceStorageClass *iface,
+account_storage_iface_init (TpSvcAccountInterfaceStorageClass *iface,
gpointer iface_data)
{
}