Cleanup chat objects API and request a new Text channel if account gets

2007-12-03  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-chat-window.c:
	* libempathy-gtk/empathy-chat.c:
	* libempathy-gtk/empathy-chat.h:
	* libempathy-gtk/empathy-group-chat.c:
	* libempathy-gtk/empathy-group-chat.h:
	* libempathy-gtk/empathy-private-chat.c:
	* libempathy-gtk/empathy-private-chat.h:
	* libempathy/empathy-tp-chat.c:
	* libempathy/empathy-tp-chat.h:
	* python/pyempathy/pyempathy.defs:
	* python/pyempathygtk/pyempathygtk.defs:
	* src/empathy-chat-chandler.c: Cleanup chat objects API and request a
	new Text channel if account gets reconnected.

svn path=/trunk/; revision=461

1 files changed, 37 insertions, 40 deletions

diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index c030dd292..5bf456e48 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -56,11 +56,8 @@ struct _EmpathyChat {
 	GObject          parent;
 
 	/* Protected */
-	EmpathyChatView  *view;
-	EmpathyTpChat   *tp_chat;
+	EmpathyChatView *view;
 	GtkWidget       *input_text_view;
-	gboolean         is_first_char;
-	McAccount       *account;
 };
 
 struct _EmpathyChatClass {
@@ -78,47 +75,47 @@ struct _EmpathyChatClass {
 						 GdkEventKey   *event);
 };
 
-GType             empathy_chat_get_type              (void);
+GType              empathy_chat_get_type              (void);
 
 EmpathyChatView *  empathy_chat_get_view              (EmpathyChat       *chat);
 EmpathyChatWindow *empathy_chat_get_window            (EmpathyChat       *chat);
-void              empathy_chat_set_window            (EmpathyChat       *chat,
-						     EmpathyChatWindow *window);
-void              empathy_chat_present               (EmpathyChat       *chat);
-void              empathy_chat_clear                 (EmpathyChat       *chat);
-void              empathy_chat_scroll_down           (EmpathyChat       *chat);
-void              empathy_chat_cut                   (EmpathyChat       *chat);
-void              empathy_chat_copy                  (EmpathyChat       *chat);
-void              empathy_chat_paste                 (EmpathyChat       *chat);
-const gchar *     empathy_chat_get_name              (EmpathyChat       *chat);
-gchar *           empathy_chat_get_tooltip           (EmpathyChat       *chat);
-const gchar *     empathy_chat_get_status_icon_name  (EmpathyChat       *chat);
-GtkWidget *       empathy_chat_get_widget            (EmpathyChat       *chat);
-gboolean          empathy_chat_is_group_chat         (EmpathyChat       *chat);
-gboolean          empathy_chat_is_connected          (EmpathyChat       *chat);
-
-void              empathy_chat_save_geometry         (EmpathyChat       *chat,
-						     gint              x,
-						     gint              y,
-						     gint              w,
-						     gint              h);
-void              empathy_chat_load_geometry         (EmpathyChat       *chat,
-						     gint             *x,
-						     gint             *y,
-						     gint             *w,
-						     gint             *h);
-void              empathy_chat_set_tp_chat           (EmpathyChat       *chat,
-						     EmpathyTpChat    *tp_chat);
-const gchar *     empathy_chat_get_id                (EmpathyChat       *chat);
+void               empathy_chat_set_window            (EmpathyChat       *chat,
+						       EmpathyChatWindow *window);
+void               empathy_chat_present               (EmpathyChat       *chat);
+void               empathy_chat_clear                 (EmpathyChat       *chat);
+void               empathy_chat_scroll_down           (EmpathyChat       *chat);
+void               empathy_chat_cut                   (EmpathyChat       *chat);
+void               empathy_chat_copy                  (EmpathyChat       *chat);
+void               empathy_chat_paste                 (EmpathyChat       *chat);
+const gchar *      empathy_chat_get_name              (EmpathyChat       *chat);
+gchar *            empathy_chat_get_tooltip           (EmpathyChat       *chat);
+const gchar *      empathy_chat_get_status_icon_name  (EmpathyChat       *chat);
+GtkWidget *        empathy_chat_get_widget            (EmpathyChat       *chat);
+gboolean           empathy_chat_is_group_chat         (EmpathyChat       *chat);
+gboolean           empathy_chat_is_connected          (EmpathyChat       *chat);
+void               empathy_chat_save_geometry         (EmpathyChat       *chat,
+						       gint               x,
+						       gint               y,
+						       gint               w,
+						       gint               h);
+void               empathy_chat_load_geometry         (EmpathyChat       *chat,
+						       gint              *x,
+						       gint              *y,
+						       gint              *w,
+						       gint              *h);
+void               empathy_chat_set_tp_chat           (EmpathyChat       *chat,
+						       EmpathyTpChat     *tp_chat);
+const gchar *      empathy_chat_get_id                (EmpathyChat       *chat);
+McAccount *        empathy_chat_get_account           (EmpathyChat       *chat);
 
 /* For spell checker dialog to correct the misspelled word. */
-gboolean          empathy_chat_get_is_command        (const gchar      *str);
-void              empathy_chat_correct_word          (EmpathyChat       *chat,
-						     GtkTextIter       start,
-						     GtkTextIter       end,
-						     const gchar      *new_word);
-gboolean          empathy_chat_should_play_sound     (EmpathyChat       *chat);
-gboolean          empathy_chat_should_highlight_nick (EmpathyMessage    *message);
+gboolean           empathy_chat_get_is_command        (const gchar      *str);
+void               empathy_chat_correct_word          (EmpathyChat       *chat,
+						       GtkTextIter       start,
+						       GtkTextIter       end,
+						       const gchar      *new_word);
+gboolean           empathy_chat_should_play_sound     (EmpathyChat       *chat);
+gboolean           empathy_chat_should_highlight_nick (EmpathyMessage    *message);
 
 G_END_DECLS