From f4baf76f9afbd61833398e6f2465d54199e263f7 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@gmail.com>
Date: Sat, 8 Sep 2007 13:38:42 +0000
Subject: 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
---
 doc/libempathy-gtk/libempathy-gtk-docs.sgml    |  1 +
 doc/libempathy-gtk/libempathy-gtk.types        |  3 +-
 doc/libempathy-gtk/tmpl/empathy-chat-view.sgml | 52 --------------------------
 doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml  | 10 -----
 4 files changed, 3 insertions(+), 63 deletions(-)

(limited to 'doc')

diff --git a/doc/libempathy-gtk/libempathy-gtk-docs.sgml b/doc/libempathy-gtk/libempathy-gtk-docs.sgml
index 715a18bf4..05f9bd2bc 100644
--- a/doc/libempathy-gtk/libempathy-gtk-docs.sgml
+++ b/doc/libempathy-gtk/libempathy-gtk-docs.sgml
@@ -24,6 +24,7 @@
     <xi:include href="xml/empathy-preferences.xml"/>
     <xi:include href="xml/empathy-status-presets.xml"/>
     <xi:include href="xml/empathy-account-widget-generic.xml"/>
+    <xi:include href="xml/empathy-smiley-manager.xml"/>
     <xi:include href="xml/empathy-chat-view.xml"/>
     <xi:include href="xml/empathy-geometry.xml"/>
     <xi:include href="xml/empathy-presence-chooser.xml"/>
diff --git a/doc/libempathy-gtk/libempathy-gtk.types b/doc/libempathy-gtk/libempathy-gtk.types
index 64bfe5c01..82e8aed0d 100644
--- a/doc/libempathy-gtk/libempathy-gtk.types
+++ b/doc/libempathy-gtk/libempathy-gtk.types
@@ -12,6 +12,7 @@
 #include <libempathy-gtk/empathy-private-chat.h>
 #include <libempathy-gtk/ephy-spinner.h>
 #include <libempathy-gtk/empathy-cell-renderer-expander.h>
+#include <libempathy-gtk/empathy-smiley-manager.h>
 
 empathy_cell_renderer_text_get_type
 empathy_account_chooser_get_type
@@ -26,4 +27,4 @@ empathy_group_chat_get_type
 empathy_private_chat_get_type
 ephy_spinner_get_type
 empathy_cell_renderer_expander_get_type
-
+empathy_smiley_manager_get_type
diff --git a/doc/libempathy-gtk/tmpl/empathy-chat-view.sgml b/doc/libempathy-gtk/tmpl/empathy-chat-view.sgml
index 9377fee7a..285cbc73c 100644
--- a/doc/libempathy-gtk/tmpl/empathy-chat-view.sgml
+++ b/doc/libempathy-gtk/tmpl/empathy-chat-view.sgml
@@ -29,40 +29,6 @@ EmpathyChatView
 </para>
 
 
-<!-- ##### ENUM EmpathySmiley ##### -->
-<para>
-
-</para>
-
-@EMPATHY_SMILEY_NORMAL: 
-@EMPATHY_SMILEY_WINK: 
-@EMPATHY_SMILEY_BIGEYE: 
-@EMPATHY_SMILEY_NOSE: 
-@EMPATHY_SMILEY_CRY: 
-@EMPATHY_SMILEY_SAD: 
-@EMPATHY_SMILEY_SCEPTICAL: 
-@EMPATHY_SMILEY_BIGSMILE: 
-@EMPATHY_SMILEY_INDIFFERENT: 
-@EMPATHY_SMILEY_TOUNGE: 
-@EMPATHY_SMILEY_SHOCKED: 
-@EMPATHY_SMILEY_COOL: 
-@EMPATHY_SMILEY_SORRY: 
-@EMPATHY_SMILEY_KISS: 
-@EMPATHY_SMILEY_SHUTUP: 
-@EMPATHY_SMILEY_YAWN: 
-@EMPATHY_SMILEY_CONFUSED: 
-@EMPATHY_SMILEY_ANGEL: 
-@EMPATHY_SMILEY_OOOH: 
-@EMPATHY_SMILEY_LOOKAWAY: 
-@EMPATHY_SMILEY_BLUSH: 
-@EMPATHY_SMILEY_COOLBIGSMILE: 
-@EMPATHY_SMILEY_ANGRY: 
-@EMPATHY_SMILEY_BOSS: 
-@EMPATHY_SMILEY_MONKEY: 
-@EMPATHY_SMILEY_SILLY: 
-@EMPATHY_SMILEY_SICK: 
-@EMPATHY_SMILEY_COUNT: 
-
 <!-- ##### FUNCTION empathy_chat_view_new ##### -->
 <para>
 
@@ -213,24 +179,6 @@ EmpathyChatView
 @irc_style: 
 
 
-<!-- ##### FUNCTION empathy_chat_view_get_smiley_image ##### -->
-<para>
-
-</para>
-
-@smiley: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_chat_view_get_smiley_text ##### -->
-<para>
-
-</para>
-
-@smiley: 
-@Returns: 
-
-
 <!-- ##### FUNCTION empathy_chat_view_get_smiley_menu ##### -->
 <para>
 
diff --git a/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml b/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml
index 58f6945fd..b7dbd5420 100644
--- a/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml
+++ b/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml
@@ -82,16 +82,6 @@ empathy-ui-utils
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_pixbuf_from_smiley ##### -->
-<para>
-
-</para>
-
-@type: 
-@icon_size: 
-@Returns: 
-
-
 <!-- ##### FUNCTION empathy_icon_name_from_account ##### -->
 <para>
 
-- 
cgit v1.2.3