Changeset 03df717

Timestamp:

2015-12-01T04:45:20Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

05aba55

Parents:

398a139

git-author:

dequis <dx@…> (01-12-15 04:38:30)

git-committer:

dequis <dx@…> (01-12-15 04:45:20)

Message:

Add 'log' UI function, to avoid direct calls to irc_rootmsg from nogaim

Just a trivial wrapper over irc_rootmsg(), but will help me to slightly
reduce the ugliness of an unavoidably ugly hack for libpurple.

Files:

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

irc_im.c

@@ -1109 +1109 @@
 }
 
+static void bee_irc_log(bee_t *bee, const char *tag, const char *msg)
+{
+        irc_t *irc = (irc_t *) bee->ui_data;
+
+        irc_rootmsg(irc, "%s - %s", tag, msg);
+}
+
 const struct bee_ui_funcs irc_ui_funcs = {
         bee_irc_imc_connected,
@@ -1137 +1144 @@
         bee_irc_ft_close,
         bee_irc_ft_finished,
+
+        bee_irc_log,
 };

protocols/bee.h

@@ -129 +129 @@
         void (*ft_close)(struct im_connection *ic, struct file_transfer *ft);
         void (*ft_finished)(struct im_connection *ic, struct file_transfer *ft);
+
+        void (*log)(bee_t *bee, const char *tag, const char *msg);
 } bee_ui_funcs_t;
 

protocols/nogaim.c

@@ -207 +207 @@
         account_t *a;
 
+        if (!ic->bee->ui->log) {
+                return;
+        }
+
         va_start(params, format);
         text = g_strdup_vprintf(format, params);
@@ -225 +229 @@
         /* If we found one, include the screenname in the message. */
         if (a) {
-                /* FIXME(wilmer): ui_log callback or so */
-                irc_rootmsg(ic->bee->ui_data, "%s - %s", ic->acc->tag, text);
+                ic->bee->ui->log(ic->bee, ic->acc->tag, text);
         } else {
-                irc_rootmsg(ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text);
+                ic->bee->ui->log(ic->bee, ic->acc->prpl->name, text);
         }