Changeset b75671d for protocols/jabber/presence.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/presence.c (modified) (3 diffs)

protocols/jabber/presence.c

@@ -181 +181 @@
 }
 
+static char *choose_priority(struct im_connection *ic)
+{
+        struct jabber_data *jd = ic->proto_data;
+        char *prio = set_getstr(&ic->acc->set, "priority");
+
+        if (jd->away_state->code != NULL) {
+                int new_prio = (atoi(prio) - 5);
+                if (new_prio < 0) {
+                        new_prio = 0;
+                }
+                return g_strdup_printf("%d", new_prio);
+        }
+
+        return g_strdup(prio);
+}
+
 /* Whenever presence information is updated, call this function to inform the
    server. */
@@ -189 +205 @@
         GSList *l;
         int st;
+        char *prio = choose_priority(ic);
 
         node = jabber_make_packet("presence", NULL, NULL, NULL);
-        xt_add_child(node, xt_new_node("priority", set_getstr(&ic->acc->set, "priority"), NULL));
+        xt_add_child(node, xt_new_node("priority", prio, NULL));
         if (jd->away_state) {
                 xt_add_child(node, xt_new_node("show", jd->away_state->code, NULL));
@@ -222 +239 @@
 
         xt_free_node(node);
+        g_free(prio);
         return st;
 }