Changeset b75671d for protocols/yahoo/yahoo.c

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/yahoo/yahoo.c (modified) (3 diffs)

protocols/yahoo/yahoo.c

@@ -123 +123 @@
 static void byahoo_init(account_t *acc)
 {
-        set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
+        set_t *s;
+
+        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;
 
         acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
@@ -145 +151 @@
         yd->y2_id = yahoo_init(acc->user, acc->pass);
         yahoo_login(yd->y2_id, yd->current_status);
+
+        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);
+        }
 }
 
@@ -950 +960 @@
         struct im_connection *ic = byahoo_get_ic_by_id(id);
 
-        if (!set_getbool(&ic->acc->set, "mail_notifications")) {
-                ; /* The user doesn't care. */
-        } else if (from && subj) {
-                imcb_log(ic, "Received e-mail message from %s with subject `%s'", from, subj);
+        if (from && subj) {
+                imcb_notify_email(ic, "Received e-mail message from %s with subject `%s'", from, subj);
         } else if (cnt > 0) {
-                imcb_log(ic, "Received %d new e-mails", cnt);
+                imcb_notify_email(ic, "Received %d new e-mails", cnt);
         }
 }