Mercurial > pidgin.yaz
changeset 10115:4fd312ceaa29
[gaim-migrate @ 11149]
I neglected to commit the changes to gtkconv.c for the keybinding stuff,
so if you tried it last night, it works now.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 18 Oct 2004 17:25:25 +0000 |
| parents | 70a82a701aad |
| children | 9f358a718f38 |
| files | src/gtkconv.c |
| diffstat | 1 files changed, 5 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Mon Oct 18 12:52:55 2004 +0000 +++ b/src/gtkconv.c Mon Oct 18 17:25:25 2004 +0000 @@ -1655,17 +1655,6 @@ /* If CTRL was held down... */ if (event->state & GDK_CONTROL_MASK) { switch (event->keyval) { - case GDK_Return: - case GDK_KP_Enter: - if (gaim_prefs_get_bool( - "/gaim/gtk/conversations/ctrl_enter_sends")) - { - send_cb(NULL, conv); - - return TRUE; - } - break; - case GDK_Up: if (!conv->send_history) break; @@ -1775,17 +1764,7 @@ { switch (event->keyval) { - case GDK_Return: - case GDK_KP_Enter: - if (!(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) && - gaim_prefs_get_bool("/gaim/gtk/conversations/enter_sends")) - { - send_cb(NULL, conv); - return TRUE; - } - break; - - case GDK_Tab: + case GDK_Tab: return tab_complete(conv); break; @@ -4224,6 +4203,8 @@ g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event", G_CALLBACK(entry_key_press_cb), conv); + g_signal_connect(G_OBJECT(gtkconv->entry), "message_send", + G_CALLBACK(send_cb), conv); g_signal_connect_after(G_OBJECT(gtkconv->entry), "button_press_event", G_CALLBACK(entry_stop_rclick_cb), NULL); g_signal_connect(G_OBJECT(gtkconv->entry), "size-allocate", @@ -4368,7 +4349,8 @@ g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv); g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event", - G_CALLBACK(entry_key_press_cb), conv); + G_CALLBACK(entry_key_press_cb), conv); + g_signal_connect(G_OBJECT(gtkconv->entry), "message_send", G_CALLBACK(send_cb), conv); g_signal_connect_after(G_OBJECT(gtkconv->entry), "button_press_event", G_CALLBACK(entry_stop_rclick_cb), NULL); g_signal_connect(G_OBJECT(gtkconv->entry), "size-allocate",