diff options
Diffstat (limited to 'protocols/jabber')
| -rw-r--r-- | protocols/jabber/iq.c | 2 | ||||
| -rw-r--r-- | protocols/jabber/jabber.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/protocols/jabber/iq.c b/protocols/jabber/iq.c index 1a915e4a..327cc859 100644 --- a/protocols/jabber/iq.c +++ b/protocols/jabber/iq.c @@ -802,7 +802,7 @@ xt_status jabber_iq_parse_gmail(struct im_connection *ic, struct xt_node *node, return XT_HANDLED; } - max = set_getint(&ic->acc->set, "gmail_notifications_limit"); + max = set_getint(&ic->acc->set, "mail_notifications_limit"); c = c->children; while ((max-- > 0) && (c = xt_find_node(c, "mail-thread-info"))) { diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index 08da6e26..431b3e54 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -100,14 +100,14 @@ static void jabber_init(account_t *acc) 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; acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE | @@ -267,10 +267,12 @@ void jabber_connect(struct im_connection *ic) I think this shouldn't break anything. */ 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); } } |