[Telepathy-commits] [telepathy-gabble/master] rename gabble-roomlist-channel.h to roomlist-channel.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:14 PDT 2008
20080714115827-c9803-a9a7f479bf6a2c1596189c64855d1e2d3cc94ba4.gz
---
src/Makefile.am | 2 +-
src/gabble-connection.c | 2 +-
src/gabble-roomlist-channel.c | 2 +-
src/gabble-roomlist-channel.h | 71 -----------------------------------------
src/muc-factory.c | 2 +-
src/roomlist-channel.h | 71 +++++++++++++++++++++++++++++++++++++++++
6 files changed, 75 insertions(+), 75 deletions(-)
delete mode 100644 src/gabble-roomlist-channel.h
create mode 100644 src/roomlist-channel.h
diff --git a/src/Makefile.am b/src/Makefile.am
index c3a62ff..f2dc1ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,7 +67,7 @@ libgabble_convenience_la_our_sources = \
register.h \
gabble-roster-channel.h \
gabble-roster-channel.c \
- gabble-roomlist-channel.h \
+ roomlist-channel.h \
gabble-roomlist-channel.c \
gabble-types.h \
im-factory.h \
diff --git a/src/gabble-connection.c b/src/gabble-connection.c
index 9934a72..2c1e048 100644
--- a/src/gabble-connection.c
+++ b/src/gabble-connection.c
@@ -55,7 +55,7 @@
#include "disco.h"
#include "media-channel.h"
#include "register.h"
-#include "gabble-roomlist-channel.h"
+#include "roomlist-channel.h"
#include "im-factory.h"
#include "media-factory.h"
#include "muc-factory.h"
diff --git a/src/gabble-roomlist-channel.c b/src/gabble-roomlist-channel.c
index 0cde47b..a687370 100644
--- a/src/gabble-roomlist-channel.c
+++ b/src/gabble-roomlist-channel.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-roomlist-channel.h"
+#include "roomlist-channel.h"
#include <dbus/dbus-glib.h>
#include <stdio.h>
diff --git a/src/gabble-roomlist-channel.h b/src/gabble-roomlist-channel.h
deleted file mode 100644
index 1bf44c2..0000000
--- a/src/gabble-roomlist-channel.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * gabble-roomlist-channel.h - Header for GabbleRoomlistChannel
- * 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_ROOMLIST_CHANNEL_H__
-#define __GABBLE_ROOMLIST_CHANNEL_H__
-
-#include <glib-object.h>
-
-#include "connection.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GabbleRoomlistChannel GabbleRoomlistChannel;
-typedef struct _GabbleRoomlistChannelClass GabbleRoomlistChannelClass;
-
-struct _GabbleRoomlistChannelClass {
- GObjectClass parent_class;
-
- TpDBusPropertiesMixinClass dbus_props_class;
-};
-
-struct _GabbleRoomlistChannel {
- GObject parent;
-
- gpointer priv;
-};
-
-GType gabble_roomlist_channel_get_type (void);
-
-/* TYPE MACROS */
-#define GABBLE_TYPE_ROOMLIST_CHANNEL \
- (gabble_roomlist_channel_get_type ())
-#define GABBLE_ROOMLIST_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_ROOMLIST_CHANNEL,\
- GabbleRoomlistChannel))
-#define GABBLE_ROOMLIST_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_ROOMLIST_CHANNEL,\
- GabbleRoomlistChannelClass))
-#define GABBLE_IS_ROOMLIST_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_ROOMLIST_CHANNEL))
-#define GABBLE_IS_ROOMLIST_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_ROOMLIST_CHANNEL))
-#define GABBLE_ROOMLIST_CHANNEL_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_ROOMLIST_CHANNEL,\
- GabbleRoomlistChannelClass))
-
-
-GabbleRoomlistChannel *_gabble_roomlist_channel_new (GabbleConnection *conn,
- const gchar *object_path, const gchar *conference_server);
-
-
-G_END_DECLS
-
-#endif /* #ifndef __GABBLE_ROOMLIST_CHANNEL_H__*/
diff --git a/src/muc-factory.c b/src/muc-factory.c
index 42b21d7..e2ed6e0 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -39,7 +39,7 @@
#include "extensions/extensions.h"
#include "connection.h"
#include "muc-channel.h"
-#include "gabble-roomlist-channel.h"
+#include "roomlist-channel.h"
#include "namespaces.h"
#include "presence-cache.h"
#include "text-mixin.h"
diff --git a/src/roomlist-channel.h b/src/roomlist-channel.h
new file mode 100644
index 0000000..1bf44c2
--- /dev/null
+++ b/src/roomlist-channel.h
@@ -0,0 +1,71 @@
+/*
+ * gabble-roomlist-channel.h - Header for GabbleRoomlistChannel
+ * 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_ROOMLIST_CHANNEL_H__
+#define __GABBLE_ROOMLIST_CHANNEL_H__
+
+#include <glib-object.h>
+
+#include "connection.h"
+
+G_BEGIN_DECLS
+
+typedef struct _GabbleRoomlistChannel GabbleRoomlistChannel;
+typedef struct _GabbleRoomlistChannelClass GabbleRoomlistChannelClass;
+
+struct _GabbleRoomlistChannelClass {
+ GObjectClass parent_class;
+
+ TpDBusPropertiesMixinClass dbus_props_class;
+};
+
+struct _GabbleRoomlistChannel {
+ GObject parent;
+
+ gpointer priv;
+};
+
+GType gabble_roomlist_channel_get_type (void);
+
+/* TYPE MACROS */
+#define GABBLE_TYPE_ROOMLIST_CHANNEL \
+ (gabble_roomlist_channel_get_type ())
+#define GABBLE_ROOMLIST_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_ROOMLIST_CHANNEL,\
+ GabbleRoomlistChannel))
+#define GABBLE_ROOMLIST_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_ROOMLIST_CHANNEL,\
+ GabbleRoomlistChannelClass))
+#define GABBLE_IS_ROOMLIST_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_ROOMLIST_CHANNEL))
+#define GABBLE_IS_ROOMLIST_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_ROOMLIST_CHANNEL))
+#define GABBLE_ROOMLIST_CHANNEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_ROOMLIST_CHANNEL,\
+ GabbleRoomlistChannelClass))
+
+
+GabbleRoomlistChannel *_gabble_roomlist_channel_new (GabbleConnection *conn,
+ const gchar *object_path, const gchar *conference_server);
+
+
+G_END_DECLS
+
+#endif /* #ifndef __GABBLE_ROOMLIST_CHANNEL_H__*/
--
1.5.6.3
More information about the Telepathy-commits
mailing list