JubGtkChat: Refer to the correct version of the close and send blocks

[jubjub.git] / src / gui / gtk / JubGtkChatUI.m

diff --git a/src/gui/gtk/JubGtkChatUI.m b/src/gui/gtk/JubGtkChatUI.m
index 975a08d21b8252360930ad8b7582acee1fa4e659..c4e55054b4879d8b42c217fa9909b99d4d4ba1e6 100644 (file)
--- a/src/gui/gtk/JubGtkChatUI.m
+++ b/src/gui/gtk/JubGtkChatUI.m
@@ -6,12 +6,9 @@ struct call_send_block_params {
        JubGtkChatUI *chat;
 };
 
-static gboolean call_send_block(GtkEntry *entry, GdkEventKey *event,
-    gpointer data)
+static void call_send_block(GtkEntry *entry, gpointer data)
 {
        struct call_send_block_params *params = data;
-       if (event->keyval != GDK_KEY_Return &&
-           event->keyval != GDK_KEY_KP_Enter) return TRUE;
 
        OFString *text =
            [[OFString alloc] initWithUTF8String: gtk_entry_get_text(entry)];
@@ -24,8 +21,6 @@ static gboolean call_send_block(GtkEntry *entry, GdkEventKey *event,
        }
 
        [text release];
-
-       return TRUE;
 }
 
 static void call_close_block(GtkWidget *object, gpointer data)
@@ -60,7 +55,7 @@ static void call_close_block(GtkWidget *object, gpointer data)
                        chat_window = GTK_WIDGET(
                            gtk_builder_get_object(builder, "ChatWindow"));
                        g_signal_connect(chat_window, "destroy",
-                           G_CALLBACK(call_close_block), closeBlock);
+                           G_CALLBACK(call_close_block), _closeBlock);
 
                        _chat_view = GTK_TEXT_VIEW(
                            gtk_builder_get_object(builder, "ChatTextView"));
@@ -72,9 +67,9 @@ static void call_close_block(GtkWidget *object, gpointer data)
                            gtk_builder_get_object(builder, "ChatEntry"));
                        struct call_send_block_params *send_params =
                            [self allocMemoryWithSize: sizeof(*send_params)];
-                       send_params->block = sendBlock;
+                       send_params->block = _sendBlock;
                        send_params->chat = self;
-                       g_signal_connect(chat_entry, "key_release_event",
+                       g_signal_connect(chat_entry, "activate",
                            G_CALLBACK(call_send_block), send_params);
 
                        gtk_window_set_title(GTK_WINDOW(chat_window),