[Telepathy-commits] [telepathy-salut/master] Use salut_file_channel_set_state where possible.

[Jonny Lamb]

20080721192923-8ed0e-1c459c38302264367b6d1b7d3017a50b1c38b879.gz
---
 src/salut-file-channel.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/salut-file-channel.c b/src/salut-file-channel.c
index 549d8ff..9fc2803 100644
--- a/src/salut-file-channel.c
+++ b/src/salut-file-channel.c
@@ -269,7 +269,9 @@ salut_file_channel_set_property (GObject *object,
         g_object_ref (self->priv->xmpp_connection_manager);
         break;
       case PROP_STATE:
-        self->priv->state = g_value_get_uint (value);
+        salut_file_channel_set_state (SALUT_SVC_CHANNEL_TYPE_FILE (object),
+                                      g_value_get_uint (value),
+                                      SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
         break;
       case PROP_TRANSFERRED_BYTES:
         self->priv->state = g_value_get_uint64 (value);
@@ -756,17 +758,18 @@ static void
 ft_finished_cb (GibberFileTransfer *ft,
                 SalutFileChannel *self)
 {
+  salut_file_channel_set_state (SALUT_SVC_CHANNEL_TYPE_FILE (self),
+                                SALUT_FILE_TRANSFER_STATE_COMPLETED,
+                                SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
 }
 
 static void
 remote_accepted_cb (GibberFileTransfer *ft,
                     SalutFileChannel *self)
 {
-  guint id;
-  SalutFileChannelClass *class = SALUT_FILE_CHANNEL_CLASS (self);
-
-  id = GPOINTER_TO_INT (g_hash_table_lookup (self->priv->name_to_id, ft->id));
-  g_object_set_data (G_OBJECT (class), "state", (gpointer) SALUT_FILE_TRANSFER_STATE_OPEN);
+  salut_file_channel_set_state (SALUT_SVC_CHANNEL_TYPE_FILE (self),
+                                SALUT_FILE_TRANSFER_STATE_OPEN,
+                                SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
 
   g_signal_connect (ft, "finished", G_CALLBACK (ft_finished_cb), self);
 }
-- 
1.5.6.5