summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Barnett <jbarnett@stanfordalumni.org>2012-05-23 16:15:08 -0700
committerJoe Barnett <jbarnett@stanfordalumni.org>2012-05-23 16:15:08 -0700
commit24b7f8e49c5a1e7c2a7f851f53fde51ee6373216 (patch)
treecf0fa949a9a1bcbc822a0acac8cc0571d173cfa0
parent30e6a3521b8435eaded73977d661b8a54004f553 (diff)
fix headerHEADmaster
-rw-r--r--src/kindling-muc-channel.c1
-rw-r--r--src/kindling-muc-channel.h5
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kindling-muc-channel.c b/src/kindling-muc-channel.c
index 9a9ca7d..3b630da 100644
--- a/src/kindling-muc-channel.c
+++ b/src/kindling-muc-channel.c
@@ -18,7 +18,6 @@ telepathy-kindling is free software: you can redistribute it and/or modify it
*/
#include "kindling-muc-channel.h"
-#include <telepathy-glib/base-channel.h>
#include <telepathy-glib/message-mixin.h>
#include <dbus/dbus-glib.h>
diff --git a/src/kindling-muc-channel.h b/src/kindling-muc-channel.h
index dd06149..ca841fb 100644
--- a/src/kindling-muc-channel.h
+++ b/src/kindling-muc-channel.h
@@ -21,6 +21,7 @@ telepathy-kindling is free software: you can redistribute it and/or modify it
#define _KINDLING_MUC_CHANNEL_H_
#include <glib-object.h>
+#include <telepathy-glib/base-channel.h>
G_BEGIN_DECLS
@@ -38,12 +39,12 @@ typedef struct _KindlingMUCChannel KindlingMUCChannel;
struct _KindlingMUCChannelClass
{
- GObjectClass parent_class;
+ TpBaseChannelClass parent_class;
};
struct _KindlingMUCChannel
{
- GObject parent_instance;
+ TpBaseChannel parent_instance;
};