Changeset b38f655


Ignore:
Timestamp:
2015-05-28T05:26:30Z (5 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
6191263, d2d2b80
Parents:
0864a52
git-author:
dequis <dx@…> (28-05-15 03:41:37)
git-committer:
dequis <dx@…> (28-05-15 05:26:30)
Message:

Rename mail notification related settings for consistency

  • GMail notifications stuff is now just 'mail_notifications'
  • sed -i s/notify_handle/mail_notifications_handle/
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • doc/user-guide/commands.xml

    r0864a52 rb38f655  
    10171017                <description>
    10181018                        <para>
    1019                                 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.
    1020                         </para>
    1021                 </description>
    1022 
    1023         </bitlbee-setting>
    1024 
    1025         <bitlbee-setting name="notify_handle" type="string" scope="account">
     1019                                Some protocols (MSN, Yahoo!, GTalk) 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.
     1020                        </para>
     1021                </description>
     1022
     1023        </bitlbee-setting>
     1024
     1025        <bitlbee-setting name="mail_notifications_handle" type="string" scope="account">
    10261026                <default>empty</default>
    10271027
     
    10291029                        <para>
    10301030                                This setting is available for protocols with e-mail notification functionality. If set to empty all e-mail notifications will go to control channel, if set to some string - this will be the name of a contact who will PRIVMSG you on every new notification.
    1031                         </para>
    1032                 </description>
    1033 
    1034         </bitlbee-setting>
    1035 
    1036         <bitlbee-setting name="gmail_notifications" type="boolean" scope="account">
    1037                 <default>false</default>
    1038 
    1039                 <description>
    1040                         <para>
    1041                                 Same as "mail_notifications" but GMail specific.
    10421031                        </para>
    10431032                </description>
  • protocols/bee_user.c

    r0864a52 rb38f655  
    286286
    287287        /* up to the protocol to set_add this if they want to use this */
    288         handle = set_getstr(&ic->acc->set, "notify_handle");
     288        handle = set_getstr(&ic->acc->set, "mail_notifications_handle");
    289289
    290290        if (handle != NULL) {
  • protocols/jabber/iq.c

    r0864a52 rb38f655  
    803803        }
    804804
    805         max = set_getint(&ic->acc->set, "gmail_notifications_limit");
     805        max = set_getint(&ic->acc->set, "mail_notifications_limit");
    806806        c = c->children;
    807807
  • protocols/jabber/jabber.c

    r0864a52 rb38f655  
    101101        s = set_add(&acc->set, "xmlconsole", "false", set_eval_bool, acc);
    102102
    103         s = set_add(&acc->set, "gmail_notifications", "false", set_eval_bool, acc);
     103        s = set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
    104104        s->flags |= ACC_SET_OFFLINE_ONLY;
    105105
    106106        /* changing this is rarely needed so keeping it secret */
    107         s = set_add(&acc->set, "gmail_notifications_limit", "5", set_eval_int, acc);
     107        s = set_add(&acc->set, "mail_notifications_limit", "5", set_eval_int, acc);
    108108        s->flags |= SET_HIDDEN_DEFAULT;
    109109
    110         s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
     110        s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
    111111        s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
    112112
     
    268268                imcb_add_buddy(ic, JABBER_XMLCONSOLE_HANDLE, NULL);
    269269        }
    270         if (set_getbool(&acc->set, "gmail_notifications")) {
     270
     271        if (set_getbool(&acc->set, "mail_notifications")) {
     272                /* It's gmail specific, but it checks for server support before enabling it */
    271273                jd->flags |= JFLAG_GMAILNOTIFY;
    272                 if (set_getstr(&acc->set, "notify_handle")) {
    273                         imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
     274                if (set_getstr(&acc->set, "mail_notifications_handle")) {
     275                        imcb_add_buddy(ic, set_getstr(&acc->set, "mail_notifications_handle"), NULL);
    274276                }
    275277        }
  • protocols/msn/msn.c

    r0864a52 rb38f655  
    4949        s->flags |= ACC_SET_OFFLINE_ONLY;
    5050
    51         s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
     51        s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
    5252        s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
    5353
     
    8787                       set_getint(&ic->acc->set, "port"));
    8888
    89         if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
    90                 imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
     89        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "mail_notifications_handle")) {
     90                imcb_add_buddy(ic, set_getstr(&acc->set, "mail_notifications_handle"), NULL);
    9191        }
    9292}
  • protocols/purple/purple.c

    r0864a52 rb38f655  
    239239                s->flags |= ACC_SET_OFFLINE_ONLY;
    240240
    241                 s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
     241                s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
    242242                s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
    243243        }
     
    336336        purple_account_set_enabled(pd->account, "BitlBee", TRUE);
    337337
    338         if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
    339                 imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
     338        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "mail_notifications_handle")) {
     339                imcb_add_buddy(ic, set_getstr(&acc->set, "mail_notifications_handle"), NULL);
    340340        }
    341341}
  • protocols/yahoo/yahoo.c

    r0864a52 rb38f655  
    128128        s->flags |= ACC_SET_OFFLINE_ONLY;
    129129
    130         s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
     130        s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
    131131        s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
    132132
     
    152152        yahoo_login(yd->y2_id, yd->current_status);
    153153
    154         if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
    155                 imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
     154        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "mail_notifications_handle")) {
     155                imcb_add_buddy(ic, set_getstr(&acc->set, "mail_notifications_handle"), NULL);
    156156        }
    157157}
Note: See TracChangeset for help on using the changeset viewer.