diff options
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-new-message-dialog.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 8 | ||||
| -rw-r--r-- | libempathy/empathy-dispatcher.h | 5 | ||||
| -rw-r--r-- | src/empathy-chat-manager.c | 2 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 2 |
6 files changed, 9 insertions, 13 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index dd140587c..399f0cc9b 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -248,8 +248,7 @@ reconnected_connection_ready_cb (TpConnection *connection, switch (priv->handle_type) { case TP_HANDLE_TYPE_CONTACT: empathy_dispatcher_chat_with_contact_id ( - connection, priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION, - NULL, NULL); + connection, priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION); break; case TP_HANDLE_TYPE_ROOM: empathy_dispatcher_join_muc (connection, diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 21480a787..6cdab4654 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -71,7 +71,7 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id) if (EMP_STR_EMPTY (contact_id) || connection == NULL) goto out; empathy_dispatcher_chat_with_contact_id (connection, contact_id, - gtk_get_current_event_time (), NULL, NULL); + gtk_get_current_event_time ()); out: gtk_widget_destroy (GTK_WIDGET (dialog)); diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 1cec0e9d8..09630e674 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -1309,9 +1309,7 @@ dispatcher_chat_with_contact_id_cb (TpConnection *connection, void empathy_dispatcher_chat_with_contact_id (TpConnection *connection, const gchar *contact_id, - gint64 timestamp, - EmpathyDispatcherRequestCb *callback, - gpointer user_data) + gint64 timestamp) { EmpathyDispatcher *self; ChatWithContactIdData *data; @@ -1322,8 +1320,8 @@ empathy_dispatcher_chat_with_contact_id (TpConnection *connection, self = empathy_dispatcher_dup_singleton (); data = g_slice_new0 (ChatWithContactIdData); data->dispatcher = self; - data->callback = callback; - data->user_data = user_data; + data->callback = NULL; + data->user_data = NULL; data->timestamp = timestamp; empathy_tp_contact_factory_get_from_id (connection, contact_id, dispatcher_chat_with_contact_id_cb, data, NULL, NULL); diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h index 1cc39cfbb..d49aa2dad 100644 --- a/libempathy/empathy-dispatcher.h +++ b/libempathy/empathy-dispatcher.h @@ -77,9 +77,8 @@ void empathy_dispatcher_create_channel (EmpathyDispatcher *dispatcher, /* Requesting 1 to 1 text channels */ void empathy_dispatcher_chat_with_contact_id (TpConnection *connection, const gchar *contact_id, - gint64 timestamp, - EmpathyDispatcherRequestCb *callback, - gpointer user_data); + gint64 timestamp); + void empathy_dispatcher_chat_with_contact (EmpathyContact *contact, gint64 timestamp, EmpathyDispatcherRequestCb *callback, diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 3c66e36e5..0a16be90d 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -392,7 +392,7 @@ connection_ready_cb (TpConnection *connection, EMPATHY_DISPATCHER_NON_USER_ACTION); else empathy_dispatcher_chat_with_contact_id (connection, data->id, - EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL); + EMPATHY_DISPATCHER_NON_USER_ACTION); g_signal_emit (self, signals[CHATS_CHANGED], 0, g_queue_get_length (priv->queue)); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index e80d38298..93c1ab773 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1744,7 +1744,7 @@ chat_window_drag_data_received (GtkWidget *widget, if (connection) { empathy_dispatcher_chat_with_contact_id ( - connection, contact_id, gtk_get_current_event_time (), NULL, NULL); + connection, contact_id, gtk_get_current_event_time ()); } g_strfreev (strv); |