Changeset eb73d05

Timestamp:

2017-05-07T19:06:29Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

54b2a36

Parents:

17a58df

Message:

Fix status message being set to null accidentally

In other words, "account jabber set away Message" resulted in away
status being set, but not "Message".

Fixes trac ticket 1291

This was broken by ac68733ad7a5127395d6367b655a2d9de5d911b5 (3.4.2)

That commit added another call of imc_away_state_find() with the fixed
string "away", so purple protocols can become away by setting away to
any string. But by doing so, it wiped the status message because it's
the same as the name of the away state.

File:

• protocols/nogaim.c (modified) (3 diffs)

protocols/nogaim.c

@@ -768 +768 @@
                 msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
                 away = imc_away_state_find(m, away, &msg) ? :
-                       (imc_away_state_find(m, "away", &msg) ? : m->data);
+                       (imc_away_state_find(m, "away", NULL) ? : m->data);
         } else if (ic->acc->flags & ACC_FLAG_STATUS_MESSAGE) {
                 away = NULL;
@@ -802 +802 @@
                            contains no data unless it adds something to what
                            we have in state already. */
-                        if (strlen(m->data) == strlen(away)) {
+                        if (message && strlen(m->data) == strlen(away)) {
                                 *message = NULL;
                         }
@@ -828 +828 @@
                         for (m = gcm; m; m = m->next) {
                                 if (g_strcasecmp(imc_away_alias_list[i][j], m->data) == 0) {
-                                        if (!keep_message) {
+                                        if (!keep_message && message) {
                                                 *message = NULL;
                                         }