[Telepathy-commits] [telepathy-gabble/master] Fix merge issues after merging wjt/requestotron
Alban Crequy
alban.crequy at collabora.co.uk
Fri Dec 5 09:42:34 PST 2008
---
extensions/all.xml | 4 ++++
src/capabilities.c | 2 +-
src/caps-channel-manager.c | 5 ++---
src/caps-channel-manager.h | 2 +-
src/im-factory.c | 1 -
src/presence-cache.c | 2 +-
src/presence.c | 2 +-
src/private-tubes-factory.c | 16 +++++++---------
src/tube-stream.c | 6 +++---
src/tubes-channel.c | 6 +++---
src/tubes-channel.h | 4 ++--
11 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/extensions/all.xml b/extensions/all.xml
index 6120296..c8a8951 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -44,6 +44,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p>
<tp:external-type name="String_Variant_Map" type="a{sv}"
from="Telepathy specification"/>
+ <!-- use types from Connection_Interface_Requests -->
+ <tp:external-type name="Channel_Class" type="a{sv}"
+ from="Telepathy specification"/>
+
<!-- use types from Channel_Type_Tubes -->
<tp:external-type name="Socket_Address_Type" type="u"
from="Telepathy specification"/>
diff --git a/src/capabilities.c b/src/capabilities.c
index 201a404..f153a79 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -22,9 +22,9 @@
#include "capabilities.h"
#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/channel-manager.h>
#include "caps-channel-manager.h"
-#include "channel-manager.h"
#include "namespaces.h"
#include "presence-cache.h"
#include "media-channel.h"
diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index 6fd7c6a..4126af3 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -24,9 +24,8 @@
#include "caps-channel-manager.h"
#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/channel-manager.h>
-#include "channel-manager.h"
-#include "exportable-channel.h"
GType
gabble_caps_channel_manager_get_type (void)
@@ -50,7 +49,7 @@ gabble_caps_channel_manager_get_type (void)
type = g_type_register_static (G_TYPE_INTERFACE,
"GabbleCapsChannelManager", &info, 0);
- g_type_interface_add_prerequisite (type, GABBLE_TYPE_CHANNEL_MANAGER);
+ g_type_interface_add_prerequisite (type, TP_TYPE_CHANNEL_MANAGER);
}
return type;
diff --git a/src/caps-channel-manager.h b/src/caps-channel-manager.h
index eac7981..349ef68 100644
--- a/src/caps-channel-manager.h
+++ b/src/caps-channel-manager.h
@@ -25,9 +25,9 @@
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
+#include <telepathy-glib/exportable-channel.h>
#include <telepathy-glib/handle.h>
-#include "exportable-channel.h"
#include "types.h"
G_BEGIN_DECLS
diff --git a/src/im-factory.c b/src/im-factory.c
index f241b11..6954d19 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -36,7 +36,6 @@
#include "extensions/extensions.h"
#include "caps-channel-manager.h"
-#include "channel-manager.h"
#include "connection.h"
#include "debug.h"
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 551e5fb..b2c0a0d 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -33,13 +33,13 @@
#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
#include <dbus/dbus-glib.h>
+#include <telepathy-glib/channel-manager.h>
#include <telepathy-glib/intset.h>
#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
#include "caps-channel-manager.h"
#include "caps-hash.h"
-#include "channel-manager.h"
#include "debug.h"
#include "disco.h"
#include "gabble-signals-marshal.h"
diff --git a/src/presence.c b/src/presence.c
index f51779f..283a8c6 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -22,8 +22,8 @@
#include "presence.h"
#include <string.h>
+#include <telepathy-glib/channel-manager.h>
-#include "channel-manager.h"
#include "presence-cache.h"
#include "namespaces.h"
#include "util.h"
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 3d4f773..641de9b 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -1026,8 +1026,7 @@ gabble_private_tubes_factory_foreach_channel_class (
g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
value);
- func (manager, table, tubes_channel_required_properties,
- tubes_channel_optional_properties, user_data);
+ func (manager, table, tubes_channel_allowed_properties, user_data);
/* 1-1 Channel.Type.DBusTube */
table = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
@@ -1043,8 +1042,7 @@ gabble_private_tubes_factory_foreach_channel_class (
g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
value);
- func (manager, table, tubes_channel_required_properties,
- tubes_channel_optional_properties, user_data);
+ func (manager, table, tubes_channel_allowed_properties, user_data);
g_hash_table_destroy (table);
}
@@ -1062,7 +1060,7 @@ gabble_private_tubes_factory_requestotron (GabblePrivateTubesFactory *self,
TpHandle handle;
GError *error = NULL;
const gchar *channel_type;
- TpExportableChannel *channel;
+ GabbleTubesChannel *channel;
channel_type = tp_asv_get_string (request_properties,
TP_IFACE_CHANNEL ".ChannelType");
@@ -1112,7 +1110,7 @@ gabble_private_tubes_factory_requestotron (GabblePrivateTubesFactory *self,
}
tp_channel_manager_emit_request_already_satisfied (self,
- request_token, GABBLE_EXPORTABLE_CHANNEL (channel));
+ request_token, TP_EXPORTABLE_CHANNEL (channel));
return TRUE;
}
else
@@ -1140,15 +1138,15 @@ gabble_private_tubes_factory_requestotron (GabblePrivateTubesFactory *self,
else
request_tokens = NULL;
- gabble_channel_manager_emit_new_channel (self,
- GABBLE_EXPORTABLE_CHANNEL (new_channel), request_tokens);
+ tp_channel_manager_emit_new_channel (self,
+ TP_EXPORTABLE_CHANNEL (new_channel), request_tokens);
g_slist_free (request_tokens);
}
else
{
tp_channel_manager_emit_request_already_satisfied (self,
- request_token, GABBLE_EXPORTABLE_CHANNEL (channel));
+ request_token, TP_EXPORTABLE_CHANNEL (channel));
}
return TRUE;
diff --git a/src/tube-stream.c b/src/tube-stream.c
index d4c5149..0a37440 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -33,6 +33,7 @@
#include <loudmouth/loudmouth.h>
#include <telepathy-glib/channel-iface.h>
#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/exportable-channel.h>
#include <telepathy-glib/group-mixin.h>
#include <telepathy-glib/gtypes.h>
#include <telepathy-glib/interfaces.h>
@@ -48,7 +49,6 @@
#include "connection.h"
#include "debug.h"
#include "disco.h"
-#include "exportable-channel.h"
#include "gabble-signals-marshal.h"
#include "muc-channel.h"
#include "namespaces.h"
@@ -73,7 +73,7 @@ G_DEFINE_TYPE_WITH_CODE (GabbleTubeStream, gabble_tube_stream, G_TYPE_OBJECT,
NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
tp_external_group_mixin_iface_init);
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_EXPORTABLE_CHANNEL, NULL);
+ G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL));
static const gchar *gabble_tube_stream_interfaces[] = {
@@ -1037,7 +1037,7 @@ gabble_tube_stream_get_property (GObject *object,
break;
case PROP_CHANNEL_PROPERTIES:
g_value_set_boxed (value,
- gabble_tp_dbus_properties_mixin_make_properties_hash (object,
+ tp_dbus_properties_mixin_make_properties_hash (object,
TP_IFACE_CHANNEL, "TargetHandle",
TP_IFACE_CHANNEL, "TargetHandleType",
TP_IFACE_CHANNEL, "ChannelType",
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 4b8ee72..f31ccba 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -666,7 +666,7 @@ _emit_d_bus_names_changed_foreach_data
struct _ForeachData
{
- GabbleExportableChannelFunc foreach;
+ TpExportableChannelFunc foreach;
gpointer user_data;
};
@@ -678,11 +678,11 @@ foreach_slave (gpointer key,
GabbleTubeIface *tube = GABBLE_TUBE_IFACE (value);
struct _ForeachData *data = (struct _ForeachData *) user_data;
- data->foreach (GABBLE_EXPORTABLE_CHANNEL (tube), data->user_data);
+ data->foreach (TP_EXPORTABLE_CHANNEL (tube), data->user_data);
}
void gabble_tubes_channel_foreach (GabbleTubesChannel *self,
- GabbleExportableChannelFunc foreach, gpointer user_data)
+ TpExportableChannelFunc foreach, gpointer user_data)
{
struct _ForeachData data;
GabbleTubesChannelPrivate *priv = GABBLE_TUBES_CHANNEL_GET_PRIVATE (self);
diff --git a/src/tubes-channel.h b/src/tubes-channel.h
index 92f25a9..aca98c1 100644
--- a/src/tubes-channel.h
+++ b/src/tubes-channel.h
@@ -24,9 +24,9 @@
#include <loudmouth/loudmouth.h>
#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/exportable-channel.h>
#include "bytestream-iface.h"
-#include "exportable-channel.h"
#include "muc-channel.h"
#include "tube-iface.h"
@@ -70,7 +70,7 @@ GType gabble_tubes_channel_get_type (void);
GabbleTubesChannelClass))
void gabble_tubes_channel_foreach (GabbleTubesChannel *self,
- GabbleExportableChannelFunc foreach, gpointer user_data);
+ TpExportableChannelFunc foreach, gpointer user_data);
GabbleTubeIface *gabble_tubes_channel_tube_request (GabbleTubesChannel *self,
gpointer request_token, GHashTable *request_properties,
--
1.5.6.5
More information about the Telepathy-commits
mailing list