More dynamic smiley managment and more efficient algorithm to detect

2007-09-08  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-chat-view.h:
	* libempathy-gtk/empathy-ui-utils.c:
	* libempathy-gtk/empathy-ui-utils.h:
	* libempathy-gtk/empathy-chat.c:
	* libempathy-gtk/empathy-smiley-manager.c:
	* libempathy-gtk/empathy-smiley-manager.h:
	* libempathy-gtk/Makefile.am:
	* libempathy-gtk/empathy-chat-window.c:
	* libempathy-gtk/empathy-chat-view.c: More dynamic smiley managment and
	more efficient algorithm to detect smileys in messages.

	* doc/: Updated


svn path=/trunk/; revision=285

1 files changed, 42 insertions, 76 deletions

diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
index 4478e2116..370c8dd85 100644
--- a/libempathy-gtk/empathy-chat-view.h
+++ b/libempathy-gtk/empathy-chat-view.h
@@ -52,82 +52,48 @@ struct _EmpathyChatViewClass {
 	GtkTextViewClass parent_class;
 };
 
-typedef enum {
-	EMPATHY_SMILEY_NORMAL,       /*  :)   */
-	EMPATHY_SMILEY_WINK,         /*  ;)   */
-	EMPATHY_SMILEY_BIGEYE,       /*  =)   */
-	EMPATHY_SMILEY_NOSE,         /*  :-)  */
-	EMPATHY_SMILEY_CRY,          /*  :'(  */
-	EMPATHY_SMILEY_SAD,          /*  :(   */
-	EMPATHY_SMILEY_SCEPTICAL,    /*  :/   */
-	EMPATHY_SMILEY_BIGSMILE,     /*  :D   */
-	EMPATHY_SMILEY_INDIFFERENT,  /*  :|   */
-	EMPATHY_SMILEY_TOUNGE,       /*  :p   */
-	EMPATHY_SMILEY_SHOCKED,      /*  :o   */
-	EMPATHY_SMILEY_COOL,         /*  8)   */
-	EMPATHY_SMILEY_SORRY,        /*  *|   */
-	EMPATHY_SMILEY_KISS,         /*  :*   */
-	EMPATHY_SMILEY_SHUTUP,       /*  :#   */
-	EMPATHY_SMILEY_YAWN,         /*  |O   */
-	EMPATHY_SMILEY_CONFUSED,     /*  :$   */
-	EMPATHY_SMILEY_ANGEL,        /*  <)   */
-	EMPATHY_SMILEY_OOOH,         /*  :x   */
-	EMPATHY_SMILEY_LOOKAWAY,     /*  *)   */
-	EMPATHY_SMILEY_BLUSH,        /*  *S   */
-	EMPATHY_SMILEY_COOLBIGSMILE, /*  8D   */
-	EMPATHY_SMILEY_ANGRY,        /*  :@   */
-	EMPATHY_SMILEY_BOSS,         /*  @)   */
-	EMPATHY_SMILEY_MONKEY,       /*  #)   */
-	EMPATHY_SMILEY_SILLY,        /*  O)   */
-	EMPATHY_SMILEY_SICK,         /*  +o(  */
-
-	EMPATHY_SMILEY_COUNT
-} EmpathySmiley;
-
-GType           empathy_chat_view_get_type                  (void) G_GNUC_CONST;
-EmpathyChatView *empathy_chat_view_new                       (void);
-void            empathy_chat_view_append_message            (EmpathyChatView *view,
-							    EmpathyMessage  *msg);
-void            empathy_chat_view_append_event              (EmpathyChatView *view,
-							    const gchar    *str);
-void            empathy_chat_view_append_button             (EmpathyChatView *view,
-							    const gchar    *message,
-							    GtkWidget      *button1,
-							    GtkWidget      *button2);
-void            empathy_chat_view_set_margin                (EmpathyChatView *view,
-							    gint            margin);
-void            empathy_chat_view_scroll                    (EmpathyChatView *view,
-							    gboolean        allow_scrolling);
-void            empathy_chat_view_scroll_down               (EmpathyChatView *view);
-gboolean        empathy_chat_view_get_selection_bounds      (EmpathyChatView *view,
-							    GtkTextIter    *start,
-							    GtkTextIter    *end);
-void            empathy_chat_view_clear                     (EmpathyChatView *view);
-gboolean        empathy_chat_view_find_previous             (EmpathyChatView *view,
-							    const gchar    *search_criteria,
-							    gboolean        new_search);
-gboolean        empathy_chat_view_find_next                 (EmpathyChatView *view,
-							    const gchar    *search_criteria,
-							    gboolean        new_search);
-void            empathy_chat_view_find_abilities            (EmpathyChatView *view,
-							    const gchar    *search_criteria,
-							    gboolean       *can_do_previous,
-							    gboolean       *can_do_next);
-void            empathy_chat_view_highlight                 (EmpathyChatView *view,
-							    const gchar    *text);
-void            empathy_chat_view_copy_clipboard            (EmpathyChatView *view);
-gboolean        empathy_chat_view_get_irc_style             (EmpathyChatView *view);
-void            empathy_chat_view_set_irc_style             (EmpathyChatView *view,
-							    gboolean        irc_style);
-void            empathy_chat_view_set_margin                (EmpathyChatView *view,
-							    gint            margin);
-GdkPixbuf *     empathy_chat_view_get_smiley_image          (EmpathySmiley    smiley);
-const gchar *   empathy_chat_view_get_smiley_text           (EmpathySmiley    smiley);
-GtkWidget *     empathy_chat_view_get_smiley_menu           (GCallback       callback,
-							    gpointer        user_data,
-							    GtkTooltips    *tooltips);
-void            empathy_chat_view_set_is_group_chat         (EmpathyChatView *view,
-							    gboolean        is_group_chat);
+GType            empathy_chat_view_get_type             (void) G_GNUC_CONST;
+EmpathyChatView *empathy_chat_view_new                  (void);
+void             empathy_chat_view_append_message       (EmpathyChatView *view,
+							 EmpathyMessage  *msg);
+void             empathy_chat_view_append_event         (EmpathyChatView *view,
+							 const gchar     *str);
+void             empathy_chat_view_append_button        (EmpathyChatView *view,
+							 const gchar     *message,
+							 GtkWidget       *button1,
+							 GtkWidget       *button2);
+void             empathy_chat_view_set_margin           (EmpathyChatView *view,
+							 gint             margin);
+void             empathy_chat_view_scroll               (EmpathyChatView *view,
+							 gboolean         allow_scrolling);
+void             empathy_chat_view_scroll_down          (EmpathyChatView *view);
+gboolean         empathy_chat_view_get_selection_bounds (EmpathyChatView *view,
+							 GtkTextIter     *start,
+							 GtkTextIter     *end);
+void             empathy_chat_view_clear                (EmpathyChatView *view);
+gboolean         empathy_chat_view_find_previous        (EmpathyChatView *view,
+							 const gchar     *search_criteria,
+							 gboolean         new_search);
+gboolean         empathy_chat_view_find_next            (EmpathyChatView *view,
+							 const gchar     *search_criteria,
+							 gboolean         new_search);
+void             empathy_chat_view_find_abilities       (EmpathyChatView *view,
+							 const gchar     *search_criteria,
+							 gboolean        *can_do_previous,
+							 gboolean        *can_do_next);
+void             empathy_chat_view_highlight            (EmpathyChatView *view,
+							 const gchar     *text);
+void             empathy_chat_view_copy_clipboard       (EmpathyChatView *view);
+gboolean         empathy_chat_view_get_irc_style        (EmpathyChatView *view);
+void             empathy_chat_view_set_irc_style        (EmpathyChatView *view,
+							 gboolean         irc_style);
+void             empathy_chat_view_set_margin           (EmpathyChatView *view,
+							 gint             margin);
+GtkWidget *      empathy_chat_view_get_smiley_menu      (GCallback        callback,
+							 gpointer         user_data,
+							 GtkTooltips     *tooltips);
+void             empathy_chat_view_set_is_group_chat    (EmpathyChatView *view,
+							 gboolean         is_group_chat);
 
 G_END_DECLS