Merge branch 'gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-share-my-desktop.c

diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index a630fc2a567d926a0693824726d159ae31ea6a93..9c29533c7d8e2a00bee4c58d4698c452176f22c2 100644 (file)
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -18,21 +18,11 @@
  * Authors: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
  */
 
-#include <gtk/gtk.h>
-
-#include <dbus/dbus-glib.h>
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/contact.h>
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/interfaces.h>
-
-#include <libempathy/empathy-dispatcher.h>
+#include "config.h"
+#include "empathy-share-my-desktop.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-share-my-desktop.h"
+#include "empathy-debug.h"
 
 static void
 create_tube_channel_cb (GObject *source,
@@ -77,7 +67,7 @@ empathy_share_my_desktop_share_with_contact (EmpathyContact *contact)
       NULL);
 
   req = tp_account_channel_request_new (empathy_contact_get_account (contact),
-      request, EMPATHY_DISPATCHER_CURRENT_TIME);
+      request, TP_USER_ACTION_TIME_CURRENT_TIME);
 
   tp_account_channel_request_create_channel_async (req, NULL, NULL,
       create_tube_channel_cb, NULL);