[Telepathy-commits] [telepathy-gabble/master] rename gabble-im-channel.h to im-channel.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:13 PDT 2008
20080714115811-c9803-008bc2f72851b17888dd9391e61d02ceb43af6a5.gz
---
src/Makefile.am | 2 +-
src/gabble-im-channel.c | 2 +-
src/gabble-im-channel.h | 75 -----------------------------------------------
src/im-channel.h | 75 +++++++++++++++++++++++++++++++++++++++++++++++
src/im-factory.c | 2 +-
src/im-factory.h | 2 +-
6 files changed, 79 insertions(+), 79 deletions(-)
delete mode 100644 src/gabble-im-channel.h
create mode 100644 src/im-channel.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b48e5d..64eb67e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,7 @@ libgabble_convenience_la_our_sources = \
gabble-connection-manager.c \
connection.h \
gabble-connection.c \
- gabble-im-channel.h \
+ im-channel.h \
gabble-im-channel.c \
gabble-muc-channel.h \
gabble-muc-channel.c \
diff --git a/src/gabble-im-channel.c b/src/gabble-im-channel.c
index b971a72..b66b3c6 100644
--- a/src/gabble-im-channel.c
+++ b/src/gabble-im-channel.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-im-channel.h"
+#include "im-channel.h"
#include <dbus/dbus-glib.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/gabble-im-channel.h b/src/gabble-im-channel.h
deleted file mode 100644
index 6ec96bd..0000000
--- a/src/gabble-im-channel.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * gabble-im-channel.h - Header for GabbleIMChannel
- * Copyright (C) 2005 Collabora Ltd.
- * Copyright (C) 2005 Nokia Corporation
- *
- * 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_IM_CHANNEL_H__
-#define __GABBLE_IM_CHANNEL_H__
-
-#include <glib-object.h>
-#include <time.h>
-
-#include <telepathy-glib/enums.h>
-#include "text-mixin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GabbleIMChannel GabbleIMChannel;
-typedef struct _GabbleIMChannelClass GabbleIMChannelClass;
-
-struct _GabbleIMChannelClass {
- GObjectClass parent_class;
-
- GabbleTextMixinClass text_class;
- TpDBusPropertiesMixinClass dbus_props_class;
-};
-
-struct _GabbleIMChannel {
- GObject parent;
-
- GabbleTextMixin text;
-
- gpointer priv;
-};
-
-GType gabble_im_channel_get_type (void);
-
-/* TYPE MACROS */
-#define GABBLE_TYPE_IM_CHANNEL \
- (gabble_im_channel_get_type ())
-#define GABBLE_IM_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_IM_CHANNEL, GabbleIMChannel))
-#define GABBLE_IM_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_IM_CHANNEL,\
- GabbleIMChannelClass))
-#define GABBLE_IS_IM_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_IM_CHANNEL))
-#define GABBLE_IS_IM_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_IM_CHANNEL))
-#define GABBLE_IM_CHANNEL_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_IM_CHANNEL, \
- GabbleIMChannelClass))
-
-void _gabble_im_channel_receive (GabbleIMChannel *chan,
- TpChannelTextMessageType type, TpHandle sender, const char *from,
- time_t timestamp, const char *text);
-void _gabble_im_channel_state_receive (GabbleIMChannel *chan, guint state);
-
-G_END_DECLS
-
-#endif /* #ifndef __GABBLE_IM_CHANNEL_H__*/
diff --git a/src/im-channel.h b/src/im-channel.h
new file mode 100644
index 0000000..6ec96bd
--- /dev/null
+++ b/src/im-channel.h
@@ -0,0 +1,75 @@
+/*
+ * gabble-im-channel.h - Header for GabbleIMChannel
+ * Copyright (C) 2005 Collabora Ltd.
+ * Copyright (C) 2005 Nokia Corporation
+ *
+ * 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_IM_CHANNEL_H__
+#define __GABBLE_IM_CHANNEL_H__
+
+#include <glib-object.h>
+#include <time.h>
+
+#include <telepathy-glib/enums.h>
+#include "text-mixin.h"
+
+G_BEGIN_DECLS
+
+typedef struct _GabbleIMChannel GabbleIMChannel;
+typedef struct _GabbleIMChannelClass GabbleIMChannelClass;
+
+struct _GabbleIMChannelClass {
+ GObjectClass parent_class;
+
+ GabbleTextMixinClass text_class;
+ TpDBusPropertiesMixinClass dbus_props_class;
+};
+
+struct _GabbleIMChannel {
+ GObject parent;
+
+ GabbleTextMixin text;
+
+ gpointer priv;
+};
+
+GType gabble_im_channel_get_type (void);
+
+/* TYPE MACROS */
+#define GABBLE_TYPE_IM_CHANNEL \
+ (gabble_im_channel_get_type ())
+#define GABBLE_IM_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_IM_CHANNEL, GabbleIMChannel))
+#define GABBLE_IM_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_IM_CHANNEL,\
+ GabbleIMChannelClass))
+#define GABBLE_IS_IM_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_IM_CHANNEL))
+#define GABBLE_IS_IM_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_IM_CHANNEL))
+#define GABBLE_IM_CHANNEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_IM_CHANNEL, \
+ GabbleIMChannelClass))
+
+void _gabble_im_channel_receive (GabbleIMChannel *chan,
+ TpChannelTextMessageType type, TpHandle sender, const char *from,
+ time_t timestamp, const char *text);
+void _gabble_im_channel_state_receive (GabbleIMChannel *chan, guint state);
+
+G_END_DECLS
+
+#endif /* #ifndef __GABBLE_IM_CHANNEL_H__*/
diff --git a/src/im-factory.c b/src/im-factory.c
index f1dd014..464a881 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -37,7 +37,7 @@
#include "debug.h"
#include "disco.h"
#include "connection.h"
-#include "gabble-im-channel.h"
+#include "im-channel.h"
#include <telepathy-glib/interfaces.h>
#include "text-mixin.h"
#include <telepathy-glib/channel-factory-iface.h>
diff --git a/src/im-factory.h b/src/im-factory.h
index b895ed4..b80e64e 100644
--- a/src/im-factory.h
+++ b/src/im-factory.h
@@ -22,7 +22,7 @@
#include <glib-object.h>
-#include "gabble-im-channel.h"
+#include "im-channel.h"
G_BEGIN_DECLS
--
1.5.6.3
More information about the Telepathy-commits
mailing list