Changeset b1dc403 for protocols/bee_user.c

Timestamp:

2015-05-04T21:58:50Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5726a0d

Parents:

531eabd (diff), 5ca1416 (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:

Catch up with master.

File:

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

protocols/bee_user.c

@@ -68 +68 @@
         }
 
+        bee->users = g_slist_remove(bee->users, bu);
+
         g_free(bu->handle);
         g_free(bu->fullname);
@@ -74 +76 @@
         g_free(bu->status_msg);
         g_free(bu);
-
-        bee->users = g_slist_remove(bee->users, bu);
 
         return 1;
@@ -247 +247 @@
 }
 
-void imcb_buddy_msg(struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at)
+void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, uint32_t flags, time_t sent_at)
 {
         bee_t *bee = ic->bee;