]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-chat-text-view.c
individual_view_drag_end: remove the auto scroll
[empathy.git] / libempathy-gtk / empathy-chat-text-view.c
index afd158f571d66ce2f07645df01d7c2d4d738ed3f..60d642ccb7bb84c9e7c1f0175980023f4eb3f978 100644 (file)
@@ -15,9 +15,9 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- * 
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
  * Authors: Mikael Hallendal <micke@imendio.com>
  *          Richard Hult <richard@imendio.com>
  *          Martyn Russell <martyn@imendio.com>
 #include <time.h>
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksizegroup.h>
-#include <glade/glade.h>
+#include <gtk/gtk.h>
 
 #include <telepathy-glib/util.h>
-#include <libmissioncontrol/mc-account.h>
 
+#include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-chat-text-view.h"
 #include "empathy-chat.h"
-#include "empathy-conf.h"
 #include "empathy-ui-utils.h"
 #include "empathy-smiley-manager.h"
+#include "empathy-string-parser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
 #include <libempathy/empathy-debug.h>
 
 /* Number of seconds between timestamps when using normal mode, 5 minutes. */
-#define TIMESTAMP_INTERVAL 300
+#define TIMESTAMP_INTERVAL (5 * G_TIME_SPAN_MINUTE)
 
 #define MAX_LINES 800
 #define MAX_SCROLL_TIME 0.4 /* seconds */
 #define SCROLL_DELAY 33     /* milliseconds */
 
-#define SCHEMES "(https?|ftps?|nntp|news|javascript|about|ghelp|apt|telnet|"\
-               "file|webcal|mailto)"
-#define BODY "([^\\ ]+)"
-#define END_BODY "([^\\ ]*[^,;\?><()\\ \"\\.])"
-#define URI_REGEX "("SCHEMES"://"END_BODY")" \
-                 "|((mailto:)?"BODY"@"BODY"\\."END_BODY")"\
-                 "|((www|ftp)\\."END_BODY")"
-static GRegex *uri_regex = NULL;
-
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatTextView)
 
 typedef struct {
@@ -82,15 +65,19 @@ typedef struct {
        gboolean              find_wrapped;
        gboolean              find_last_direction;
        EmpathyContact       *last_contact;
-       time_t                last_timestamp;
+       gint64                last_timestamp;
        gboolean              allow_scrolling;
        guint                 notify_system_fonts_id;
+       GSettings            *gsettings_desktop;
+       GSettings            *gsettings_chat;
        EmpathySmileyManager *smiley_manager;
        gboolean              only_if_date;
 } EmpathyChatTextViewPriv;
 
 static void chat_text_view_iface_init (EmpathyChatViewIface *iface);
 
+static void chat_text_view_copy_clipboard (EmpathyChatView *view);
+
 G_DEFINE_TYPE_WITH_CODE (EmpathyChatTextView, empathy_chat_text_view,
                         GTK_TYPE_TEXT_VIEW,
                         G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CHAT_VIEW,
@@ -120,22 +107,22 @@ chat_text_view_url_event_cb (GtkTextTag          *tag,
        if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end)) {
                return FALSE;
        }
-       
+
        if (event->type == GDK_BUTTON_RELEASE && event->button.button == 1) {
                start = end = *iter;
-               
+
                if (gtk_text_iter_backward_to_tag_toggle (&start, tag) &&
                    gtk_text_iter_forward_to_tag_toggle (&end, tag)) {
                            str = gtk_text_buffer_get_text (priv->buffer,
                                                            &start,
                                                            &end,
                                                            FALSE);
-                           
+
                            empathy_url_show (GTK_WIDGET (view), str);
                            g_free (str);
                    }
        }
-       
+
        return FALSE;
 }
 
@@ -150,31 +137,31 @@ chat_text_view_event_cb (EmpathyChatTextView *view,
        GtkTextIter        iter;
        GdkWindow         *win;
        gint               x, y, buf_x, buf_y;
-       
+
        type = gtk_text_view_get_window_type (GTK_TEXT_VIEW (view),
                                              event->window);
-       
+
        if (type != GTK_TEXT_WINDOW_TEXT) {
                return FALSE;
        }
-       
+
        /* Get where the pointer really is. */
        win = gtk_text_view_get_window (GTK_TEXT_VIEW (view), type);
        if (!win) {
                return FALSE;
        }
-       
-       gdk_window_get_pointer (win, &x, &y, NULL);
-       
+
+       gdk_window_get_device_position (win, event->device, &x, &y, NULL);
+
        /* Get the iter where the cursor is at */
        gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view), type,
                                               x, y,
                                               &buf_x, &buf_y);
-       
+
        gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (view),
                                            &iter,
                                            buf_x, buf_y);
-       
+
        if (gtk_text_iter_has_tag (&iter, tag)) {
                if (!hand) {
                        hand = gdk_cursor_new (GDK_HAND2);
@@ -187,7 +174,7 @@ chat_text_view_event_cb (EmpathyChatTextView *view,
                }
                gdk_window_set_cursor (win, beam);
        }
-       
+
        return FALSE;
 }
 
@@ -209,7 +196,7 @@ chat_text_view_create_tags (EmpathyChatTextView *view)
        g_signal_connect (tag, "event",
                          G_CALLBACK (chat_text_view_url_event_cb),
                          view);
-       
+
        g_signal_connect (view, "motion-notify-event",
                          G_CALLBACK (chat_text_view_event_cb),
                          tag);
@@ -218,39 +205,33 @@ chat_text_view_create_tags (EmpathyChatTextView *view)
 static void
 chat_text_view_system_font_update (EmpathyChatTextView *view)
 {
+       EmpathyChatTextViewPriv *priv = GET_PRIV (view);
        PangoFontDescription *font_description = NULL;
        gchar                *font_name;
-       
-       if (empathy_conf_get_string (empathy_conf_get (),
-                                    "/desktop/gnome/interface/document_font_name",
-                                    &font_name) && font_name) {
-                                            font_description = pango_font_description_from_string (font_name);
-                                            g_free (font_name);
-                                    } else {
-                                            font_description = NULL;
-                                    }
-       
-       gtk_widget_modify_font (GTK_WIDGET (view), font_description);
-       
+
+       font_name = g_settings_get_string (priv->gsettings_desktop,
+                       EMPATHY_PREFS_DESKTOP_INTERFACE_DOCUMENT_FONT_NAME);
+
+       if (font_name != NULL) {
+               font_description = pango_font_description_from_string (font_name);
+               g_free (font_name);
+       } else {
+               font_description = NULL;
+       }
+
+       gtk_widget_override_font (GTK_WIDGET (view), font_description);
+
        if (font_description) {
                pango_font_description_free (font_description);
        }
 }
 
 static void
-chat_text_view_notify_system_font_cb (EmpathyConf *conf,
+chat_text_view_notify_system_font_cb (GSettings *gsettings,
                                      const gchar *key,
-                                     gpointer     user_data)
+                                     EmpathyChatTextView *self)
 {
-       EmpathyChatTextView *view = user_data;
-       
-       chat_text_view_system_font_update (view);
-}
-
-static void
-chat_text_view_clear_view_cb (GtkMenuItem *menuitem, EmpathyChatTextView *view)
-{
-       empathy_chat_view_clear (EMPATHY_CHAT_VIEW (view));
+       chat_text_view_system_font_update (self);
 }
 
 static void
@@ -263,18 +244,18 @@ static void
 chat_text_view_copy_address_cb (GtkMenuItem *menuitem, const gchar *url)
 {
        GtkClipboard *clipboard;
-       
+
        clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
        gtk_clipboard_set_text (clipboard, url, -1);
-       
+
        clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
        gtk_clipboard_set_text (clipboard, url, -1);
 }
 
 static void
 chat_text_view_populate_popup (EmpathyChatTextView *view,
-                         GtkMenu        *menu,
-                         gpointer        user_data)
+                              GtkMenu        *menu,
+                              gpointer        user_data)
 {
        EmpathyChatTextViewPriv *priv;
        GtkTextTagTable    *table;
@@ -283,71 +264,70 @@ chat_text_view_populate_popup (EmpathyChatTextView *view,
        GtkTextIter         iter, start, end;
        GtkWidget          *item;
        gchar              *str = NULL;
-       
+
        priv = GET_PRIV (view);
-       
+
        /* Clear menu item */
        if (gtk_text_buffer_get_char_count (priv->buffer) > 0) {
-               item = gtk_menu_item_new ();
-               gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+               item = gtk_separator_menu_item_new ();
+               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
                gtk_widget_show (item);
-               
+
                item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLEAR, NULL);
-               gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
                gtk_widget_show (item);
-               
-               g_signal_connect (item,
-                                 "activate",
-                                 G_CALLBACK (chat_text_view_clear_view_cb),
-                                 view);
+
+               g_signal_connect_swapped (item, "activate",
+                                         G_CALLBACK (empathy_chat_view_clear),
+                                         view);
        }
-       
+
        /* Link context menu items */
        table = gtk_text_buffer_get_tag_table (priv->buffer);
        tag = gtk_text_tag_table_lookup (table, EMPATHY_CHAT_TEXT_VIEW_TAG_LINK);
-       
-       gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
-       
+
+       gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (view)),
+               gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (
+                       gtk_widget_get_display (GTK_WIDGET (view)))), &x, &y, NULL);
+
        gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view),
                                               GTK_TEXT_WINDOW_WIDGET,
                                               x, y,
                                               &x, &y);
-       
+
        gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (view), &iter, x, y);
-       
+
        start = end = iter;
-       
+
        if (gtk_text_iter_backward_to_tag_toggle (&start, tag) &&
            gtk_text_iter_forward_to_tag_toggle (&end, tag)) {
                    str = gtk_text_buffer_get_text (priv->buffer,
                                                    &start, &end, FALSE);
            }
-       
+
        if (EMP_STR_EMPTY (str)) {
                g_free (str);
                return;
        }
-       
+
        /* NOTE: Set data just to get the string freed when not needed. */
        g_object_set_data_full (G_OBJECT (menu),
                                "url", str,
                                (GDestroyNotify) g_free);
-       
-       item = gtk_menu_item_new ();
+
+       item = gtk_separator_menu_item_new ();
        gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
        gtk_widget_show (item);
-       
+
        item = gtk_menu_item_new_with_mnemonic (_("_Copy Link Address"));
-       g_signal_connect (item,
-                         "activate",
+       g_signal_connect (item, "activate",
                          G_CALLBACK (chat_text_view_copy_address_cb),
                          str);
        gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
        gtk_widget_show (item);
-       
+
        item = gtk_menu_item_new_with_mnemonic (_("_Open Link"));
-       g_signal_connect (item,
-                         "activate",
+       g_signal_connect (item, "activate",
                          G_CALLBACK (chat_text_view_open_address_cb),
                          str);
        gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
@@ -357,19 +337,20 @@ chat_text_view_populate_popup (EmpathyChatTextView *view,
 static gboolean
 chat_text_view_is_scrolled_down (EmpathyChatTextView *view)
 {
-       GtkWidget *sw;
-       
-       sw = gtk_widget_get_parent (GTK_WIDGET (view));
-       if (GTK_IS_SCROLLED_WINDOW (sw)) {
-               GtkAdjustment *vadj;
-               
-               vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw));
-               
-               if (vadj->value + vadj->page_size / 2 < vadj->upper - vadj->page_size) {
-                       return FALSE;
-               }
+       GtkAdjustment *vadj;
+       gdouble value;
+       gdouble upper;
+       gdouble page_size;
+
+       vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (view));
+       value = gtk_adjustment_get_value (vadj);
+       upper = gtk_adjustment_get_upper (vadj);
+       page_size = gtk_adjustment_get_page_size (vadj);
+
+       if (value < upper - page_size) {
+               return FALSE;
        }
-       
+
        return TRUE;
 }
 
@@ -379,26 +360,26 @@ chat_text_view_maybe_trim_buffer (EmpathyChatTextView *view)
        EmpathyChatTextViewPriv *priv;
        GtkTextIter         top, bottom;
        gint                line;
-       gint                remove;
+       gint                remove_;
        GtkTextTagTable    *table;
        GtkTextTag         *tag;
-       
+
        priv = GET_PRIV (view);
-       
+
        gtk_text_buffer_get_end_iter (priv->buffer, &bottom);
        line = gtk_text_iter_get_line (&bottom);
        if (line < MAX_LINES) {
                return;
        }
-       
-       remove = line - MAX_LINES;
+
+       remove_ = line - MAX_LINES;
        gtk_text_buffer_get_start_iter (priv->buffer, &top);
-       
+
        bottom = top;
-       if (!gtk_text_iter_forward_lines (&bottom, remove)) {
+       if (!gtk_text_iter_forward_lines (&bottom, remove_)) {
                return;
        }
-       
+
        /* Track backwords to a place where we can safely cut, we don't do it in
          * the middle of a tag.
          */
@@ -407,11 +388,11 @@ chat_text_view_maybe_trim_buffer (EmpathyChatTextView *view)
        if (!tag) {
                return;
        }
-       
+
        if (!gtk_text_iter_forward_to_tag_toggle (&bottom, tag)) {
                return;
        }
-       
+
        if (!gtk_text_iter_equal (&top, &bottom)) {
                gtk_text_buffer_delete (priv->buffer, &top, &bottom);
        }
@@ -419,7 +400,7 @@ chat_text_view_maybe_trim_buffer (EmpathyChatTextView *view)
 
 static void
 chat_text_view_append_timestamp (EmpathyChatTextView *view,
-                                time_t               timestamp,
+                                gint64               timestamp,
                                 gboolean             show_date)
 {
        EmpathyChatTextViewPriv *priv = GET_PRIV (view);
@@ -431,15 +412,12 @@ chat_text_view_append_timestamp (EmpathyChatTextView *view,
 
        /* Append date if needed */
        if (show_date) {
-               GDate *date;
-               gchar  buf[256];
-
-               date = g_date_new ();
-               g_date_set_time_t (date, timestamp);
-               g_date_strftime (buf, 256, _("%A %d %B %Y"), date);
-               g_string_append (str, buf);
+               /* Translators: timestamp displayed between conversations in
+                * chat windows (strftime format string) */
+               tmp = empathy_time_to_string_utc (timestamp, _("%A %B %d %Y"));
+               g_string_append (str, tmp);
                g_string_append (str, ", ");
-               g_date_free (date);
+               g_free (tmp);
        }
 
        /* Append time */
@@ -458,39 +436,37 @@ chat_text_view_append_timestamp (EmpathyChatTextView *view,
                                                  EMPATHY_CHAT_TEXT_VIEW_TAG_TIME,
                                                  NULL);
 
-       priv->last_timestamp = timestamp;
-
-       g_string_free (str, TRUE);      
+       g_string_free (str, TRUE);
 }
 
 static void
 chat_text_maybe_append_date_and_time (EmpathyChatTextView *view,
-                                     time_t               timestamp)
+                                     gint64               timestamp)
 {
        EmpathyChatTextViewPriv *priv = GET_PRIV (view);
-       GDate                   *date, *last_date;
+       GDateTime               *date, *last_date;
        gboolean                 append_date = FALSE;
        gboolean                 append_time = FALSE;
+       GTimeSpan                delta;
 
        /* Get the date from last message */
-       last_date = g_date_new ();
-       g_date_set_time_t (last_date, priv->last_timestamp);
+       last_date = g_date_time_new_from_unix_utc (priv->last_timestamp);
 
        /* Get the date of the message we are appending */
-       date = g_date_new ();
-       g_date_set_time_t (date, timestamp);
+       date = g_date_time_new_from_unix_utc (timestamp);
 
+       delta = g_date_time_difference (date, last_date);
        /* If last message was from another day we append date and time */
-       if (g_date_compare (date, last_date) > 0) {
+       if (delta >= G_TIME_SPAN_DAY) {
                append_date = TRUE;
                append_time = TRUE;
        }
-       
-       g_date_free (last_date);
-       g_date_free (date);
+
+       g_date_time_unref (last_date);
+       g_date_time_unref (date);
 
        /* If last message is 'old' append the time */
-       if (timestamp - priv->last_timestamp >= TIMESTAMP_INTERVAL) {
+       if (delta >= TIMESTAMP_INTERVAL) {
                append_time = TRUE;
        }
 
@@ -504,16 +480,18 @@ chat_text_view_size_allocate (GtkWidget     *widget,
                              GtkAllocation *alloc)
 {
        gboolean down;
-       
+
        down = chat_text_view_is_scrolled_down (EMPATHY_CHAT_TEXT_VIEW (widget));
-       
+
        GTK_WIDGET_CLASS (empathy_chat_text_view_parent_class)->size_allocate (widget, alloc);
-       
+
        if (down) {
                GtkAdjustment *adj;
-               
-               adj = GTK_TEXT_VIEW (widget)->vadjustment;
-               gtk_adjustment_set_value (adj, adj->upper - adj->page_size);
+
+               adj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (widget));
+               gtk_adjustment_set_value (adj,
+                                         gtk_adjustment_get_upper (adj) -
+                                         gtk_adjustment_get_page_size (adj));
        }
 }
 
@@ -522,11 +500,11 @@ chat_text_view_drag_motion (GtkWidget      *widget,
                            GdkDragContext *context,
                            gint            x,
                            gint            y,
-                           guint           time)
+                           guint           time_)
 {
        /* Don't handle drag motion, since we don't want the view to scroll as
         * the result of dragging something across it. */
-       
+
        return FALSE;
 }
 
@@ -574,14 +552,15 @@ chat_text_view_finalize (GObject *object)
 {
        EmpathyChatTextView     *view;
        EmpathyChatTextViewPriv *priv;
-       
+
        view = EMPATHY_CHAT_TEXT_VIEW (object);
        priv = GET_PRIV (view);
-       
+
        DEBUG ("%p", object);
-       
-       empathy_conf_notify_remove (empathy_conf_get (), priv->notify_system_fonts_id);
-       
+
+       g_object_unref (priv->gsettings_chat);
+       g_object_unref (priv->gsettings_desktop);
+
        if (priv->last_contact) {
                g_object_unref (priv->last_contact);
        }
@@ -591,22 +570,32 @@ chat_text_view_finalize (GObject *object)
        if (priv->scroll_timeout) {
                g_source_remove (priv->scroll_timeout);
        }
-       
+       g_object_unref (priv->smiley_manager);
+
        G_OBJECT_CLASS (empathy_chat_text_view_parent_class)->finalize (object);
 }
 
+static void
+text_view_copy_clipboard (GtkTextView *text_view)
+{
+       chat_text_view_copy_clipboard (EMPATHY_CHAT_VIEW (text_view));
+}
+
 static void
 empathy_chat_text_view_class_init (EmpathyChatTextViewClass *klass)
 {
        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-       
+       GtkTextViewClass *text_view_class = GTK_TEXT_VIEW_CLASS (klass);
+
        object_class->finalize = chat_text_view_finalize;
        object_class->get_property = chat_text_view_get_property;
        object_class->set_property = chat_text_view_set_property;
 
        widget_class->size_allocate = chat_text_view_size_allocate;
-       widget_class->drag_motion = chat_text_view_drag_motion; 
+       widget_class->drag_motion = chat_text_view_drag_motion;
+
+       text_view_class->copy_clipboard = text_view_copy_clipboard;
 
        g_object_class_install_property (object_class,
                                         PROP_LAST_CONTACT,
@@ -633,23 +622,26 @@ empathy_chat_text_view_init (EmpathyChatTextView *view)
        EmpathyChatTextViewPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (view,
                EMPATHY_TYPE_CHAT_TEXT_VIEW, EmpathyChatTextViewPriv);
 
-       view->priv = priv;      
+       view->priv = priv;
        priv->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
        priv->last_timestamp = 0;
        priv->allow_scrolling = TRUE;
        priv->smiley_manager = empathy_smiley_manager_dup_singleton ();
-       
+
        g_object_set (view,
                      "wrap-mode", GTK_WRAP_WORD_CHAR,
                      "editable", FALSE,
                      "cursor-visible", FALSE,
                      NULL);
-       
-       priv->notify_system_fonts_id =
-               empathy_conf_notify_add (empathy_conf_get (),
-                                        "/desktop/gnome/interface/document_font_name",
-                                        chat_text_view_notify_system_font_cb,
-                                        view);
+
+       priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
+
+       priv->gsettings_desktop = g_settings_new (
+                         EMPATHY_PREFS_DESKTOP_INTERFACE_SCHEMA);
+       g_signal_connect (priv->gsettings_desktop,
+                         "changed::" EMPATHY_PREFS_DESKTOP_INTERFACE_DOCUMENT_FONT_NAME,
+                         G_CALLBACK (chat_text_view_notify_system_font_cb),
+                         view);
        chat_text_view_system_font_update (view);
        chat_text_view_create_tags (view);
 
@@ -659,6 +651,18 @@ empathy_chat_text_view_init (EmpathyChatTextView *view)
                          NULL);
 }
 
+static void
+chat_text_view_scroll_stop (EmpathyChatTextView *view)
+{
+       EmpathyChatTextViewPriv *priv = GET_PRIV (view);
+
+       g_timer_destroy (priv->scroll_time);
+       priv->scroll_time = NULL;
+
+       g_source_remove (priv->scroll_timeout);
+       priv->scroll_timeout = 0;
+}
+
 /* Code stolen from pidgin/gtkimhtml.c */
 static gboolean
 chat_text_view_scroll_cb (EmpathyChatTextView *view)
@@ -666,22 +670,21 @@ chat_text_view_scroll_cb (EmpathyChatTextView *view)
        EmpathyChatTextViewPriv *priv;
        GtkAdjustment      *adj;
        gdouble             max_val;
-       
+
        priv = GET_PRIV (view);
-       adj = GTK_TEXT_VIEW (view)->vadjustment;
-       max_val = adj->upper - adj->page_size;
-       
+
+       adj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (view));
+       max_val = gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj);
+
        g_return_val_if_fail (priv->scroll_time != NULL, FALSE);
-       
+
        if (g_timer_elapsed (priv->scroll_time, NULL) > MAX_SCROLL_TIME) {
                /* time's up. jump to the end and kill the timer */
                gtk_adjustment_set_value (adj, max_val);
-               g_timer_destroy (priv->scroll_time);
-               priv->scroll_time = NULL;
-               priv->scroll_timeout = 0;
+               chat_text_view_scroll_stop (view);
                return FALSE;
        }
-       
+
        /* scroll by 1/3rd the remaining distance */
        gtk_adjustment_set_value (adj, gtk_adjustment_get_value (adj) + ((max_val - gtk_adjustment_get_value (adj)) / 3));
        return TRUE;
@@ -691,9 +694,9 @@ static void
 chat_text_view_scroll_down (EmpathyChatView *view)
 {
        EmpathyChatTextViewPriv *priv = GET_PRIV (view);
-       
+
        g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
-       
+
        if (!priv->allow_scrolling) {
                return;
        }
@@ -703,7 +706,7 @@ chat_text_view_scroll_down (EmpathyChatView *view)
        if (priv->scroll_time) {
                g_timer_reset (priv->scroll_time);
        } else {
-               priv->scroll_time = g_timer_new();
+               priv->scroll_time = g_timer_new ();
        }
        if (!priv->scroll_timeout) {
                priv->scroll_timeout = g_timeout_add (SCROLL_DELAY,
@@ -714,40 +717,44 @@ chat_text_view_scroll_down (EmpathyChatView *view)
 
 static void
 chat_text_view_append_message (EmpathyChatView *view,
-                              EmpathyMessage  *msg)
+                              EmpathyMessage  *msg,
+                              gboolean         should_highlight)
 {
        EmpathyChatTextView     *text_view = EMPATHY_CHAT_TEXT_VIEW (view);
        EmpathyChatTextViewPriv *priv = GET_PRIV (text_view);
        gboolean                 bottom;
-       time_t                   timestamp;
-       
+       gint64                   timestamp;
+
        g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
        g_return_if_fail (EMPATHY_IS_MESSAGE (msg));
-       
+
        if (!empathy_message_get_body (msg)) {
                return;
        }
-       
+
        bottom = chat_text_view_is_scrolled_down (text_view);
-       
+
        chat_text_view_maybe_trim_buffer (EMPATHY_CHAT_TEXT_VIEW (view));
-       
+
        timestamp = empathy_message_get_timestamp (msg);
        chat_text_maybe_append_date_and_time (text_view, timestamp);
        if (EMPATHY_CHAT_TEXT_VIEW_GET_CLASS (view)->append_message) {
                EMPATHY_CHAT_TEXT_VIEW_GET_CLASS (view)->append_message (text_view,
-                                                                        msg);
+                                                                        msg,
+                                                                        should_highlight);
        }
-       
+
        if (bottom) {
                chat_text_view_scroll_down (view);
        }
-       
+
        if (priv->last_contact) {
                g_object_unref (priv->last_contact);
        }
        priv->last_contact = g_object_ref (empathy_message_get_sender (msg));
        g_object_notify (G_OBJECT (view), "last-contact");
+
+       priv->last_timestamp = timestamp;
 }
 
 static void
@@ -780,7 +787,7 @@ chat_text_view_append_event (EmpathyChatView *view,
        if (bottom) {
                chat_text_view_scroll_down (view);
        }
-       
+
        if (priv->last_contact) {
                g_object_unref (priv->last_contact);
                priv->last_contact = NULL;
@@ -793,9 +800,9 @@ chat_text_view_scroll (EmpathyChatView *view,
                       gboolean         allow_scrolling)
 {
        EmpathyChatTextViewPriv *priv = GET_PRIV (view);
-       
+
        g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
-       
+
        DEBUG ("Scrolling %s", allow_scrolling ? "enabled" : "disabled");
 
        priv->allow_scrolling = allow_scrolling;
@@ -808,11 +815,11 @@ static gboolean
 chat_text_view_get_has_selection (EmpathyChatView *view)
 {
        GtkTextBuffer *buffer;
-       
+
        g_return_val_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view), FALSE);
-       
+
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-       
+
        return gtk_text_buffer_get_has_selection (buffer);
 }
 
@@ -821,25 +828,30 @@ chat_text_view_clear (EmpathyChatView *view)
 {
        GtkTextBuffer      *buffer;
        EmpathyChatTextViewPriv *priv;
-       
+
        g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
-       
+
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
        gtk_text_buffer_set_text (buffer, "", -1);
-       
+
        /* We set these back to the initial values so we get
          * timestamps when clearing the window to know when
          * conversations start.
          */
        priv = GET_PRIV (view);
-       
+
        priv->last_timestamp = 0;
+       if (priv->last_contact) {
+               g_object_unref (priv->last_contact);
+               priv->last_contact = NULL;
+       }
 }
 
 static gboolean
 chat_text_view_find_previous (EmpathyChatView *view,
                                const gchar     *search_criteria,
-                               gboolean         new_search)
+                               gboolean         new_search,
+                               gboolean         match_case)
 {
        EmpathyChatTextViewPriv *priv;
        GtkTextBuffer      *buffer;
@@ -848,18 +860,18 @@ chat_text_view_find_previous (EmpathyChatView *view,
        GtkTextIter         iter_match_end;
        gboolean            found;
        gboolean            from_start = FALSE;
-       
+
        g_return_val_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view), FALSE);
        g_return_val_if_fail (search_criteria != NULL, FALSE);
-       
+
        priv = GET_PRIV (view);
-       
+
        buffer = priv->buffer;
-       
+
        if (EMP_STR_EMPTY (search_criteria)) {
                if (priv->find_mark_previous) {
                        gtk_text_buffer_get_start_iter (buffer, &iter_at_mark);
-                       
+
                        gtk_text_buffer_move_mark (buffer,
                                                   priv->find_mark_previous,
                                                   &iter_at_mark);
@@ -873,15 +885,15 @@ chat_text_view_find_previous (EmpathyChatView *view,
                                                      &iter_at_mark,
                                                      &iter_at_mark);
                }
-               
+
                return FALSE;
        }
-       
+
        if (new_search) {
                from_start = TRUE;
        }
-       
-       if (priv->find_mark_previous) {
+
+       if (!new_search && priv->find_mark_previous) {
                gtk_text_buffer_get_iter_at_mark (buffer,
                                                  &iter_at_mark,
                                                  priv->find_mark_previous);
@@ -889,34 +901,47 @@ chat_text_view_find_previous (EmpathyChatView *view,
                gtk_text_buffer_get_end_iter (buffer, &iter_at_mark);
                from_start = TRUE;
        }
-       
+
        priv->find_last_direction = FALSE;
-       
-       found = empathy_text_iter_backward_search (&iter_at_mark,
-                                                  search_criteria,
-                                                  &iter_match_start,
-                                                  &iter_match_end,
-                                                  NULL);
-       
+
+       /* Use the standard GTK+ method for case sensitive searches. It can't do
+        * case insensitive searches (see bug #61852), so keep the custom method
+        * around for case insensitive searches. */
+       if (match_case) {
+               found = gtk_text_iter_backward_search (&iter_at_mark,
+                                                      search_criteria,
+                                                      0, /* no text search flags, we want exact matches */
+                                                      &iter_match_start,
+                                                      &iter_match_end,
+                                                      NULL);
+       } else {
+               found = empathy_text_iter_backward_search (&iter_at_mark,
+                                                          search_criteria,
+                                                          &iter_match_start,
+                                                          &iter_match_end,
+                                                          NULL);
+       }
+
        if (!found) {
                gboolean result = FALSE;
-               
+
                if (from_start) {
                        return result;
                }
-               
+
                /* Here we wrap around. */
                if (!new_search && !priv->find_wrapped) {
                        priv->find_wrapped = TRUE;
                        result = chat_text_view_find_previous (view,
-                                                                search_criteria, 
-                                                                FALSE);
+                                                                search_criteria,
+                                                                FALSE,
+                                                                match_case);
                        priv->find_wrapped = FALSE;
                }
-               
+
                return result;
        }
-       
+
        /* Set new mark and show on screen */
        if (!priv->find_mark_previous) {
                priv->find_mark_previous = gtk_text_buffer_create_mark (buffer, NULL,
@@ -927,7 +952,7 @@ chat_text_view_find_previous (EmpathyChatView *view,
                                           priv->find_mark_previous,
                                           &iter_match_start);
        }
-       
+
        if (!priv->find_mark_next) {
                priv->find_mark_next = gtk_text_buffer_create_mark (buffer, NULL,
                                                                    &iter_match_end,
@@ -937,24 +962,25 @@ chat_text_view_find_previous (EmpathyChatView *view,
                                           priv->find_mark_next,
                                           &iter_match_end);
        }
-       
+
        gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view),
                                      priv->find_mark_previous,
                                      0.0,
                                      TRUE,
                                      0.5,
                                      0.5);
-       
+
        gtk_text_buffer_move_mark_by_name (buffer, "selection_bound", &iter_match_start);
        gtk_text_buffer_move_mark_by_name (buffer, "insert", &iter_match_end);
-       
+
        return TRUE;
 }
 
 static gboolean
 chat_text_view_find_next (EmpathyChatView *view,
                            const gchar     *search_criteria,
-                           gboolean         new_search)
+                           gboolean         new_search,
+                           gboolean         match_case)
 {
        EmpathyChatTextViewPriv *priv;
        GtkTextBuffer      *buffer;
@@ -963,18 +989,18 @@ chat_text_view_find_next (EmpathyChatView *view,
        GtkTextIter         iter_match_end;
        gboolean            found;
        gboolean            from_start = FALSE;
-       
+
        g_return_val_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view), FALSE);
        g_return_val_if_fail (search_criteria != NULL, FALSE);
-       
+
        priv = GET_PRIV (view);
-       
+
        buffer = priv->buffer;
-       
+
        if (EMP_STR_EMPTY (search_criteria)) {
                if (priv->find_mark_next) {
                        gtk_text_buffer_get_start_iter (buffer, &iter_at_mark);
-                       
+
                        gtk_text_buffer_move_mark (buffer,
                                                   priv->find_mark_next,
                                                   &iter_at_mark);
@@ -988,15 +1014,15 @@ chat_text_view_find_next (EmpathyChatView *view,
                                                      &iter_at_mark,
                                                      &iter_at_mark);
                }
-               
+
                return FALSE;
        }
-       
+
        if (new_search) {
                from_start = TRUE;
        }
-       
-       if (priv->find_mark_next) {
+
+       if (!new_search && priv->find_mark_next) {
                gtk_text_buffer_get_iter_at_mark (buffer,
                                                  &iter_at_mark,
                                                  priv->find_mark_next);
@@ -1004,34 +1030,47 @@ chat_text_view_find_next (EmpathyChatView *view,
                gtk_text_buffer_get_start_iter (buffer, &iter_at_mark);
                from_start = TRUE;
        }
-       
+
        priv->find_last_direction = TRUE;
-       
-       found = empathy_text_iter_forward_search (&iter_at_mark,
-                                                 search_criteria,
-                                                 &iter_match_start,
-                                                 &iter_match_end,
-                                                 NULL);
-       
+
+       /* Use the standard GTK+ method for case sensitive searches. It can't do
+        * case insensitive searches (see bug #61852), so keep the custom method
+        * around for case insensitive searches. */
+       if (match_case) {
+               found = gtk_text_iter_forward_search (&iter_at_mark,
+                                                     search_criteria,
+                                                     0,
+                                                     &iter_match_start,
+                                                     &iter_match_end,
+                                                     NULL);
+       } else {
+               found = empathy_text_iter_forward_search (&iter_at_mark,
+                                                         search_criteria,
+                                                         &iter_match_start,
+                                                         &iter_match_end,
+                                                         NULL);
+       }
+
        if (!found) {
                gboolean result = FALSE;
-               
+
                if (from_start) {
                        return result;
                }
-               
+
                /* Here we wrap around. */
                if (!new_search && !priv->find_wrapped) {
                        priv->find_wrapped = TRUE;
-                       result = chat_text_view_find_next (view, 
-                                                            search_criteria, 
-                                                            FALSE);
+                       result = chat_text_view_find_next (view,
+                                                            search_criteria,
+                                                            FALSE,
+                                                            match_case);
                        priv->find_wrapped = FALSE;
                }
-               
+
                return result;
        }
-       
+
        /* Set new mark and show on screen */
        if (!priv->find_mark_next) {
                priv->find_mark_next = gtk_text_buffer_create_mark (buffer, NULL,
@@ -1042,7 +1081,7 @@ chat_text_view_find_next (EmpathyChatView *view,
                                           priv->find_mark_next,
                                           &iter_match_end);
        }
-       
+
        if (!priv->find_mark_previous) {
                priv->find_mark_previous = gtk_text_buffer_create_mark (buffer, NULL,
                                                                        &iter_match_start,
@@ -1052,23 +1091,24 @@ chat_text_view_find_next (EmpathyChatView *view,
                                           priv->find_mark_previous,
                                           &iter_match_start);
        }
-       
+
        gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view),
                                      priv->find_mark_next,
                                      0.0,
                                      TRUE,
                                      0.5,
                                      0.5);
-       
+
        gtk_text_buffer_move_mark_by_name (buffer, "selection_bound", &iter_match_start);
        gtk_text_buffer_move_mark_by_name (buffer, "insert", &iter_match_end);
-       
+
        return TRUE;
 }
 
 static void
 chat_text_view_find_abilities (EmpathyChatView *view,
                                 const gchar    *search_criteria,
+                                gboolean        match_case,
                                 gboolean       *can_do_previous,
                                 gboolean       *can_do_next)
 {
@@ -1077,15 +1117,15 @@ chat_text_view_find_abilities (EmpathyChatView *view,
        GtkTextIter              iter_at_mark;
        GtkTextIter              iter_match_start;
        GtkTextIter              iter_match_end;
-       
+
        g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
        g_return_if_fail (search_criteria != NULL);
        g_return_if_fail (can_do_previous != NULL && can_do_next != NULL);
-       
+
        priv = GET_PRIV (view);
-       
+
        buffer = priv->buffer;
-       
+
        if (can_do_previous) {
                if (priv->find_mark_previous) {
                        gtk_text_buffer_get_iter_at_mark (buffer,
@@ -1094,14 +1134,23 @@ chat_text_view_find_abilities (EmpathyChatView *view,
                } else {
                        gtk_text_buffer_get_start_iter (buffer, &iter_at_mark);
                }
-               
-               *can_do_previous = empathy_text_iter_backward_search (&iter_at_mark,
-                                                                     search_criteria,
-                                                                     &iter_match_start,
-                                                                     &iter_match_end,
-                                                                     NULL);
+
+               if (match_case) {
+                       *can_do_previous = gtk_text_iter_backward_search (&iter_at_mark,
+                                                                         search_criteria,
+                                                                         0,
+                                                                         &iter_match_start,
+                                                                         &iter_match_end,
+                                                                         NULL);
+               } else {
+                       *can_do_previous = empathy_text_iter_backward_search (&iter_at_mark,
+                                                                             search_criteria,
+                                                                             &iter_match_start,
+                                                                             &iter_match_end,
+                                                                             NULL);
+               }
        }
-       
+
        if (can_do_next) {
                if (priv->find_mark_next) {
                        gtk_text_buffer_get_iter_at_mark (buffer,
@@ -1110,18 +1159,28 @@ chat_text_view_find_abilities (EmpathyChatView *view,
                } else {
                        gtk_text_buffer_get_start_iter (buffer, &iter_at_mark);
                }
-               
-               *can_do_next = empathy_text_iter_forward_search (&iter_at_mark,
-                                                                search_criteria,
-                                                                &iter_match_start,
-                                                                &iter_match_end,
-                                                                NULL);
+
+               if (match_case) {
+                       *can_do_next = gtk_text_iter_forward_search (&iter_at_mark,
+                                                                    search_criteria,
+                                                                    0,
+                                                                    &iter_match_start,
+                                                                    &iter_match_end,
+                                                                    NULL);
+               } else {
+                       *can_do_next = empathy_text_iter_forward_search (&iter_at_mark,
+                                                                        search_criteria,
+                                                                        &iter_match_start,
+                                                                        &iter_match_end,
+                                                                        NULL);
+               }
        }
 }
 
 static void
 chat_text_view_highlight (EmpathyChatView *view,
-                           const gchar     *text)
+                           const gchar     *text,
+                           gboolean         match_case)
 {
        GtkTextBuffer *buffer;
        GtkTextIter    iter;
@@ -1130,39 +1189,46 @@ chat_text_view_highlight (EmpathyChatView *view,
        GtkTextIter    iter_match_start;
        GtkTextIter    iter_match_end;
        gboolean       found;
-       
+
        g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
-       
+
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-       
+
        gtk_text_buffer_get_start_iter (buffer, &iter);
-       
+
        gtk_text_buffer_get_bounds (buffer, &iter_start, &iter_end);
        gtk_text_buffer_remove_tag_by_name (buffer, EMPATHY_CHAT_TEXT_VIEW_TAG_HIGHLIGHT,
                                            &iter_start,
                                            &iter_end);
-       
+
        if (EMP_STR_EMPTY (text)) {
                return;
        }
-       
+
        while (1) {
-               found = empathy_text_iter_forward_search (&iter,
-                                                         text,
-                                                         &iter_match_start,
-                                                         &iter_match_end,
-                                                         NULL);
-               
+               if (match_case) {
+                       found = gtk_text_iter_forward_search (&iter,
+                                                             text,
+                                                             0,
+                                                             &iter_match_start,
+                                                             &iter_match_end,
+                                                             NULL);
+               } else {
+                       found = empathy_text_iter_forward_search (&iter,
+                                                                 text,
+                                                                 &iter_match_start,
+                                                                 &iter_match_end,
+                                                                 NULL);
+               }
                if (!found) {
                        break;
                }
-               
+
                gtk_text_buffer_apply_tag_by_name (buffer, EMPATHY_CHAT_TEXT_VIEW_TAG_HIGHLIGHT,
                                                   &iter_match_start,
                                                   &iter_match_end);
-               
+
                iter = iter_match_end;
-               gtk_text_iter_forward_char (&iter);
        }
 }
 
@@ -1170,14 +1236,61 @@ static void
 chat_text_view_copy_clipboard (EmpathyChatView *view)
 {
        GtkTextBuffer *buffer;
+       GtkTextIter start, iter, end;
        GtkClipboard  *clipboard;
-       
+       GdkPixbuf *pixbuf;
+       gunichar c;
+       GtkTextChildAnchor *anchor = NULL;
+       GString *str;
+       GList *list;
+       gboolean ignore_newlines = FALSE;
+
        g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
-       
+
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
        clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-       
-       gtk_text_buffer_copy_clipboard (buffer, clipboard);
+
+       if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+               return;
+
+       str = g_string_new ("");
+
+       for (iter = start; !gtk_text_iter_equal (&iter, &end); gtk_text_iter_forward_char (&iter)) {
+               c = gtk_text_iter_get_char (&iter);
+               /* 0xFFFC is the 'object replacement' unicode character,
+                * it indicates the presence of a pixbuf or a widget. */
+               if (c == 0xFFFC) {
+                       ignore_newlines = FALSE;
+                       if ((pixbuf = gtk_text_iter_get_pixbuf (&iter))) {
+                               gchar *text;
+                               text = g_object_get_data (G_OBJECT(pixbuf),
+                                                         "smiley_str");
+                               if (text)
+                                       str = g_string_append (str, text);
+                       } else if ((anchor = gtk_text_iter_get_child_anchor (&iter))) {
+                               gchar *text;
+                               list = gtk_text_child_anchor_get_widgets (anchor);
+                               if (list) {
+                                       text = g_object_get_data (G_OBJECT(list->data),
+                                                                 "str_obj");
+                                       if (text)
+                                               str = g_string_append (str, text);
+                               }
+                               g_list_free (list);
+                       }
+               } else if (c == '\n') {
+                       if (!ignore_newlines) {
+                               ignore_newlines = TRUE;
+                               str = g_string_append_unichar (str, c);
+                       }
+               } else {
+                       ignore_newlines = FALSE;
+                       str = g_string_append_unichar (str, c);
+               }
+       }
+
+       gtk_clipboard_set_text (clipboard, str->str, str->len);
+       g_string_free (str, TRUE);
 }
 
 static void
@@ -1200,18 +1313,28 @@ EmpathyContact *
 empathy_chat_text_view_get_last_contact (EmpathyChatTextView *view)
 {
        EmpathyChatTextViewPriv *priv = GET_PRIV (view);
-       
+
        g_return_val_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view), NULL);
-       
+
        return priv->last_contact;
 }
 
+gint64
+empathy_chat_text_view_get_last_timestamp (EmpathyChatTextView *view)
+{
+       EmpathyChatTextViewPriv *priv = GET_PRIV (view);
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view), 0);
+
+       return priv->last_timestamp;
+}
+
 void
 empathy_chat_text_view_set_only_if_date (EmpathyChatTextView *view,
                                         gboolean             only_if_date)
 {
        EmpathyChatTextViewPriv *priv = GET_PRIV (view);
-       
+
        g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
 
        if (only_if_date != priv->only_if_date) {
@@ -1221,110 +1344,99 @@ empathy_chat_text_view_set_only_if_date (EmpathyChatTextView *view,
 }
 
 static void
-chat_text_view_insert_text_with_emoticons (EmpathyChatTextView *view,
-                                          GtkTextIter         *iter,
-                                          const gchar         *str)
+chat_text_view_replace_link (const gchar *text,
+                            gssize len,
+                            gpointer match_data,
+                            gpointer user_data)
 {
-       EmpathyChatTextViewPriv *priv = GET_PRIV (view);
-       gboolean                 use_smileys = FALSE;
-       GSList                  *smileys, *l;
+       GtkTextBuffer *buffer = GTK_TEXT_BUFFER (user_data);
+       GtkTextIter iter;
 
-       empathy_conf_get_bool (empathy_conf_get (),
-                              EMPATHY_PREFS_CHAT_SHOW_SMILEYS,
-                              &use_smileys);
+       gtk_text_buffer_get_end_iter (buffer, &iter);
+       gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                                 text, len,
+                                                 EMPATHY_CHAT_TEXT_VIEW_TAG_LINK,
+                                                 NULL);
+}
 
-       if (!use_smileys) {
-               gtk_text_buffer_insert (priv->buffer, iter, str, -1);
-               return;
-       }
+static void
+chat_text_view_replace_smiley (const gchar *text,
+                              gssize len,
+                              gpointer match_data,
+                              gpointer user_data)
+{
+       EmpathySmileyHit *hit = match_data;
+       GtkTextBuffer *buffer = GTK_TEXT_BUFFER (user_data);
+       GtkTextIter iter;
 
-       smileys = empathy_smiley_manager_parse (priv->smiley_manager, str);
-       for (l = smileys; l; l = l->next) {
-               EmpathySmiley *smiley;
+       gtk_text_buffer_get_end_iter (buffer, &iter);
+       gtk_text_buffer_insert_pixbuf (buffer, &iter, hit->pixbuf);
+}
 
-               smiley = l->data;
-               if (smiley->pixbuf) {
-                       gtk_text_buffer_insert_pixbuf (priv->buffer, iter, smiley->pixbuf);
-               } else {
-                       gtk_text_buffer_insert (priv->buffer, iter, smiley->str, -1);
-               }
-               empathy_smiley_free (smiley);
-       }
-       g_slist_free (smileys);
+static void
+chat_text_view_replace_verbatim (const gchar *text,
+                                gssize len,
+                                gpointer match_data,
+                                gpointer user_data)
+{
+       GtkTextBuffer *buffer = GTK_TEXT_BUFFER (user_data);
+       GtkTextIter iter;
+
+       gtk_text_buffer_get_end_iter (buffer, &iter);
+       gtk_text_buffer_insert (buffer, &iter, text, len);
 }
 
+static EmpathyStringParser string_parsers[] = {
+       {empathy_string_match_link, chat_text_view_replace_link},
+       {empathy_string_match_all, chat_text_view_replace_verbatim},
+       {NULL, NULL}
+};
+
+static EmpathyStringParser string_parsers_with_smiley[] = {
+       {empathy_string_match_link, chat_text_view_replace_link},
+       {empathy_string_match_smiley, chat_text_view_replace_smiley},
+       {empathy_string_match_all, chat_text_view_replace_verbatim},
+       {NULL, NULL}
+};
+
 void
 empathy_chat_text_view_append_body (EmpathyChatTextView *view,
                                    const gchar         *body,
                                    const gchar         *tag)
 {
        EmpathyChatTextViewPriv *priv = GET_PRIV (view);
-       GtkTextIter              start_iter, end_iter;
-       GtkTextMark             *mark;
+       EmpathyStringParser     *parsers;
+       gboolean                 use_smileys;
+       GtkTextIter              start_iter;
        GtkTextIter              iter;
-       GMatchInfo              *match_info;
-       gboolean                 match;
-       gint                     last = 0;
-       gint                     s = 0, e = 0;
-       gchar                   *tmp;
+       GtkTextMark             *mark;
 
-       priv = GET_PRIV (view);
+       /* Check if we have to parse smileys */
+       use_smileys = g_settings_get_boolean (priv->gsettings_chat,
+                       EMPATHY_PREFS_CHAT_SHOW_SMILEYS);
 
+       if (use_smileys)
+               parsers = string_parsers_with_smiley;
+       else
+               parsers = string_parsers;
+
+       /* Create a mark at the place we'll start inserting */
        gtk_text_buffer_get_end_iter (priv->buffer, &start_iter);
        mark = gtk_text_buffer_create_mark (priv->buffer, NULL, &start_iter, TRUE);
 
-       if (!uri_regex) {
-               uri_regex = g_regex_new (URI_REGEX, 0, 0, NULL);
-       }
-
-       for (match = g_regex_match (uri_regex, body, 0, &match_info); match;
-            match = g_match_info_next (match_info, NULL)) {
-               if (!g_match_info_fetch_pos (match_info, 0, &s, &e))
-                       continue;
-
-               if (s > last) {
-                       tmp = empathy_substring (body, last, s);
-
-                       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-                       chat_text_view_insert_text_with_emoticons (view,
-                                                                  &iter,
-                                                                  tmp);
-                       g_free (tmp);
-               }
-
-               tmp = empathy_substring (body, s, e);
-
-               gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-               gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                         &iter,
-                                                         tmp,
-                                                         -1,
-                                                         EMPATHY_CHAT_TEXT_VIEW_TAG_LINK,
-                                                         NULL);
-
-               g_free (tmp);
-               last = e;
-       }
-       g_match_info_free (match_info);
-
-       if (last < strlen (body)) {
-               gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-               chat_text_view_insert_text_with_emoticons (view,
-                                                          &iter,
-                                                          body + last);
-       }
+       /* Parse text for links/smileys and insert in the buffer */
+       empathy_string_parser_substr (body, -1, parsers, priv->buffer);
 
+       /* Insert a newline after the text inserted */
        gtk_text_buffer_get_end_iter (priv->buffer, &iter);
        gtk_text_buffer_insert (priv->buffer, &iter, "\n", 1);
 
        /* Apply the style to the inserted text. */
        gtk_text_buffer_get_iter_at_mark (priv->buffer, &start_iter, mark);
-       gtk_text_buffer_get_end_iter (priv->buffer, &end_iter);
-
-       gtk_text_buffer_apply_tag_by_name (priv->buffer,
-                                          tag,
+       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
+       gtk_text_buffer_apply_tag_by_name (priv->buffer, tag,
                                           &start_iter,
-                                          &end_iter);
+                                          &iter);
 
        gtk_text_buffer_delete_mark (priv->buffer, mark);
 }