[Telepathy-commits] [telepathy-gabble/master] rename gabble-roster-channel.h to roster-channel.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:14 PDT 2008
20080714115829-c9803-a8a686a809ace1f96474510cc4187d6943fac4e5.gz
---
src/Makefile.am | 2 +-
src/gabble-roster-channel.c | 2 +-
src/gabble-roster-channel.h | 71 -------------------------------------------
src/roster-channel.h | 71 +++++++++++++++++++++++++++++++++++++++++++
src/roster.c | 2 +-
5 files changed, 74 insertions(+), 74 deletions(-)
delete mode 100644 src/gabble-roster-channel.h
create mode 100644 src/roster-channel.h
diff --git a/src/Makefile.am b/src/Makefile.am
index f2dc1ea..69ce459 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,7 +65,7 @@ libgabble_convenience_la_our_sources = \
gabble-media-stream.c \
gabble-register.c \
register.h \
- gabble-roster-channel.h \
+ roster-channel.h \
gabble-roster-channel.c \
roomlist-channel.h \
gabble-roomlist-channel.c \
diff --git a/src/gabble-roster-channel.c b/src/gabble-roster-channel.c
index facd7f1..5ffd191 100644
--- a/src/gabble-roster-channel.c
+++ b/src/gabble-roster-channel.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-roster-channel.h"
+#include "roster-channel.h"
#include <dbus/dbus-glib.h>
#include <stdio.h>
diff --git a/src/gabble-roster-channel.h b/src/gabble-roster-channel.h
deleted file mode 100644
index 30267e7..0000000
--- a/src/gabble-roster-channel.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * gabble-roster-channel.h - Header for GabbleRosterChannel
- * 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_ROSTER_CHANNEL_H__
-#define __GABBLE_ROSTER_CHANNEL_H__
-
-#include <glib-object.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/group-mixin.h>
-#include <telepathy-glib/intset.h>
-
-#include "gabble-types.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GabbleRosterChannelClass GabbleRosterChannelClass;
-
-struct _GabbleRosterChannelClass {
- GObjectClass parent_class;
-
- TpGroupMixinClass group_class;
- TpDBusPropertiesMixinClass properties_class;
-};
-
-struct _GabbleRosterChannel {
- GObject parent;
-
- TpGroupMixin group;
-
- gpointer priv;
-};
-
-GType gabble_roster_channel_get_type (void);
-
-/* TYPE MACROS */
-#define GABBLE_TYPE_ROSTER_CHANNEL \
- (gabble_roster_channel_get_type ())
-#define GABBLE_ROSTER_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_ROSTER_CHANNEL,\
- GabbleRosterChannel))
-#define GABBLE_ROSTER_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_ROSTER_CHANNEL,\
- GabbleRosterChannelClass))
-#define GABBLE_IS_ROSTER_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_ROSTER_CHANNEL))
-#define GABBLE_IS_ROSTER_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_ROSTER_CHANNEL))
-#define GABBLE_ROSTER_CHANNEL_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_ROSTER_CHANNEL,\
- GabbleRosterChannelClass))
-
-G_END_DECLS
-
-#endif /* #ifndef __GABBLE_ROSTER_CHANNEL_H__*/
diff --git a/src/roster-channel.h b/src/roster-channel.h
new file mode 100644
index 0000000..30267e7
--- /dev/null
+++ b/src/roster-channel.h
@@ -0,0 +1,71 @@
+/*
+ * gabble-roster-channel.h - Header for GabbleRosterChannel
+ * 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_ROSTER_CHANNEL_H__
+#define __GABBLE_ROSTER_CHANNEL_H__
+
+#include <glib-object.h>
+#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/group-mixin.h>
+#include <telepathy-glib/intset.h>
+
+#include "gabble-types.h"
+
+G_BEGIN_DECLS
+
+typedef struct _GabbleRosterChannelClass GabbleRosterChannelClass;
+
+struct _GabbleRosterChannelClass {
+ GObjectClass parent_class;
+
+ TpGroupMixinClass group_class;
+ TpDBusPropertiesMixinClass properties_class;
+};
+
+struct _GabbleRosterChannel {
+ GObject parent;
+
+ TpGroupMixin group;
+
+ gpointer priv;
+};
+
+GType gabble_roster_channel_get_type (void);
+
+/* TYPE MACROS */
+#define GABBLE_TYPE_ROSTER_CHANNEL \
+ (gabble_roster_channel_get_type ())
+#define GABBLE_ROSTER_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_ROSTER_CHANNEL,\
+ GabbleRosterChannel))
+#define GABBLE_ROSTER_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_ROSTER_CHANNEL,\
+ GabbleRosterChannelClass))
+#define GABBLE_IS_ROSTER_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_ROSTER_CHANNEL))
+#define GABBLE_IS_ROSTER_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_ROSTER_CHANNEL))
+#define GABBLE_ROSTER_CHANNEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_ROSTER_CHANNEL,\
+ GabbleRosterChannelClass))
+
+G_END_DECLS
+
+#endif /* #ifndef __GABBLE_ROSTER_CHANNEL_H__*/
diff --git a/src/roster.c b/src/roster.c
index ecea65d..08c1a52 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -34,7 +34,7 @@
#include "conn-aliasing.h"
#include "debug.h"
#include "connection.h"
-#include "gabble-roster-channel.h"
+#include "roster-channel.h"
#include "namespaces.h"
#include "util.h"
--
1.5.6.3
More information about the Telepathy-commits
mailing list