Changeset b75671d for protocols/jabber/jabber.c

Timestamp:

2015-06-17T22:47:26Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b441614

Parents:

d832164 (diff), 2f99f23 (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 remote-tracking branch 'origin/master' into parson

File:

• protocols/jabber/jabber.c (modified) (4 diffs)

protocols/jabber/jabber.c

@@ -100 +100 @@
 
         s = set_add(&acc->set, "xmlconsole", "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, "mail_notifications_limit", "5", set_eval_int, acc);
+        s->flags |= SET_HIDDEN_DEFAULT;
+
+        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 |
@@ -260 +269 @@
         }
 
+        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, "mail_notifications_handle")) {
+                        imcb_add_buddy(ic, set_getstr(&acc->set, "mail_notifications_handle"), NULL);
+                }
+        }
+
         jabber_generate_id_hash(jd);
 }
@@ -334 +351 @@
         g_free(jd->away_message);
         g_free(jd->internal_jid);
+        g_free(jd->gmail_tid);
         g_free(jd->username);
         g_free(jd->me);
@@ -428 +446 @@
         }
 
-        jabber_get_vcard(ic, bud ? bud->full_jid : who);
+        jabber_get_vcard(ic, who);
 }