Changeset 0f7eccff for protocols/msn

Timestamp:

2015-05-31T00:11:20Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

6e21525

Parents:

c42d991 (diff), f453a7f (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 branch 'develop'

Location:

protocols/msn

Files:

• msn.c (modified) (2 diffs)
• ns.c (modified) (2 diffs)

protocols/msn/msn.c

@@ -46 +46 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
-        set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
+        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 |
@@ -82 +86 @@
         msn_ns_connect(ic, server,
                        set_getint(&ic->acc->set, "port"));
+
+        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);
+        }
 }
 

protocols/msn/ns.c

@@ -394 +394 @@
 
                                         if (inbox && folders) {
-                                                imcb_log(ic,
-                                                         "INBOX contains %s new messages, plus %s messages in other folders.", inbox,
-                                                         folders);
+                                                imcb_notify_email(ic,
+                                                        "INBOX contains %s new messages, plus %s messages in other folders.", inbox,
+                                                        folders);
                                         }
 
@@ -408 +408 @@
 
                                         if (from && fromname) {
-                                                imcb_log(ic, "Received an e-mail message from %s <%s>.", fromname,
-                                                         from);
+                                                imcb_notify_email(ic, "Received an e-mail message from %s <%s>.", fromname, from);
                                         }