Changeset 6b56512

Timestamp:

2015-08-08T04:29:49Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

83f179d6

Parents:

4850065

git-author:

dequis <dx@…> (02-08-15 19:21:56)

git-committer:

dequis <dx@…> (08-08-15 04:29:49)

Message:

Pass 'reason' values around in imcb_chat_remove_buddy/chat_remove_user

Files:

• irc_im.c (modified) (2 diffs)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_chat.c (modified) (1 diff)

irc_im.c

@@ -654 +654 @@
 }
 
-static gboolean bee_irc_chat_remove_user(bee_t *bee, struct groupchat *c, bee_user_t *bu)
+static gboolean bee_irc_chat_remove_user(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *reason)
 {
         irc_t *irc = bee->ui_data;
@@ -666 +666 @@
            using imcb_chat_free() and the channel was IRC_CHANNEL_TEMP, we get into
            a broken state around here. */
-        irc_channel_del_user(ic, bu == bee->user ? irc->user : bu->ui_data, IRC_CDU_PART, NULL);
+        irc_channel_del_user(ic, bu == bee->user ? irc->user : bu->ui_data, IRC_CDU_PART, reason);
 
         return TRUE;

protocols/bee.h

@@ -119 +119 @@
         gboolean (*chat_msg)(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *msg, time_t sent_at);
         gboolean (*chat_add_user)(bee_t *bee, struct groupchat *c, bee_user_t *bu);
-        gboolean (*chat_remove_user)(bee_t *bee, struct groupchat *c, bee_user_t *bu);
+        gboolean (*chat_remove_user)(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *reason);
         gboolean (*chat_topic)(bee_t *bee, struct groupchat *c, const char *new_topic, bee_user_t *bu);
         gboolean (*chat_name_hint)(bee_t *bee, struct groupchat *c, const char *name);

protocols/bee_chat.c

@@ -230 +230 @@
 
         if (bee->ui->chat_remove_user && bu) {
-                bee->ui->chat_remove_user(bee, c, bu);
+                bee->ui->chat_remove_user(bee, c, bu, reason);
         }
 }