Changeset 0864a52

Timestamp:

2015-05-28T05:26:30Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

b38f655

Parents:

faeb521

git-author:

dequis <dx@…> (08-05-15 04:16:37)

git-committer:

dequis <dx@…> (28-05-15 05:26:30)

Message:

imcb_notify_email: change parameters to take a format string

Saves some messing with g_strdup_printf for the callers, and
flags/sent_at weren't used anyway.

Also check if the mail_notifications setting is enabled

Location:

protocols

Files:

• bee.h (modified) (1 diff)
• bee_user.c (modified) (1 diff)
• jabber/iq.c (modified) (2 diffs)
• msn/ns.c (modified) (2 diffs)
• purple/purple.c (modified) (1 diff)
• yahoo/yahoo.c (modified) (1 diff)

protocols/bee.h

@@ -156 +156 @@
 G_MODULE_EXPORT void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, guint32 flags,
                                     time_t sent_at);
-G_MODULE_EXPORT void imcb_notify_email(struct im_connection *ic, const char *handle, char *msg, guint32 flags,
-                                       time_t sent_at);
+G_MODULE_EXPORT void imcb_notify_email(struct im_connection *ic, char *format, ...) G_GNUC_PRINTF(2, 3);
 
 /* bee_chat.c */

protocols/bee_user.c

@@ -271 +271 @@
 }
 
-void imcb_notify_email(struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at)
-{
+void imcb_notify_email(struct im_connection *ic, char *format, ...)
+{
+        const char *handle;
+        va_list params;
+        char *msg;
+
+        if (!set_getbool(&ic->acc->set, "mail_notifications")) {
+                return;
+        }
+
+        va_start(params, format);
+        msg = g_strdup_vprintf(format, params);
+        va_end(params);
+
+        /* up to the protocol to set_add this if they want to use this */
+        handle = set_getstr(&ic->acc->set, "notify_handle");
+
         if (handle != NULL) {
-                imcb_buddy_msg(ic, handle, msg, flags, sent_at);
+                imcb_buddy_msg(ic, handle, msg, 0, 0);
         } else {
                 imcb_log(ic, "%s", msg);
         }
+
+        g_free(msg);
 }
 

protocols/jabber/iq.c

@@ -810 +810 @@
                 char *subject = "<no subject>";
                 char *sender = "<no sender>";
-                char *msg = NULL;
                 guint64 t_time;
 
@@ -828 +827 @@
                 }
 
-                msg = g_strdup_printf("New mail from %s: %s", sender, subject);
-
-                imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
+                imcb_notify_email(ic, "New mail from %s: %s", sender, subject);
 
                 c = c->next;
-                g_free(msg);
         }
 

protocols/msn/ns.c

@@ -394 +394 @@
 
                                         if (inbox && folders) {
-                                                char *msg = g_strdup_printf(
+                                                imcb_notify_email(ic,
                                                         "INBOX contains %s new messages, plus %s messages in other folders.", inbox,
                                                         folders);
-                                                imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
-                                                g_free(msg);
                                         }
 
@@ -410 +408 @@
 
                                         if (from && fromname) {
-                                                char *msg = g_strdup_printf("Received an e-mail message from %s <%s>.",
-                                                                            fromname, from);
-                                                imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
-                                                g_free(msg);
+                                                imcb_notify_email(ic, "Received an e-mail message from %s <%s>.", fromname, from);
                                         }
 

protocols/purple/purple.c

@@ -1261 +1261 @@
 {
         struct im_connection *ic = purple_ic_by_gc(gc);
-        char *msg = g_strdup_printf("Received e-mail from %s for %s: %s <%s>", from, to, subject, url);
-
-        imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
-        g_free(msg);
+
+        imcb_notify_email(ic, "Received e-mail from %s for %s: %s <%s>", from, to, subject, url);
 
         return NULL;

protocols/yahoo/yahoo.c

@@ -959 +959 @@
 {
         struct im_connection *ic = byahoo_get_ic_by_id(id);
-        char *msg;
-
-        if (set_getbool(&ic->acc->set, "mail_notifications")) {
-                if (from && subj) {
-                        msg = g_strdup_printf("Received e-mail message from %s with subject `%s'", from, subj);
-                } else if (cnt > 0) {
-                        msg = g_strdup_printf("Received %d new e-mails", cnt);
-                }
-
-                imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
-                g_free(msg);
+
+        if (from && subj) {
+                imcb_notify_email(ic, "Received e-mail message from %s with subject `%s'", from, subj);
+        } else if (cnt > 0) {
+                imcb_notify_email(ic, "Received %d new e-mails", cnt);
         }
 }