Changeset b75671d for protocols/purple

Timestamp:

2015-06-17T22:47:26Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b441614

Parents:

d832164 (diff), 2f99f23 (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 remote-tracking branch 'origin/master' into parson

File:

• protocols/purple/purple.c (modified) (3 diffs)

protocols/purple/purple.c

@@ -238 +238 @@
                 s = set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
                 s->flags |= ACC_SET_OFFLINE_ONLY;
+
+                s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
+                s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
         }
 
@@ -337 +340 @@
 
         purple_account_set_enabled(pd->account, "BitlBee", TRUE);
+
+        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "mail_notifications_handle")) {
+                imcb_add_buddy(ic, set_getstr(&acc->set, "mail_notifications_handle"), NULL);
+        }
 }
 
@@ -1260 +1267 @@
         struct im_connection *ic = purple_ic_by_gc(gc);
 
-        imcb_log(ic, "Received e-mail from %s for %s: %s <%s>", from, to, subject, url);
+        imcb_notify_email(ic, "Received e-mail from %s for %s: %s <%s>", from, to, subject, url);
 
         return NULL;