Changeset b38f655

Timestamp:

2015-05-28T05:26:30Z (9 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:

• doc/user-guide/commands.xml (modified) (2 diffs)
• protocols/bee_user.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (2 diffs)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/purple/purple.c (modified) (2 diffs)
• protocols/yahoo/yahoo.c (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -1017 +1017 @@
                 <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="notify_handle" type="string" scope="account">
+                                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.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
+        <bitlbee-setting name="mail_notifications_handle" type="string" scope="account">
                 <default>empty</default>
 
@@ -1029 +1029 @@
                         <para>
                                 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.
-                        </para>
-                </description>
-
-        </bitlbee-setting>
-
-        <bitlbee-setting name="gmail_notifications" type="boolean" scope="account">
-                <default>false</default>
-
-                <description>
-                        <para>
-                                Same as "mail_notifications" but GMail specific.
                         </para>
                 </description>

protocols/bee_user.c

@@ -286 +286 @@
 
         /* up to the protocol to set_add this if they want to use this */
-        handle = set_getstr(&ic->acc->set, "notify_handle");
+        handle = set_getstr(&ic->acc->set, "mail_notifications_handle");
 
         if (handle != NULL) {

protocols/jabber/iq.c

@@ -803 +803 @@
         }
 
-        max = set_getint(&ic->acc->set, "gmail_notifications_limit");
+        max = set_getint(&ic->acc->set, "mail_notifications_limit");
         c = c->children;
 

protocols/jabber/jabber.c

@@ -101 +101 @@
         s = set_add(&acc->set, "xmlconsole", "false", set_eval_bool, acc);
 
-        s = set_add(&acc->set, "gmail_notifications", "false", set_eval_bool, acc);
+        s = set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
         /* changing this is rarely needed so keeping it secret */
-        s = set_add(&acc->set, "gmail_notifications_limit", "5", set_eval_int, acc);
+        s = set_add(&acc->set, "mail_notifications_limit", "5", set_eval_int, acc);
         s->flags |= SET_HIDDEN_DEFAULT;
 
-        s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
+        s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
@@ -268 +268 @@
                 imcb_add_buddy(ic, JABBER_XMLCONSOLE_HANDLE, NULL);
         }
-        if (set_getbool(&acc->set, "gmail_notifications")) {
+
+        if (set_getbool(&acc->set, "mail_notifications")) {
+                /* It's gmail specific, but it checks for server support before enabling it */
                 jd->flags |= JFLAG_GMAILNOTIFY;
-                if (set_getstr(&acc->set, "notify_handle")) {
-                        imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
+                if (set_getstr(&acc->set, "mail_notifications_handle")) {
+                        imcb_add_buddy(ic, set_getstr(&acc->set, "mail_notifications_handle"), NULL);
                 }
         }

protocols/msn/msn.c

@@ -49 +49 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
-        s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
+        s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
@@ -87 +87 @@
                        set_getint(&ic->acc->set, "port"));
 
-        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
-                imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
+        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/purple/purple.c

@@ -239 +239 @@
                 s->flags |= ACC_SET_OFFLINE_ONLY;
 
-                s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
+                s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
                 s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
         }
@@ -336 +336 @@
         purple_account_set_enabled(pd->account, "BitlBee", TRUE);
 
-        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
-                imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
+        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/yahoo/yahoo.c

@@ -128 +128 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
-        s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
+        s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
@@ -152 +152 @@
         yahoo_login(yd->y2_id, yd->current_status);
 
-        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
-                imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
+        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);
         }
 }