Changes in protocols/yahoo/yahoo.c [b38f655:05816dd]

File:

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

protocols/yahoo/yahoo.c

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