Merge remote-tracking branch 'gordon-quad/master'

https://github.com/haavard/tox-weechat/pull/11
2017-02-07 22:57:58 -08:00
parent 3735c38adf 4021d9da0e
commit 9928d0b8ed
17 changed files with 515 additions and 285 deletions
--- a/src/twc-message-queue.h
+++ b/src/twc-message-queue.h
@@ -33,14 +33,14 @@ struct t_twc_queued_message
 {
    struct tm *time;
    char *message;
-    enum TWC_MESSAGE_TYPE message_type;
+    TOX_MESSAGE_TYPE message_type;
 };

 void
 twc_message_queue_add_friend_message(struct t_twc_profile *profile,
                                     int32_t friend_number,
                                     const char *message,
-                                     enum TWC_MESSAGE_TYPE message_type);
+                                     TOX_MESSAGE_TYPE message_type);

 void
 twc_message_queue_flush_friend(struct t_twc_profile *profile,