Changeset 1febf5c

Timestamp:

2008-01-05T21:15:32Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

46dca11

Parents:

6e68a52

Message:

Added "mail_notifications" setting. Who needs those notifications anyway?
Closes: #338.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/msn/ns.c (modified) (2 diffs)
• protocols/yahoo/yahoo.c (modified) (3 diffs)

doc/user-guide/commands.xml

@@ -475 +475 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="mail_notifications" type="boolean" scope="account">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                Some protocols (MSN, Yahoo!) can notify via IM about new e-mail. Since most people use their Hotmail/Yahoo! addresses as a spam-box, this is disabled default. If you want these notifications, you can enable this setting.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="ops" type="string" scope="global">
                 <default>both</default>

protocols/msn/msn.c

@@ -35 +35 @@
         s = set_add( &acc->set, "display_name", NULL, msn_set_display_name, acc );
         s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+
+        s = set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
 }
 

protocols/msn/ns.c

@@ -643 +643 @@
                                 char *folders = msn_findheader( body, "Folders-Unread:", blen );
                                 
-                                if( inbox && folders )
+                                if( inbox && folders && set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
                                         imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
@@ -653 +653 @@
                                 char *fromname = msn_findheader( body, "From:", blen );
                                 
-                                if( from && fromname )
+                                if( from && fromname && set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
                                         imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );

protocols/yahoo/yahoo.c

@@ -125 +125 @@
         
         return( g_strndup( in, len ) );
+}
+
+static void byahoo_init( account_t *acc )
+{
+        set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
 }
 
@@ -349 +354 @@
         struct prpl *ret = g_new0(struct prpl, 1);
         ret->name = "yahoo";
+        ret->init = byahoo_init;
         
         ret->login = byahoo_login;
@@ -923 +929 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        if( 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 )