aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-chat-window.c
diff options
context:
space:
mode:
authorVeena Katiyar <veenakatiyar0509@gmail.com>2013-11-18 03:09:18 +0800
committerChandni Verma <chandniverma2112@gmail.com>2013-11-18 03:14:50 +0800
commit25b40bf1b21a7c73a5b87649e3fb3536d64d0a97 (patch)
tree912a738bd9151fc66d46de0035ed2793a9874a4f /src/empathy-chat-window.c
parent8b783df8f293a93405b591522f5289006286f1f4 (diff)
downloadgsoc2013-empathy-25b40bf1b21a7c73a5b87649e3fb3536d64d0a97.tar
gsoc2013-empathy-25b40bf1b21a7c73a5b87649e3fb3536d64d0a97.tar.gz
gsoc2013-empathy-25b40bf1b21a7c73a5b87649e3fb3536d64d0a97.tar.bz2
gsoc2013-empathy-25b40bf1b21a7c73a5b87649e3fb3536d64d0a97.tar.lz
gsoc2013-empathy-25b40bf1b21a7c73a5b87649e3fb3536d64d0a97.tar.xz
gsoc2013-empathy-25b40bf1b21a7c73a5b87649e3fb3536d64d0a97.tar.zst
gsoc2013-empathy-25b40bf1b21a7c73a5b87649e3fb3536d64d0a97.zip
Insert smileys at the cursor position
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=685899
Diffstat (limited to 'src/empathy-chat-window.c')
-rw-r--r--src/empathy-chat-window.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index f7c8707eb..b49635629 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -42,7 +42,6 @@
#include "empathy-invite-participant-dialog.h"
#include "empathy-notify-manager.h"
#include "empathy-request-util.h"
-#include "empathy-smiley-manager.h"
#include "empathy-sound-manager.h"
#include "empathy-ui-utils.h"
#include "empathy-utils.h"
@@ -1075,13 +1074,11 @@ chat_window_insert_smiley_activate_cb (EmpathySmileyManager *manager,
EmpathyChatWindow *self = user_data;
EmpathyChat *chat;
GtkTextBuffer *buffer;
- GtkTextIter iter;
chat = self->priv->current_chat;
-
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
- gtk_text_buffer_get_end_iter (buffer, &iter);
- gtk_text_buffer_insert (buffer, &iter, smiley->str, -1);
+
+ empathy_chat_insert_smiley (buffer, smiley);
}
static void