Update to ObjFW changes

diff --git a/src/gui/cli/JubCLIUI.m b/src/gui/cli/JubCLIUI.m
index 16083c04c120761d9a82b6a5438f6d06dab88e11..6f0b03a68c5d51440a6c13d36b8f5850f7845a27 100644 (file)
--- a/src/gui/cli/JubCLIUI.m
+++ b/src/gui/cli/JubCLIUI.m
@@ -228,7 +228,7 @@ ENDCLICOMMAND
                __block size_t longest = 0;
 
                [_commands enumerateKeysAndObjectsUsingBlock:
-                   ^(OFString *key, id<JubCLICommand> command, BOOL *stop) {
+                   ^(OFString *key, id<JubCLICommand> command, bool *stop) {
                        size_t length = [command.command length] +
                            (command.params == nil ? 0 :
                                (1 + [command.params length]));

diff --git a/src/gui/gtk/JubGObjectMap.m b/src/gui/gtk/JubGObjectMap.m
index ce6217aefc91f2c1a48828ba8853984dfb6c9c29..0f58589b503f9ab67cf971b73b2d95ace9eebc2c 100644 (file)
--- a/src/gui/gtk/JubGObjectMap.m
+++ b/src/gui/gtk/JubGObjectMap.m
@@ -16,7 +16,7 @@ static uint32_t hash(void *value)
        return [(id)value hash];
 }
 
-static BOOL equal(void *value1, void *value2)
+static bool equal(void *value1, void *value2)
 {
        return [(id)value1 isEqual: (id)value2];
 }
@@ -53,7 +53,7 @@ static uint32_t default_hash(void *value)
 #undef NUM
 }
 
-static BOOL default_equal(void *value1, void *value2)
+static bool default_equal(void *value1, void *value2)
 {
        return (value1 == value2);
 }

diff --git a/src/gui/gtk/JubGtkRosterUI.m b/src/gui/gtk/JubGtkRosterUI.m
index c18f0074044b1dbd405d151981c78c88ef1e0fe9..a805adf5129c80ae270688fbaa02271addac75d7 100644 (file)
--- a/src/gui/gtk/JubGtkRosterUI.m
+++ b/src/gui/gtk/JubGtkRosterUI.m
@@ -311,7 +311,7 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model,
            [OFMutableString stringWithString: @"<b>Resources:</b>"];
 
        [allPresences enumerateKeysAndObjectsUsingBlock:
-           ^(OFString *resource, XMPPPresence *pres, BOOL *stop) {
+           ^(OFString *resource, XMPPPresence *pres, bool *stop) {
                [tooltip appendString: @"\n"];
                [tooltip appendString: resource];
                if ([pres.type isEqual: @"available"]) {