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 bf130a9879f42c17a56bb75a3e099f38045b3000..1b020f24635442440b19a2a0dcf7e60a1bd17f75 100644 (file)
--- a/src/gui/gtk/JubGtkChatUI.m
+++ b/src/gui/gtk/JubGtkChatUI.m
@@ -37,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;
@@ -55,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"));
@@ -67,7 +67,7 @@ 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, "activate",
                            G_CALLBACK(call_send_block), send_params);
@@ -76,7 +76,7 @@ static void call_close_block(GtkWidget *object, gpointer data)
                            [title UTF8String]);
                        gtk_widget_show(chat_window);
 
-                       initialized = YES;
+                       initialized = true;
 
                        g_object_unref(builder);
                });
@@ -105,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;