[Telepathy-commits] [telepathy-gabble/master] change node name of buddy/activity view to OLPC_Channel_Type_{Buddy, Activity}_View
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Fri Oct 10 03:31:36 PDT 2008
---
extensions/OLPC_Channel_Type_ActivityView.xml | 2 +-
extensions/OLPC_Channel_Type_BuddyView.xml | 2 +-
src/olpc-activity-view.c | 10 +++++-----
src/olpc-buddy-view.c | 10 +++++-----
src/olpc-gadget-manager.c | 25 +++++++++++++------------
src/olpc-view.c | 2 +-
6 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/extensions/OLPC_Channel_Type_ActivityView.xml b/extensions/OLPC_Channel_Type_ActivityView.xml
index 860515e..8398474 100644
--- a/extensions/OLPC_Channel_Type_ActivityView.xml
+++ b/extensions/OLPC_Channel_Type_ActivityView.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<node name="/OLPC_Channel_Type_ActivityView" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/OLPC_Channel_Type_Activity_View" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<tp:copyright> Copyright (C) 2008 Collabora Limited </tp:copyright>
<tp:license xmlns="http://www.w3.org/1999/xhtml">
<p>This library is free software; you can redistribute it and/or
diff --git a/extensions/OLPC_Channel_Type_BuddyView.xml b/extensions/OLPC_Channel_Type_BuddyView.xml
index 676e291..c3c841d 100644
--- a/extensions/OLPC_Channel_Type_BuddyView.xml
+++ b/extensions/OLPC_Channel_Type_BuddyView.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<node name="/OLPC_Channel_Type_BuddyView" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/OLPC_Channel_Type_Buddy_View" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<tp:copyright> Copyright (C) 2008 Collabora Limited </tp:copyright>
<tp:license xmlns="http://www.w3.org/1999/xhtml">
<p>This library is free software; you can redistribute it and/or
diff --git a/src/olpc-activity-view.c b/src/olpc-activity-view.c
index fb4d12f..40a1d92 100644
--- a/src/olpc-activity-view.c
+++ b/src/olpc-activity-view.c
@@ -65,7 +65,7 @@ struct _GabbleOlpcActivityViewPrivate
G_DEFINE_TYPE_WITH_CODE (
GabbleOlpcActivityView, gabble_olpc_activity_view, GABBLE_TYPE_OLPC_VIEW,
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_OLPC_CHANNEL_TYPE_ACTIVITYVIEW,
+ G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW,
NULL);
);
@@ -128,7 +128,7 @@ gabble_olpc_activity_view_get_property (GObject *object,
{
case PROP_CHANNEL_TYPE:
g_value_set_static_string (value,
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW);
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW);
break;
case PROP_CHANNEL_PROPERTIES:
g_value_take_boxed (value,
@@ -143,8 +143,8 @@ gabble_olpc_activity_view_get_property (GObject *object,
GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "MaxSize",
GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "Buddies",
GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "Activities",
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW, "Properties",
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW, "Participants",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW, "Properties",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW, "Participants",
NULL));
break;
case PROP_VIEW_PROPERTIES:
@@ -412,7 +412,7 @@ gabble_olpc_activity_view_class_init (
{ NULL }
};
static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW,
+ { GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW,
tp_dbus_properties_mixin_getter_gobject_properties,
NULL,
activity_view_props,
diff --git a/src/olpc-buddy-view.c b/src/olpc-buddy-view.c
index 49e669f..7489fe0 100644
--- a/src/olpc-buddy-view.c
+++ b/src/olpc-buddy-view.c
@@ -65,7 +65,7 @@ struct _GabbleOlpcBuddyViewPrivate
G_DEFINE_TYPE_WITH_CODE (
GabbleOlpcBuddyView, gabble_olpc_buddy_view, GABBLE_TYPE_OLPC_VIEW,
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_OLPC_CHANNEL_TYPE_BUDDYVIEW,
+ G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_OLPC_CHANNEL_TYPE_BUDDY_VIEW,
NULL);
);
@@ -125,7 +125,7 @@ gabble_olpc_buddy_view_get_property (GObject *object,
{
case PROP_CHANNEL_TYPE:
g_value_set_static_string (value,
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW);
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW);
break;
case PROP_CHANNEL_PROPERTIES:
g_value_take_boxed (value,
@@ -140,8 +140,8 @@ gabble_olpc_buddy_view_get_property (GObject *object,
GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "MaxSize",
GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "Buddies",
GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "Activities",
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW, "Properties",
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW, "Alias",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW, "Properties",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW, "Alias",
NULL));
break;
case PROP_VIEW_PROPERTIES:
@@ -351,7 +351,7 @@ gabble_olpc_buddy_view_class_init (
{ NULL }
};
static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW,
+ { GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW,
tp_dbus_properties_mixin_getter_gobject_properties,
NULL,
buddy_view_props,
diff --git a/src/olpc-gadget-manager.c b/src/olpc-gadget-manager.c
index 17b691d..78e29e8 100644
--- a/src/olpc-gadget-manager.c
+++ b/src/olpc-gadget-manager.c
@@ -201,16 +201,16 @@ static const gchar * const olpc_gadget_channel_view_fixed_properties[] = {
static const gchar * const olpc_gadget_channel_buddy_view_allowed_properties[] =
{
GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW ".MaxSize",
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW ".Properties",
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW ".Alias",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW ".Properties",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW ".Alias",
NULL
};
static const gchar * const olpc_gadget_channel_activity_view_allowed_properties[] =
{
GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW ".MaxSize",
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW ".Properties",
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW ".Participants",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW ".Properties",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW ".Participants",
NULL
};
@@ -226,7 +226,7 @@ gabble_olpc_gadget_manager_foreach_channel_class (TpChannelManager *manager,
table = g_hash_table_new_full (g_str_hash, g_str_equal,
NULL, (GDestroyNotify) tp_g_value_slice_free);
value = tp_g_value_slice_new (G_TYPE_STRING);
- g_value_set_static_string (value, GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW);
+ g_value_set_static_string (value, GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW);
g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
func (manager, table, olpc_gadget_channel_buddy_view_allowed_properties,
@@ -238,7 +238,8 @@ gabble_olpc_gadget_manager_foreach_channel_class (TpChannelManager *manager,
table = g_hash_table_new_full (g_str_hash, g_str_equal,
NULL, (GDestroyNotify) tp_g_value_slice_free);
value = tp_g_value_slice_new (G_TYPE_STRING);
- g_value_set_static_string (value, GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW);
+ g_value_set_static_string (value,
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW);
g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
func (manager, table, olpc_gadget_channel_activity_view_allowed_properties,
@@ -325,11 +326,11 @@ create_buddy_view_channel (GabbleOlpcGadgetManager *self,
}
properties = tp_asv_get_boxed (request_properties,
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW ".Properties",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW ".Properties",
TP_HASH_TYPE_STRING_VARIANT_MAP);
alias = tp_asv_get_string (request_properties,
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW ".Alias");
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW ".Alias");
object_path = g_strdup_printf ("%s/OlpcBuddyViewChannel%u", conn->object_path,
self->priv->next_view_number++);
@@ -397,11 +398,11 @@ create_activity_view_channel (GabbleOlpcGadgetManager *self,
}
properties = tp_asv_get_boxed (request_properties,
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW ".Properties",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW ".Properties",
TP_HASH_TYPE_STRING_VARIANT_MAP);
participants = tp_asv_get_boxed (request_properties,
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW ".Participants",
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW ".Participants",
GABBLE_ARRAY_TYPE_HANDLE);
object_path = g_strdup_printf ("%s/OlpcActivityViewChannel%u",
@@ -428,13 +429,13 @@ gabble_olpc_gadget_manager_handle_request (TpChannelManager *manager,
if (!tp_strdiff (tp_asv_get_string (request_properties,
TP_IFACE_CHANNEL ".ChannelType"),
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW))
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW))
{
channel = create_buddy_view_channel (self, request_properties, &error);
}
else if (!tp_strdiff (tp_asv_get_string (request_properties,
TP_IFACE_CHANNEL ".ChannelType"),
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITYVIEW))
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_ACTIVITY_VIEW))
{
channel = create_activity_view_channel (self, request_properties, &error);
}
diff --git a/src/olpc-view.c b/src/olpc-view.c
index 21bb126..78efc0d 100644
--- a/src/olpc-view.c
+++ b/src/olpc-view.c
@@ -614,7 +614,7 @@ gabble_olpc_view_get_channel_type (TpSvcChannel *iface,
DBusGMethodInvocation *context)
{
tp_svc_channel_return_from_get_channel_type (context,
- GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDYVIEW);
+ GABBLE_IFACE_OLPC_CHANNEL_TYPE_BUDDY_VIEW);
}
/**
--
1.5.6.5
More information about the Telepathy-commits
mailing list