empathy-tp-file: reorder FileTransfer D-Bus properties using the same order as in...

svn path=/trunk/; revision=1857

diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index e424bdfb719c6d640ef75f0ce9cd763d007e45d6..9cfdb3371c1c8fc79e6592398885759c26d0afa9 100644 (file)
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -283,18 +283,21 @@ struct _EmpathyTpFilePriv {
   GFile *gfile;
   GInputStream *in_stream;
   GOutputStream *out_stream;
   GFile *gfile;
   GInputStream *in_stream;
   GOutputStream *out_stream;

-  gboolean incoming;
-  gchar *filename;
+
+  /* org.freedesktop.Telepathy.Channel.Type.FileTransfer D-Bus properties */

   EmpFileTransferState state;
   EmpFileTransferState state;

-  EmpFileTransferStateChangeReason state_change_reason;
+  gchar *content_type;
+  gchar *filename;

   guint64 size;
   guint64 size;

+  EmpFileHashType content_hash_type;
+  gchar *content_hash;
+  gchar *description;

   guint64 transferred_bytes;
   guint64 transferred_bytes;

+
+  gboolean incoming;
+  EmpFileTransferStateChangeReason state_change_reason;

   time_t start_time;
   gchar *unix_socket_path;
   time_t start_time;
   gchar *unix_socket_path;

-  gchar *content_hash;
-  EmpFileHashType content_hash_type;
-  gchar *content_type;
-  gchar *description;

   GCancellable *cancellable;
 };
 
   GCancellable *cancellable;
 };