Changeset 7a9d968 for protocols/bee_user.c

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into HEAD

File:

• protocols/bee_user.c (modified) (2 diffs)

protocols/bee_user.c

@@ -170 +170 @@
 
         if (!(bu = bee_user_by_handle(bee, ic, handle))) {
-                if (g_strcasecmp(set_getstr(&ic->bee->set, "handle_unknown"), "add") == 0) {
+                char *h = set_getstr(&ic->acc->set, "handle_unknown") ? :
+                          set_getstr(&ic->bee->set, "handle_unknown");
+
+                if (g_strncasecmp(h, "add", 3) == 0) {
                         bu = bee_user_new(bee, ic, handle, BEE_USER_LOCAL);
                 } else {
-                        if (g_strcasecmp(set_getstr(&ic->bee->set, "handle_unknown"), "ignore") != 0) {
+                        if (g_strcasecmp(h, "ignore") != 0) {
                                 imcb_log(ic, "imcb_buddy_status() for unknown handle %s:\n"
                                          "flags = %d, state = %s, message = %s", handle, flags,
@@ -255 +258 @@
 
         if (!bu && !(ic->flags & OPT_LOGGING_OUT)) {
-                char *h = set_getstr(&bee->set, "handle_unknown");
+                char *h = set_getstr(&ic->acc->set, "handle_unknown") ? :
+                          set_getstr(&ic->bee->set, "handle_unknown");
 
                 if (g_strcasecmp(h, "ignore") == 0) {