always use empathy_tp_chat_leave instead of _close

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 3c613245c7e49e2a924c80359fc700e094e541ee..a7f23b2f51ffb05beefca56778d66af7f430317a 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1151,7 +1151,7 @@ tp_chat_got_remote_contact_cb (EmpathyTpContactFactory *factory,
 
        if (error) {
                DEBUG ("Error: %s", error->message);
-               empathy_tp_chat_close (EMPATHY_TP_CHAT (chat));
+               empathy_tp_chat_leave (EMPATHY_TP_CHAT (chat));
                return;
        }
 
@@ -1172,7 +1172,7 @@ tp_chat_got_self_contact_cb (EmpathyTpContactFactory *factory,
 
        if (error) {
                DEBUG ("Error: %s", error->message);
-               empathy_tp_chat_close (EMPATHY_TP_CHAT (chat));
+               empathy_tp_chat_leave (EMPATHY_TP_CHAT (chat));
                return;
        }
 
@@ -1505,7 +1505,7 @@ empathy_tp_chat_new (TpChannel *channel)
                             NULL);
 }
 
-void
+static void
 empathy_tp_chat_close (EmpathyTpChat *chat) {
        EmpathyTpChatPriv *priv = GET_PRIV (chat);
 

diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index 37d6d68f9f11c05376c4b0ad4405cda5a1873724..fd9724037d8b155c83069134234a94c26db0cea2 100644 (file)
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -61,7 +61,6 @@ typedef struct {
 
 GType          empathy_tp_chat_get_type             (void) G_GNUC_CONST;
 EmpathyTpChat *empathy_tp_chat_new                  (TpChannel          *channel);
-void           empathy_tp_chat_close                (EmpathyTpChat      *chat);
 const gchar *  empathy_tp_chat_get_id               (EmpathyTpChat      *chat);
 EmpathyContact *empathy_tp_chat_get_remote_contact   (EmpathyTpChat      *chat);
 TpChannel *    empathy_tp_chat_get_channel          (EmpathyTpChat      *chat);

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 86bcc8fcfd84c93d4e275abf8a4164ee2068dfb8..c4ab4ad78b02df8b15b55d045a599344b221f1ac 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -540,7 +540,7 @@ invite_dialog_response_cb (GtkDialog *dialog,
       DEBUG ("Muc invitation rejected");
 
       if (empathy_dispatch_operation_claim (approval->operation))
-        empathy_tp_chat_close (tp_chat);
+        empathy_tp_chat_leave (tp_chat);
       return;
     }