[Telepathy-commits] [telepathy-salut/master] SalutTubesChannel: Fix bad conflict resolution

[Alban Crequy]

---
 src/salut-tubes-channel.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index 8f94b24..d980873 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -330,17 +330,6 @@ salut_tubes_channel_get_property (GObject *object,
         break;
       case PROP_REQUESTED:
         g_value_set_boolean (value, (priv->initiator != priv->self_handle));
-      case PROP_CHANNEL_DESTROYED:
-        g_value_set_boolean (value, priv->closed);
-        break;
-      case PROP_CHANNEL_PROPERTIES:
-        g_value_take_boxed (value,
-            tp_dbus_properties_mixin_make_properties_hash (object,
-                TP_IFACE_CHANNEL, "TargetHandle",
-                TP_IFACE_CHANNEL, "TargetHandleType",
-                TP_IFACE_CHANNEL, "ChannelType",
-                TP_IFACE_CHANNEL, "TargetID",
-                NULL));
         break;
       case PROP_CHANNEL_DESTROYED:
         g_value_set_boolean (value, priv->closed);
-- 
1.5.6.5