re-implement empathy_dispatcher_chat_with_contact using empathy_dispatcher_chat_with_...

We don't use the callback arg anyway.

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index f36718c839982f3873ec3a5cb07ddb5408b21811..ce586420e0c1c917dc1f03614bc557bf480e396a 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -892,7 +892,7 @@ contact_list_view_row_activated (GtkTreeView       *view,
        if (contact) {
                DEBUG ("Starting a chat");
                empathy_dispatcher_chat_with_contact (contact,
-                       gtk_get_current_event_time (), NULL, NULL);
+                       gtk_get_current_event_time ());
                g_object_unref (contact);
        }
 }

diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index a75fe8fabf17cb5e1a2712950a5549cf6c45077a..65162255464bd29c07b7c75731ec5382a1c49875 100644 (file)
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -216,8 +216,7 @@ static void
 empathy_contact_chat_menu_item_activated (GtkMenuItem *item,
        EmpathyContact *contact)
 {
-  empathy_dispatcher_chat_with_contact (contact, gtk_get_current_event_time (),
-      NULL, NULL);
+  empathy_dispatcher_chat_with_contact (contact, gtk_get_current_event_time ());
 }
 
 GtkWidget *

diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index c3edf06c7c4a48b56c782892f803ff6b8b67548a..092208b612f329db740e1d8ce934e5a26b79491c 100644 (file)
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -245,8 +245,7 @@ empathy_individual_chat_menu_item_activated (GtkMenuItem *item,
 
   g_return_if_fail (contact != NULL);
 
-  empathy_dispatcher_chat_with_contact (contact, gtk_get_current_event_time (),
-      NULL, NULL);
+  empathy_dispatcher_chat_with_contact (contact, gtk_get_current_event_time ());
 
   g_object_unref (contact);
 }

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 83811750be34e31a7939da3fa6f4fab825feb2a2..716886dbc6e5dfe6d5813ac0a8924404ad2b7fee 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -925,7 +925,7 @@ individual_view_row_activated (GtkTreeView *view,
       DEBUG ("Starting a chat");
 
       empathy_dispatcher_chat_with_contact (contact,
-          gtk_get_current_event_time (), NULL, NULL);
+          gtk_get_current_event_time ());
     }
 
   g_object_unref (individual);

diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index ae8cdb11995e776188923668b00275d4f78be4f1..e5abfde8ba5eecb59b037670fa1b9664c7c176f5 100644 (file)
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1225,49 +1225,11 @@ dispatcher_request_channel (DispatcherRequestData *request_data)
 
 void
 empathy_dispatcher_chat_with_contact (EmpathyContact *contact,
-                                      gint64 timestamp,
-                                      EmpathyDispatcherRequestCb *callback,
-                                      gpointer user_data)
+    gint64 timestamp)
 {
-  EmpathyDispatcher *self;
-  EmpathyDispatcherPriv *priv;
-  TpConnection *connection;
-  ConnectionData *connection_data;
-  DispatcherRequestData *request_data;
-
-  g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-
-  self = empathy_dispatcher_dup_singleton ();
-  priv = GET_PRIV (self);
-
-  connection = empathy_contact_get_connection (contact);
-  connection_data = g_hash_table_lookup (priv->connections, connection);
-  if (connection_data == NULL)
-    {
-      /* Connection has been invalidated */
-      if (callback != NULL)
-        {
-          GError error = { TP_DBUS_ERRORS, TP_DBUS_ERROR_PROXY_UNREFERENCED,
-              "Connection has been invalidated" };
-          callback (NULL, &error, user_data);
-        }
-      goto out;
-    }
-
-  /* The contact handle might not be known yet */
-  request_data = new_dispatcher_request_data (self, connection,
-    TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_CONTACT,
-    empathy_contact_get_handle (contact), NULL, timestamp, contact,
-    callback, user_data);
-  request_data->should_ensure = TRUE;
-
-  connection_data->outstanding_requests = g_list_prepend
-    (connection_data->outstanding_requests, request_data);
-
-  dispatcher_request_channel (request_data);
-
-out:
-  g_object_unref (self);
+  empathy_dispatcher_chat_with_contact_id (
+      empathy_contact_get_account (contact), empathy_contact_get_id (contact),
+      timestamp);
 }
 
 static void

diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h
index 1fa6387f7c6fa5b2e3e925c6f998bc91ff2a4072..918a4286a5bcd13c44071a3b4e2e4f51b73d9882 100644 (file)
--- a/libempathy/empathy-dispatcher.h
+++ b/libempathy/empathy-dispatcher.h
@@ -80,9 +80,7 @@ void empathy_dispatcher_chat_with_contact_id (TpAccount *account,
   gint64 timestamp);
 
 void  empathy_dispatcher_chat_with_contact (EmpathyContact *contact,
-  gint64 timestamp,
-  EmpathyDispatcherRequestCb *callback,
-  gpointer user_data);
+  gint64 timestamp);
 
 /* Request a muc channel */
 void empathy_dispatcher_join_muc (TpConnection *connection,

diff --git a/tests/interactive/empetit.c b/tests/interactive/empetit.c
index 7bcaf03eea0fe6f65ddb292369ed26028cc34891..3ed5998ac60dfe1bbf60e2f8c7d0da3dfbaff731 100644 (file)
--- a/tests/interactive/empetit.c
+++ b/tests/interactive/empetit.c
@@ -11,25 +11,6 @@
 
 static GtkWidget *window = NULL;
 
-static void
-chat_cb (EmpathyDispatchOperation *dispatch,
-         const GError *error,
-         gpointer user_data)
-{
-  GtkWidget *dialog;
-
-  if (error != NULL)
-    {
-      dialog = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_MODAL,
-          GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s",
-          error->message ? error->message : "No error message");
-
-      gtk_dialog_run (GTK_DIALOG (dialog));
-    }
-
-  gtk_widget_destroy (window);
-}
-
 static void
 clicked_cb (GtkButton *button,
             gpointer data)
@@ -42,8 +23,7 @@ clicked_cb (GtkButton *button,
   if (!contact)
     return;
 
-  empathy_dispatcher_chat_with_contact (contact, gtk_get_current_event_time (),
-      chat_cb, NULL);
+  empathy_dispatcher_chat_with_contact (contact, gtk_get_current_event_time ());
 
   g_object_unref (contact);
 }