[darcs-to-svn @ Ctr+Enter adds a new line in and empathy-chat exits 5sec after the...

[empathy.git] / libempathy-gtk / gossip-chat.c

diff --git a/libempathy-gtk/gossip-chat.c b/libempathy-gtk/gossip-chat.c
index 03f22514af87584257f4ddc5472636f07bad7b6d..f5f6c415bce76db784ec1245f5d46925d8aad10a 100644 (file)
--- 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;
        }