[Telepathy-commits] [telepathy-gabble/master] rename gabble-muc-channel.h to muc-channel.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:15 PDT 2008
20080714115822-c9803-3b750d4b9607d8551f84e2d6a41a34aaaaf09b63.gz
---
src/Makefile.am | 2 +-
src/conn-olpc.c | 2 +-
src/gabble-muc-channel.c | 2 +-
src/gabble-muc-channel.h | 106 -------------------------------------------
src/muc-channel.h | 106 +++++++++++++++++++++++++++++++++++++++++++
src/muc-factory.c | 2 +-
src/private-tubes-factory.c | 2 +-
src/tubes-channel.h | 2 +-
8 files changed, 112 insertions(+), 112 deletions(-)
delete mode 100644 src/gabble-muc-channel.h
create mode 100644 src/muc-channel.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ce9dd3..ddc1a6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,7 @@ libgabble_convenience_la_our_sources = \
gabble-connection.c \
im-channel.h \
gabble-im-channel.c \
- gabble-muc-channel.h \
+ muc-channel.h \
gabble-muc-channel.c \
media-channel.h \
gabble-media-channel.c \
diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index 300f871..e8a4fd4 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -29,7 +29,7 @@
#include "debug.h"
#include "connection.h"
-#include "gabble-muc-channel.h"
+#include "muc-channel.h"
#include "presence-cache.h"
#include "namespaces.h"
#include "pubsub.h"
diff --git a/src/gabble-muc-channel.c b/src/gabble-muc-channel.c
index 5f0eda3..49c7242 100644
--- a/src/gabble-muc-channel.c
+++ b/src/gabble-muc-channel.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-muc-channel.h"
+#include "muc-channel.h"
#include <dbus/dbus-glib.h>
#include <stdio.h>
diff --git a/src/gabble-muc-channel.h b/src/gabble-muc-channel.h
deleted file mode 100644
index 7ef05b6..0000000
--- a/src/gabble-muc-channel.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * gabble-muc-channel.h - Header for GabbleMucChannel
- * Copyright (C) 2006 Collabora Ltd.
- * Copyright (C) 2006 Nokia Corporation
- * @author Ole Andre Vadla Ravnaas <ole.andre.ravnaas at collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __GABBLE_MUC_CHANNEL_H__
-#define __GABBLE_MUC_CHANNEL_H__
-
-#include <glib-object.h>
-
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/group-mixin.h>
-#include <telepathy-glib/properties-mixin.h>
-
-#include "gabble-types.h"
-#include "text-mixin.h"
-
-G_BEGIN_DECLS
-
-typedef enum {
- MUC_STATE_CREATED = 0,
- MUC_STATE_INITIATED,
- MUC_STATE_AUTH,
- MUC_STATE_JOINED,
- MUC_STATE_ENDED,
-} GabbleMucState;
-
-typedef struct _GabbleMucChannelClass GabbleMucChannelClass;
-
-struct _GabbleMucChannelClass {
- GObjectClass parent_class;
-
- TpGroupMixinClass group_class;
- TpPropertiesMixinClass properties_class;
- GabbleTextMixinClass text_class;
- TpDBusPropertiesMixinClass dbus_props_class;
-};
-
-struct _GabbleMucChannel {
- GObject parent;
-
- TpGroupMixin group;
- TpPropertiesMixin properties;
- GabbleTextMixin text;
-
- gpointer priv;
-};
-
-GType gabble_muc_channel_get_type (void);
-
-/* TYPE MACROS */
-#define GABBLE_TYPE_MUC_CHANNEL \
- (gabble_muc_channel_get_type ())
-#define GABBLE_MUC_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MUC_CHANNEL, \
- GabbleMucChannel))
-#define GABBLE_MUC_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MUC_CHANNEL,\
- GabbleMucChannelClass))
-#define GABBLE_IS_MUC_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MUC_CHANNEL))
-#define GABBLE_IS_MUC_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MUC_CHANNEL))
-#define GABBLE_MUC_CHANNEL_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MUC_CHANNEL,\
- GabbleMucChannelClass))
-
-gboolean _gabble_muc_channel_is_ready (GabbleMucChannel *chan);
-void _gabble_muc_channel_presence_error (GabbleMucChannel *chan,
- const gchar *jid, LmMessageNode *pres_node);
-void _gabble_muc_channel_member_presence_updated (GabbleMucChannel *chan,
- TpHandle handle, LmMessage *message, LmMessageNode *x_node);
-void _gabble_muc_channel_handle_subject (GabbleMucChannel *chan,
- TpChannelTextMessageType msg_type, TpHandleType handle_type,
- TpHandle sender, time_t timestamp, const gchar *subject, LmMessage *msg);
-void _gabble_muc_channel_receive (GabbleMucChannel *chan,
- TpChannelTextMessageType msg_type, TpHandleType handle_type,
- TpHandle sender, time_t timestamp, const gchar *text, LmMessage *msg);
-
-void _gabble_muc_channel_handle_invited (GabbleMucChannel *chan,
- TpHandle inviter, const gchar *message);
-void _gabble_muc_channel_state_receive (GabbleMucChannel *chan,
- guint state, guint from_handle);
-
-gboolean gabble_muc_channel_send_presence (GabbleMucChannel *chan,
- GError **error);
-
-G_END_DECLS
-
-#endif /* #ifndef __GABBLE_MUC_CHANNEL_H__*/
diff --git a/src/muc-channel.h b/src/muc-channel.h
new file mode 100644
index 0000000..7ef05b6
--- /dev/null
+++ b/src/muc-channel.h
@@ -0,0 +1,106 @@
+/*
+ * gabble-muc-channel.h - Header for GabbleMucChannel
+ * Copyright (C) 2006 Collabora Ltd.
+ * Copyright (C) 2006 Nokia Corporation
+ * @author Ole Andre Vadla Ravnaas <ole.andre.ravnaas at collabora.co.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __GABBLE_MUC_CHANNEL_H__
+#define __GABBLE_MUC_CHANNEL_H__
+
+#include <glib-object.h>
+
+#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/group-mixin.h>
+#include <telepathy-glib/properties-mixin.h>
+
+#include "gabble-types.h"
+#include "text-mixin.h"
+
+G_BEGIN_DECLS
+
+typedef enum {
+ MUC_STATE_CREATED = 0,
+ MUC_STATE_INITIATED,
+ MUC_STATE_AUTH,
+ MUC_STATE_JOINED,
+ MUC_STATE_ENDED,
+} GabbleMucState;
+
+typedef struct _GabbleMucChannelClass GabbleMucChannelClass;
+
+struct _GabbleMucChannelClass {
+ GObjectClass parent_class;
+
+ TpGroupMixinClass group_class;
+ TpPropertiesMixinClass properties_class;
+ GabbleTextMixinClass text_class;
+ TpDBusPropertiesMixinClass dbus_props_class;
+};
+
+struct _GabbleMucChannel {
+ GObject parent;
+
+ TpGroupMixin group;
+ TpPropertiesMixin properties;
+ GabbleTextMixin text;
+
+ gpointer priv;
+};
+
+GType gabble_muc_channel_get_type (void);
+
+/* TYPE MACROS */
+#define GABBLE_TYPE_MUC_CHANNEL \
+ (gabble_muc_channel_get_type ())
+#define GABBLE_MUC_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MUC_CHANNEL, \
+ GabbleMucChannel))
+#define GABBLE_MUC_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MUC_CHANNEL,\
+ GabbleMucChannelClass))
+#define GABBLE_IS_MUC_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MUC_CHANNEL))
+#define GABBLE_IS_MUC_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MUC_CHANNEL))
+#define GABBLE_MUC_CHANNEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MUC_CHANNEL,\
+ GabbleMucChannelClass))
+
+gboolean _gabble_muc_channel_is_ready (GabbleMucChannel *chan);
+void _gabble_muc_channel_presence_error (GabbleMucChannel *chan,
+ const gchar *jid, LmMessageNode *pres_node);
+void _gabble_muc_channel_member_presence_updated (GabbleMucChannel *chan,
+ TpHandle handle, LmMessage *message, LmMessageNode *x_node);
+void _gabble_muc_channel_handle_subject (GabbleMucChannel *chan,
+ TpChannelTextMessageType msg_type, TpHandleType handle_type,
+ TpHandle sender, time_t timestamp, const gchar *subject, LmMessage *msg);
+void _gabble_muc_channel_receive (GabbleMucChannel *chan,
+ TpChannelTextMessageType msg_type, TpHandleType handle_type,
+ TpHandle sender, time_t timestamp, const gchar *text, LmMessage *msg);
+
+void _gabble_muc_channel_handle_invited (GabbleMucChannel *chan,
+ TpHandle inviter, const gchar *message);
+void _gabble_muc_channel_state_receive (GabbleMucChannel *chan,
+ guint state, guint from_handle);
+
+gboolean gabble_muc_channel_send_presence (GabbleMucChannel *chan,
+ GError **error);
+
+G_END_DECLS
+
+#endif /* #ifndef __GABBLE_MUC_CHANNEL_H__*/
diff --git a/src/muc-factory.c b/src/muc-factory.c
index 71d6ac4..42b21d7 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -38,7 +38,7 @@
#include "disco.h"
#include "extensions/extensions.h"
#include "connection.h"
-#include "gabble-muc-channel.h"
+#include "muc-channel.h"
#include "gabble-roomlist-channel.h"
#include "namespaces.h"
#include "presence-cache.h"
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index a3653d4..decc49b 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -39,7 +39,7 @@
#include "namespaces.h"
#include "util.h"
#include "muc-factory.h"
-#include "gabble-muc-channel.h"
+#include "muc-channel.h"
#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/channel-factory-iface.h>
diff --git a/src/tubes-channel.h b/src/tubes-channel.h
index 35c865c..0151cfc 100644
--- a/src/tubes-channel.h
+++ b/src/tubes-channel.h
@@ -25,7 +25,7 @@
#include <telepathy-glib/base-connection.h>
-#include "gabble-muc-channel.h"
+#include "muc-channel.h"
#include "bytestream-iface.h"
G_BEGIN_DECLS
--
1.5.6.3
More information about the Telepathy-commits
mailing list