Merge branch 'develop'

1 files changed, 18 insertions, 0 deletions

diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 04db365e..431b3e54 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -99,8 +99,17 @@ static void jabber_init(account_t *acc)
 	s = set_add(&acc->set, "user_agent", "BitlBee", NULL, acc);
 
 	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 |
 	              ACC_FLAG_HANDLE_DOMAINS;
 }
@@ -259,6 +268,14 @@ void jabber_connect(struct im_connection *ic)
 		imcb_add_buddy(ic, JABBER_XMLCONSOLE_HANDLE, NULL);
 	}
 
+	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);
 }
 
@@ -333,6 +350,7 @@ static void jabber_logout(struct im_connection *ic)
 	g_free(jd->oauth2_access_token);
 	g_free(jd->away_message);
 	g_free(jd->internal_jid);
+	g_free(jd->gmail_tid);
 	g_free(jd->username);
 	g_free(jd->me);
 	g_free(jd);