aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/gossip-chat.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2007-05-10 02:06:22 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-05-10 02:06:22 +0800
commit747a707e7dda44eb3b84a1afb9ebdb150a629a9a (patch)
treea919b4247c9b3a80cb0089d9c26cbb22b2f9952e /libempathy-gtk/gossip-chat.c
parentbeb301da43c57e64e781b7f5c69b2bc667f46b1d (diff)
downloadgsoc2013-empathy-747a707e7dda44eb3b84a1afb9ebdb150a629a9a.tar
gsoc2013-empathy-747a707e7dda44eb3b84a1afb9ebdb150a629a9a.tar.gz
gsoc2013-empathy-747a707e7dda44eb3b84a1afb9ebdb150a629a9a.tar.bz2
gsoc2013-empathy-747a707e7dda44eb3b84a1afb9ebdb150a629a9a.tar.lz
gsoc2013-empathy-747a707e7dda44eb3b84a1afb9ebdb150a629a9a.tar.xz
gsoc2013-empathy-747a707e7dda44eb3b84a1afb9ebdb150a629a9a.tar.zst
gsoc2013-empathy-747a707e7dda44eb3b84a1afb9ebdb150a629a9a.zip
[darcs-to-svn @ Ctr+Enter adds a new line in and empathy-chat exits 5sec after the last chat was closed]
svn path=/trunk/; revision=39
Diffstat (limited to 'libempathy-gtk/gossip-chat.c')
-rw-r--r--libempathy-gtk/gossip-chat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libempathy-gtk/gossip-chat.c b/libempathy-gtk/gossip-chat.c
index 03f22514a..f5f6c415b 100644
--- a/libempathy-gtk/gossip-chat.c
+++ b/libempathy-gtk/gossip-chat.c
@@ -562,7 +562,7 @@ chat_input_key_press_event_cb (GtkWidget *widget,
text_view_sw = gtk_widget_get_parent (GTK_WIDGET (chat->view));
- if (IS_ENTER (event->keyval) && (event->state & GDK_SHIFT_MASK)) {
+ if (IS_ENTER (event->keyval) && (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK))) {
/* Newline for shift-enter. */
return FALSE;
}