diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-05-10 02:06:22 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-05-10 02:06:22 +0800 |
| commit | 53875e71dcc04b1197d97e654f43293c74557d92 (patch) | |
| tree | a919b4247c9b3a80cb0089d9c26cbb22b2f9952e /libempathy-gtk | |
| parent | 50549ef5a4df1be5877e340c0fd86453532b8088 (diff) | |
| download | gsoc2013-empathy-53875e71dcc04b1197d97e654f43293c74557d92.tar gsoc2013-empathy-53875e71dcc04b1197d97e654f43293c74557d92.tar.gz gsoc2013-empathy-53875e71dcc04b1197d97e654f43293c74557d92.tar.bz2 gsoc2013-empathy-53875e71dcc04b1197d97e654f43293c74557d92.tar.lz gsoc2013-empathy-53875e71dcc04b1197d97e654f43293c74557d92.tar.xz gsoc2013-empathy-53875e71dcc04b1197d97e654f43293c74557d92.tar.zst gsoc2013-empathy-53875e71dcc04b1197d97e654f43293c74557d92.zip | |
[darcs-to-svn @ Ctr+Enter adds a new line in and empathy-chat exits 5sec after the last chat was closed]
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@39 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/gossip-chat.c | 2 |
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; } |