From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 19 Feb 2010 16:02:31 +0000 (+0000)
Subject: always use empathy_tp_chat_leave instead of _close
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=d5a96cec5e4cf549a86f5b331f77c9c09abe02a3

always use empathy_tp_chat_leave instead of _close
---

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 3c613245..a7f23b2f 100644
--- 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 37d6d68f..fd972403 100644
--- 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 86bcc8fc..c4ab4ad7 100644
--- 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;
     }