Changeset 29ff5c2 for protocols/bee.h

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (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 feat/hip-cat

File:

• protocols/bee.h (modified) (3 diffs)

protocols/bee.h

@@ -62 +62 @@
         BEE_USER_LOCAL = 256,   /* Locally-added contacts (not in real contact list) */
         BEE_USER_SPECIAL = 512, /* Denotes a user as being special */
+        BEE_USER_NOOTR = 4096,  /* Per-user version of OPT_NOOTR */
 } bee_user_flags_t;
 
@@ -104 +105 @@
         gboolean (*user_status)(bee_t *bee, struct bee_user *bu, struct bee_user *old);
         /* On every incoming message. sent_at = 0 means unknown. */
-        gboolean (*user_msg)(bee_t *bee, bee_user_t *bu, const char *msg, time_t sent_at);
+        gboolean (*user_msg)(bee_t *bee, bee_user_t *bu, const char *msg, guint32 flags, time_t sent_at);
         /* Flags currently defined (OPT_TYPING/THINKING) in nogaim.h. */
         gboolean (*user_typing)(bee_t *bee, bee_user_t *bu, guint32 flags);
@@ -119 +120 @@
         /* System messages of any kind. */
         gboolean (*chat_log)(bee_t *bee, struct groupchat *c, const char *text);
-        gboolean (*chat_msg)(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *msg, time_t sent_at);
+        gboolean (*chat_msg)(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *msg, guint32 flags, 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);