pidgin/pidgin

Pulling default in again
replace-nm-with-gio
2015-12-29, Gary Kramlich
5a740d40503d
Parents 849d1220003978d036e70f8e
Children d45200b3228764464ea2cf7f
Pulling default in again
4 files changed, 14 insertions(+), 14 deletions(-)
  • +2 -0
    ChangeLog
  • +4 -8
    libpurple/plugins/codeinline.c
  • +4 -4
    libpurple/plugins/signals-test.c
  • +4 -2
    libpurple/savedstatuses.c
    • --- a/ChangeLog Mon Dec 28 21:56:53 2015 -0600
    +++ b/ChangeLog Tue Dec 29 21:48:15 2015 -0600
    @@ -12,6 +12,8 @@
    non-native plugin support.
    * Removed flags for manually configuring GnuTLS and NSS. They are now only
    recognized through pkg-config. (Michael McConville)
    + * Fixed an issue where transient startup statuses could be deleted
    + (Jakub Adam) (#16762)
    libpurple:
    * Specify a different set of encryption ciphers for TLS connections when
    --- a/libpurple/plugins/codeinline.c Mon Dec 28 21:56:53 2015 -0600
    +++ b/libpurple/plugins/codeinline.c Tue Dec 29 21:48:15 2015 -0600
    @@ -41,15 +41,11 @@
    return g_strjoinv("</font>", ms);
    }
    -static gboolean outgoing_msg_cb1(PurpleAccount *account, const char *who, char **message,
    - PurpleConversation *conv, PurpleMessageFlags flags, gpointer null)
    +static gboolean outgoing_msg_cb1(PurpleConversation *conv, PurpleMessage *msg,
    + gpointer null)
    {
    - char *m;
    -
    - m = outgoing_msg_common(*message);
    - g_free(*message);
    - *message = m;
    -
    + purple_message_set_contents(msg,
    + outgoing_msg_common(purple_message_get_contents(msg)));
    return FALSE;
    }
    --- a/libpurple/plugins/signals-test.c Mon Dec 28 21:56:53 2015 -0600
    +++ b/libpurple/plugins/signals-test.c Tue Dec 29 21:48:15 2015 -0600
    @@ -282,11 +282,11 @@
    * Conversation subsystem signal callbacks
    **************************************************************************/
    static gboolean
    -writing_im_msg_cb(PurpleAccount *account, const char *who, char **buffer,
    - PurpleConversation *conv, PurpleMessageFlags flags, void *data)
    +writing_im_msg_cb(PurpleConversation *conv, PurpleMessage *pmsg)
    {
    - purple_debug_misc("signals test", "writing-im-msg (%s, %s, %s)\n",
    - purple_account_get_username(account), purple_conversation_get_name(conv), *buffer);
    + purple_debug_misc("signals test", "writing-im-msg (%s, %s)\n",
    + purple_conversation_get_name(conv),
    + purple_message_get_contents(pmsg));
    return FALSE;
    --- a/libpurple/savedstatuses.c Mon Dec 28 21:56:53 2015 -0600
    +++ b/libpurple/savedstatuses.c Tue Dec 29 21:48:15 2015 -0600
    @@ -188,16 +188,18 @@
    remove_old_transient_statuses(void)
    {
    GList *l, *next;
    - PurpleSavedStatus *saved_status, *current_status;
    + PurpleSavedStatus *saved_status, *startup_status, *current_status;
    int count;
    time_t creation_time;
    + startup_status = purple_savedstatus_get_startup();
    current_status = purple_savedstatus_get_current();
    /*
    * Iterate through the list of saved statuses. Delete all
    * transient statuses except for the first MAX_TRANSIENTS
    * (remember, the saved statuses are already sorted by popularity).
    + * We should also keep the startup status, if any is set.
    */
    count = 0;
    for (l = saved_statuses; l != NULL; l = next)
    @@ -208,7 +210,7 @@
    {
    if (count == MAX_TRANSIENTS)
    {
    - if (saved_status != current_status)
    + if (saved_status != current_status && saved_status != startup_status)
    {
    saved_statuses = g_list_remove(saved_statuses, saved_status);
    creation_time = purple_savedstatus_get_creation_time(saved_status);