Changeset 70a76f3


Ignore:
Timestamp:
May 10, 2012, 1:25:06 AM (10 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
3442788 (diff), 2354e9a (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 2354e9a5fabd3efa2825b96557715caa33ede671 into 3442788e25354f35073af4d491d81295f3110948
File:
1 edited

Legend:

Unmodified
Added
Removed
  • message.c

    r97cdbaf5 r2354e9a  
    881881      NULL
    882882    };
    883     char *out;
     883    char *out = NULL;
    884884    int rv;
    885885    int status;
     
    898898      }
    899899      owl_message_set_body(m, out);
    900       g_free(out);
    901     } else if(out) {
    902       g_free(out);
    903     }
     900    } else {
     901      /* Replace the opcode. Otherwise the UI and other bits of code think the
     902       * message was encrypted. */
     903      owl_message_set_opcode(m, "failed-decrypt");
     904    }
     905    g_free(out);
    904906  }
    905907
Note: See TracChangeset for help on using the changeset viewer.