[Telepathy-commits] [telepathy-gabble/master] rename gabble-media-channel.h to media-channel.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:14 PDT 2008
20080714115814-c9803-8e596dfd10670fcf633db3d77757a648771d0bb8.gz
---
src/Makefile.am | 2 +-
src/capabilities.c | 2 +-
src/gabble-connection.c | 2 +-
src/gabble-media-channel.c | 2 +-
src/gabble-media-channel.h | 108 --------------------------------------------
src/gabble-media-session.c | 2 +-
src/gabble-media-stream.c | 2 +-
src/media-channel.h | 108 ++++++++++++++++++++++++++++++++++++++++++++
src/media-factory.c | 2 +-
src/media-factory.h | 2 +-
10 files changed, 116 insertions(+), 116 deletions(-)
delete mode 100644 src/gabble-media-channel.h
create mode 100644 src/media-channel.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 64eb67e..a97360f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,7 @@ libgabble_convenience_la_our_sources = \
gabble-im-channel.c \
gabble-muc-channel.h \
gabble-muc-channel.c \
- gabble-media-channel.h \
+ media-channel.h \
gabble-media-channel.c \
gabble-media-session.h \
gabble-media-session.c \
diff --git a/src/capabilities.c b/src/capabilities.c
index fa0bb10..fd0f1fc 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -24,7 +24,7 @@
#include "config.h"
#include "presence-cache.h"
#include <telepathy-glib/interfaces.h>
-#include "gabble-media-channel.h"
+#include "media-channel.h"
static const Feature self_advertised_features[] =
{
diff --git a/src/gabble-connection.c b/src/gabble-connection.c
index b72e78d..1ce48f0 100644
--- a/src/gabble-connection.c
+++ b/src/gabble-connection.c
@@ -53,7 +53,7 @@
#include "conn-olpc.h"
#include "debug.h"
#include "disco.h"
-#include "gabble-media-channel.h"
+#include "media-channel.h"
#include "gabble-register.h"
#include "gabble-roomlist-channel.h"
#include "im-factory.h"
diff --git a/src/gabble-media-channel.c b/src/gabble-media-channel.c
index 63ef5a9..febbd10 100644
--- a/src/gabble-media-channel.c
+++ b/src/gabble-media-channel.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-media-channel.h"
+#include "media-channel.h"
#include <dbus/dbus-glib.h>
#include <stdio.h>
diff --git a/src/gabble-media-channel.h b/src/gabble-media-channel.h
deleted file mode 100644
index 569876f..0000000
--- a/src/gabble-media-channel.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * gabble-media-channel.h - Header for GabbleMediaChannel
- * Copyright (C) 2006 Collabora Ltd.
- * Copyright (C) 2006 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_MEDIA_CHANNEL_H__
-#define __GABBLE_MEDIA_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-media-session.h"
-#include "presence.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GabbleMediaChannel GabbleMediaChannel;
-typedef struct _GabbleMediaChannelPrivate GabbleMediaChannelPrivate;
-typedef struct _GabbleMediaChannelClass GabbleMediaChannelClass;
-
-struct _GabbleMediaChannelClass {
- GObjectClass parent_class;
-
- TpGroupMixinClass group_class;
- TpPropertiesMixinClass properties_class;
- TpDBusPropertiesMixinClass dbus_props_class;
-};
-
-struct _GabbleMediaChannel {
- GObject parent;
-
- TpGroupMixin group;
- TpPropertiesMixin properties;
-
- GabbleMediaChannelPrivate *priv;
-};
-
-GType gabble_media_channel_get_type (void);
-
-/* TYPE MACROS */
-#define GABBLE_TYPE_MEDIA_CHANNEL \
- (gabble_media_channel_get_type ())
-#define GABBLE_MEDIA_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_CHANNEL,\
- GabbleMediaChannel))
-#define GABBLE_MEDIA_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_CHANNEL,\
- GabbleMediaChannelClass))
-#define GABBLE_IS_MEDIA_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MEDIA_CHANNEL))
-#define GABBLE_IS_MEDIA_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MEDIA_CHANNEL))
-#define GABBLE_MEDIA_CHANNEL_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_CHANNEL, \
- GabbleMediaChannelClass))
-
-gboolean
-_gabble_media_channel_add_member (GObject *obj,
- TpHandle handle,
- const gchar *message,
- GError **error);
-
-gboolean
-_gabble_media_channel_dispatch_session_action (GabbleMediaChannel *chan,
- TpHandle peer,
- const gchar *peer_resource,
- const gchar *sid,
- LmMessage *message,
- LmMessageNode *session_node,
- const gchar *action,
- GError **error);
-
-void
-_gabble_media_channel_stream_state (GabbleMediaChannel *chan,
- guint state);
-
-guint
-_gabble_media_channel_get_stream_id (GabbleMediaChannel *chan);
-
-GabblePresenceCapabilities
-_gabble_media_channel_typeflags_to_caps (TpChannelMediaCapabilities flags);
-
-TpChannelMediaCapabilities
-_gabble_media_channel_caps_to_typeflags (GabblePresenceCapabilities caps);
-
-void gabble_media_channel_close (GabbleMediaChannel *);
-
-G_END_DECLS
-
-#endif /* #ifndef __GABBLE_MEDIA_CHANNEL_H__*/
diff --git a/src/gabble-media-session.c b/src/gabble-media-session.c
index ac925ce..5e32dc7 100644
--- a/src/gabble-media-session.c
+++ b/src/gabble-media-session.c
@@ -39,7 +39,7 @@
#include <telepathy-glib/svc-media-interfaces.h>
#include "connection.h"
-#include "gabble-media-channel.h"
+#include "media-channel.h"
#include "gabble-media-stream.h"
#include "presence-cache.h"
#include "presence.h"
diff --git a/src/gabble-media-stream.c b/src/gabble-media-stream.c
index 767d7b2..f1d39b8 100644
--- a/src/gabble-media-stream.c
+++ b/src/gabble-media-stream.c
@@ -33,7 +33,7 @@
#include "namespaces.h"
#include "connection.h"
-#include "gabble-media-channel.h"
+#include "media-channel.h"
#include "gabble-media-session.h"
#include "gabble-media-session-enumtypes.h"
diff --git a/src/media-channel.h b/src/media-channel.h
new file mode 100644
index 0000000..569876f
--- /dev/null
+++ b/src/media-channel.h
@@ -0,0 +1,108 @@
+/*
+ * gabble-media-channel.h - Header for GabbleMediaChannel
+ * Copyright (C) 2006 Collabora Ltd.
+ * Copyright (C) 2006 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_MEDIA_CHANNEL_H__
+#define __GABBLE_MEDIA_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-media-session.h"
+#include "presence.h"
+
+G_BEGIN_DECLS
+
+typedef struct _GabbleMediaChannel GabbleMediaChannel;
+typedef struct _GabbleMediaChannelPrivate GabbleMediaChannelPrivate;
+typedef struct _GabbleMediaChannelClass GabbleMediaChannelClass;
+
+struct _GabbleMediaChannelClass {
+ GObjectClass parent_class;
+
+ TpGroupMixinClass group_class;
+ TpPropertiesMixinClass properties_class;
+ TpDBusPropertiesMixinClass dbus_props_class;
+};
+
+struct _GabbleMediaChannel {
+ GObject parent;
+
+ TpGroupMixin group;
+ TpPropertiesMixin properties;
+
+ GabbleMediaChannelPrivate *priv;
+};
+
+GType gabble_media_channel_get_type (void);
+
+/* TYPE MACROS */
+#define GABBLE_TYPE_MEDIA_CHANNEL \
+ (gabble_media_channel_get_type ())
+#define GABBLE_MEDIA_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_CHANNEL,\
+ GabbleMediaChannel))
+#define GABBLE_MEDIA_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_CHANNEL,\
+ GabbleMediaChannelClass))
+#define GABBLE_IS_MEDIA_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MEDIA_CHANNEL))
+#define GABBLE_IS_MEDIA_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MEDIA_CHANNEL))
+#define GABBLE_MEDIA_CHANNEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_CHANNEL, \
+ GabbleMediaChannelClass))
+
+gboolean
+_gabble_media_channel_add_member (GObject *obj,
+ TpHandle handle,
+ const gchar *message,
+ GError **error);
+
+gboolean
+_gabble_media_channel_dispatch_session_action (GabbleMediaChannel *chan,
+ TpHandle peer,
+ const gchar *peer_resource,
+ const gchar *sid,
+ LmMessage *message,
+ LmMessageNode *session_node,
+ const gchar *action,
+ GError **error);
+
+void
+_gabble_media_channel_stream_state (GabbleMediaChannel *chan,
+ guint state);
+
+guint
+_gabble_media_channel_get_stream_id (GabbleMediaChannel *chan);
+
+GabblePresenceCapabilities
+_gabble_media_channel_typeflags_to_caps (TpChannelMediaCapabilities flags);
+
+TpChannelMediaCapabilities
+_gabble_media_channel_caps_to_typeflags (GabblePresenceCapabilities caps);
+
+void gabble_media_channel_close (GabbleMediaChannel *);
+
+G_END_DECLS
+
+#endif /* #ifndef __GABBLE_MEDIA_CHANNEL_H__*/
diff --git a/src/media-factory.c b/src/media-factory.c
index 03c6d19..0b66216 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -36,7 +36,7 @@
#include "debug.h"
#include "connection.h"
-#include "gabble-media-channel.h"
+#include "media-channel.h"
#include "namespaces.h"
#include <telepathy-glib/interfaces.h>
#include "text-mixin.h"
diff --git a/src/media-factory.h b/src/media-factory.h
index 90b19c7..8613b8d 100644
--- a/src/media-factory.h
+++ b/src/media-factory.h
@@ -22,7 +22,7 @@
#include <glib-object.h>
-#include "gabble-media-channel.h"
+#include "media-channel.h"
G_BEGIN_DECLS
--
1.5.6.3
More information about the Telepathy-commits
mailing list