Changeset 3fbce97 for protocols/bee_chat.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 parson

File:

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

protocols/bee_chat.c

@@ -95 +95 @@
 }
 
-void imcb_chat_msg(struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at)
+void imcb_chat_msg(struct groupchat *c, const char *who, char *msg, guint32 flags, time_t sent_at)
 {
         struct im_connection *ic = c->ic;
         bee_t *bee = ic->bee;
         bee_user_t *bu;
-        gboolean temp;
+        gboolean temp = FALSE;
         char *s;
 
-        /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
-        if (handle_is_self(ic, who)) {
+        if (handle_is_self(ic, who) && !(flags & OPT_SELFMESSAGE)) {
                 return;
         }
@@ -122 +121 @@
 
         if (bee->ui->chat_msg) {
-                bee->ui->chat_msg(bee, c, bu, msg, sent_at);
+                bee->ui->chat_msg(bee, c, bu, msg, flags, sent_at);
         }
 
@@ -230 +229 @@
 
         if (bee->ui->chat_remove_user && bu) {
-                bee->ui->chat_remove_user(bee, c, bu);
+                bee->ui->chat_remove_user(bee, c, bu, reason);
         }
 }