Move away from BOOL

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

diff --git a/src/gui/gtk/JubGtkChatUI.m b/src/gui/gtk/JubGtkChatUI.m
index 975a08d21b8252360930ad8b7582acee1fa4e659..1b020f24635442440b19a2a0dcf7e60a1bd17f75 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)
@@ -42,13 +37,13 @@ static void call_close_block(GtkWidget *object, gpointer data)
        self = [super init];
 
        @try {
-               __block volatile BOOL initialized = NO;
+               __block volatile bool initialized = false;
                __block GtkWidget *chat_window;
                __block GtkTextBuffer *chat_buffer;
 
                _closeBlock = [closeBlock copy];
                _sendBlock = [sendBlock copy];
-               _bufferEmpty = YES;
+               _bufferEmpty = true;
 
                g_idle_add_block(^{
                        GtkEntry *chat_entry;
@@ -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,16 +67,16 @@ 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),
                            [title UTF8String]);
                        gtk_widget_show(chat_window);
 
-                       initialized = YES;
+                       initialized = true;
 
                        g_object_unref(builder);
                });
@@ -110,8 +105,8 @@ static void call_close_block(GtkWidget *object, gpointer data)
 - (void)addMessage: (OFString*)text
            sender: (OFString*)sender
 {
-       BOOL first = _bufferEmpty;
-       if (OF_UNLIKELY(_bufferEmpty)) _bufferEmpty = NO;
+       bool first = _bufferEmpty;
+       if (OF_UNLIKELY(_bufferEmpty)) _bufferEmpty = false;
 
        g_idle_add_block(^{
                GtkTextIter end_iter;