[Telepathy-commits] [telepathy-salut/master] Replaced Direction channel property with a incoming GObject property.

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 src/salut-file-channel.c |   31 ++++++++++++-------------------
 src/salut-ft-manager.c   |   11 +++++++----
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/salut-file-channel.c b/src/salut-file-channel.c
index f5ff924..27d3b81 100644
--- a/src/salut-file-channel.c
+++ b/src/salut-file-channel.c
@@ -90,7 +90,7 @@ enum
   PROP_CONNECTION,
   PROP_INTERFACES,
   PROP_XMPP_CONNECTION_MANAGER,
-  PROP_DIRECTION,
+  PROP_INCOMING,
   PROP_STATE,
   PROP_CONTENT_TYPE,
   PROP_FILENAME,
@@ -115,9 +115,9 @@ struct _SalutFileChannelPrivate {
   GibberXmppConnection *xmpp_connection;
   GibberFileTransfer *ft;
   glong last_transferred_bytes_emitted;
+  gboolean incoming;
 
   /* properties */
-  SalutFileTransferDirection direction;
   SalutFileTransferState state;
   gchar *content_type;
   gchar *filename;
@@ -193,8 +193,8 @@ salut_file_channel_get_property (GObject    *object,
       case PROP_XMPP_CONNECTION_MANAGER:
         g_value_set_object (value, self->priv->xmpp_connection_manager);
         break;
-      case PROP_DIRECTION:
-        g_value_set_uint (value, self->priv->direction);
+      case PROP_INCOMING:
+        g_value_set_boolean (value, self->priv->incoming);
         break;
       case PROP_STATE:
         g_value_set_uint (value, self->priv->state);
@@ -276,8 +276,8 @@ salut_file_channel_set_property (GObject *object,
       case PROP_TRANSFERRED_BYTES:
         self->priv->transferred_bytes = g_value_get_uint64 (value);
         break;
-      case PROP_DIRECTION:
-        self->priv->direction = g_value_get_uint (value);
+      case PROP_INCOMING:
+        self->priv->incoming = g_value_get_boolean (value);
         break;
       case PROP_CONTENT_TYPE:
         /* This should not be writeable with the new request API */
@@ -310,10 +310,6 @@ salut_file_channel_set_property (GObject *object,
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
     }
-
-  if (self->priv->direction == SALUT_FILE_TRANSFER_DIRECTION_OUTGOING)
-    salut_file_channel_check_and_send (SALUT_FILE_CHANNEL (object));
-
 }
 
 static GObject *
@@ -372,7 +368,6 @@ salut_file_channel_class_init (SalutFileChannelClass *salut_file_channel_class)
   };
 
   static TpDBusPropertiesMixinPropImpl file_props[] = {
-    { "Direction", "direction", NULL },
     { "State", "state", "state" },
     { "ContentType", "content-type", "content-type" },
     { "Filename", "filename", "filename" },
@@ -459,18 +454,16 @@ salut_file_channel_class_init (SalutFileChannelClass *salut_file_channel_class)
   g_object_class_install_property (object_class, PROP_XMPP_CONNECTION_MANAGER,
       param_spec);
 
-  param_spec = g_param_spec_uint (
-      "direction",
-      "SalutFileTransferDirection direction",
-      "Direction of the file transfer",
-      0,
-      G_MAXUINT,
-      G_MAXUINT,
+  param_spec = g_param_spec_boolean (
+      "incoming",
+      "incoming",
+      "Whether the transfer is incoming",
+      FALSE,
       G_PARAM_CONSTRUCT_ONLY |
       G_PARAM_READWRITE |
       G_PARAM_STATIC_NICK |
       G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_DIRECTION, param_spec);
+  g_object_class_install_property (object_class, PROP_INCOMING, param_spec);
 
   param_spec = g_param_spec_uint (
       "state",
diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index f251a75..e3ed15b 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -265,7 +265,7 @@ salut_ft_manager_new_channel (SalutFtManager *mgr,
   SalutContact *contact;
   const gchar *name;
   gchar *path = NULL;
-  guint direction, state;
+  guint state;
 
   /* Increasing guint to make sure object paths are random */
   static guint id = 0;
@@ -280,8 +280,10 @@ salut_ft_manager_new_channel (SalutFtManager *mgr,
 
   DEBUG ("%s channel requested", incoming ? "Incoming" : "Outgoing");
 
-  state = incoming ? SALUT_FILE_TRANSFER_STATE_LOCAL_PENDING : SALUT_FILE_TRANSFER_STATE_REMOTE_PENDING;
-  direction = incoming ? SALUT_FILE_TRANSFER_DIRECTION_INCOMING : SALUT_FILE_TRANSFER_DIRECTION_OUTGOING;
+  if (incoming)
+    state = SALUT_FILE_TRANSFER_STATE_LOCAL_PENDING;
+  else
+    state = SALUT_FILE_TRANSFER_STATE_NOT_OFFERED;
 
   name = tp_handle_inspect (handle_repo, handle);
   path = g_strdup_printf ("%s/FileChannel/%u/%u",
@@ -295,9 +297,10 @@ salut_ft_manager_new_channel (SalutFtManager *mgr,
                        "object-path", path,
                        "handle", handle,
                        "xmpp-connection-manager", priv->xmpp_connection_manager,
-                       "direction", direction,
+                       "incoming", incoming,
                        "state", state,
                        NULL);
+
   g_object_unref (contact);
   g_free (path);
   tp_channel_factory_iface_emit_new_channel (mgr, TP_CHANNEL_IFACE (chan),
-- 
1.5.6.5