Changeset faeb521

Timestamp:

2015-05-28T05:26:30Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0864a52

Parents:

dd43c62

git-author:

dequis <dx@…> (08-05-15 03:26:19)

git-committer:

dequis <dx@…> (28-05-15 05:26:30)

Message:

Simplify display of gmail notifications

• Add gmail_notifications_limit hidden setting, set to 5 by default.
• Don't show "snippets" in email notifications. Not very useful and they make the whole thing seem too spammy
• Show sender name instead of your own email
• Default values for empty subject / sender

Location:

protocols/jabber

Files:

• iq.c (modified) (3 diffs)
• jabber.c (modified) (1 diff)

protocols/jabber/iq.c

@@ -793 +793 @@
         guint64 l_time = 0;
         char *tid = NULL;
+        int max = 0;
 
         if (!(c = xt_find_node(node->children, "mailbox")) ||
@@ -802 +803 @@
         }
 
+        max = set_getint(&ic->acc->set, "gmail_notifications_limit");
         c = c->children;
 
-        while ((c = xt_find_node(c, "mail-thread-info"))) {
-                struct xt_node *thread, *s;
-                char *subject = NULL;
-                char *snippet = NULL;
+        while ((max-- > 0) && (c = xt_find_node(c, "mail-thread-info"))) {
+                struct xt_node *s;
+                char *subject = "<no subject>";
+                char *sender = "<no sender>";
                 char *msg = NULL;
                 guint64 t_time;
@@ -817 +819 @@
                 }
 
-                thread = c->children;
-
-                if ((s = xt_find_node(thread, "subject"))) {
+                if ((s = xt_find_node(c->children, "senders")) &&
+                    (s = xt_find_node_by_attr(s->children, "sender", "unread", "1"))) {
+                        sender = xt_find_attr(s, "name");
+                }
+
+                if ((s = xt_find_node(c->children, "subject")) && s->text) {
                         subject = s->text;
                 }
 
-                if ((s = xt_find_node(thread, "snippet"))) {
-                        snippet = s->text;
-                }
-
-                if (subject) {
-                        msg = g_strdup_printf("New mail for %s. Subj: %s", from, subject);
-                } else {
-                        msg = g_strdup_printf("New mail for %s.", from);
-                }
+                msg = g_strdup_printf("New mail from %s: %s", sender, subject);
+
                 imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
-
-                if (snippet) {
-                        imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), snippet, 0, 0);
-                }
 
                 c = c->next;

protocols/jabber/jabber.c

@@ -103 +103 @@
         s = set_add(&acc->set, "gmail_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->flags |= SET_HIDDEN_DEFAULT;
 
         s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);