gaim/gaim

Kill off the conversation closed and timed-out notices
oldstatus
2005-08-21, Stu Tomlinson
0958e42aa81d
Parents 52fb95da5829
Children 34528a7c47b2
Kill off the conversation closed and timed-out notices

Fix for setting the ACK id on slpmsg ACKs which might improve things for
other clients (see bug #1222320)
3 files changed, 4 insertions(+), 83 deletions(-)
  • +2 -32
    src/protocols/msn/msn.c
  • +1 -0
    src/protocols/msn/slplink.c
  • +1 -51
    src/protocols/msn/switchboard.c
    • --- a/src/protocols/msn/msn.c Fri Aug 19 10:02:09 2005 -0400
    +++ b/src/protocols/msn/msn.c Sun Aug 21 13:13:43 2005 -0400
    @@ -1800,34 +1800,6 @@
    return TRUE;
    }
    -static GaimPluginPrefFrame *
    -get_plugin_pref_frame(GaimPlugin *plugin)
    -{
    - GaimPluginPrefFrame *frame;
    - GaimPluginPref *ppref;
    -
    - frame = gaim_plugin_pref_frame_new();
    -
    - ppref = gaim_plugin_pref_new_with_label(_("Conversations"));
    - gaim_plugin_pref_frame_add(frame, ppref);
    -
    - ppref = gaim_plugin_pref_new_with_name_and_label(
    - "/plugins/prpl/msn/conv_close_notice",
    - _("Display conversation closed notices"));
    - gaim_plugin_pref_frame_add(frame, ppref);
    -
    - ppref = gaim_plugin_pref_new_with_name_and_label(
    - "/plugins/prpl/msn/conv_timeout_notice",
    - _("Display timeout notices"));
    - gaim_plugin_pref_frame_add(frame, ppref);
    -
    - return frame;
    -}
    -
    -static GaimPluginUiInfo prefs_info = {
    - get_plugin_pref_frame
    -};
    -
    static GaimPluginProtocolInfo prpl_info =
    {
    OPT_PROTO_MAIL_CHECK,
    @@ -1917,7 +1889,7 @@
    NULL, /**< ui_info */
    &prpl_info, /**< extra_info */
    - &prefs_info, /**< prefs_info */
    + NULL, /**< prefs_info */
    msn_actions
    };
    @@ -1940,9 +1912,7 @@
    prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
    option);
    - gaim_prefs_add_none("/plugins/prpl/msn");
    - gaim_prefs_add_bool("/plugins/prpl/msn/conv_close_notice", TRUE);
    - gaim_prefs_add_bool("/plugins/prpl/msn/conv_timeout_notice", TRUE);
    + gaim_prefs_remove("/plugins/prpl/msn");
    }
    GAIM_INIT_PLUGIN(msn, init_plugin, info);
    --- a/src/protocols/msn/slplink.c Fri Aug 19 10:02:09 2005 -0400
    +++ b/src/protocols/msn/slplink.c Sun Aug 21 13:13:43 2005 -0400
    @@ -384,6 +384,7 @@
    msg->msnslp_header.session_id = slpmsg->session_id;
    msg->msnslp_header.ack_id = slpmsg->ack_id;
    msg->msnslp_header.ack_size = slpmsg->ack_size;
    + msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
    }
    else if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
    {
    --- a/src/protocols/msn/switchboard.c Fri Aug 19 10:02:09 2005 -0400
    +++ b/src/protocols/msn/switchboard.c Sun Aug 21 13:13:43 2005 -0400
    @@ -637,19 +637,8 @@
    swboard = cmdproc->data;
    user = cmd->params[0];
    -#if 0
    - if (!(swboard->flag & MSN_SB_FLAG_IM))
    - {
    - /* TODO: This is a helper switchboard. It would be better if
    - * swboard->conv is NULL, but it isn't. */
    - /* Umm? I think swboard->conv is NULL for all helper switchboards now? */
    - msn_switchboard_destroy(swboard);
    - return;
    - }
    -#else
    - if (!(swboard->flag & MSN_SB_FLAG_IM))
    + if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL))
    gaim_debug_error("msn_switchboard", "bye_cmd: helper bug\n");
    -#endif
    if (swboard->conv == NULL)
    {
    @@ -668,45 +657,6 @@
    else
    {
    /* This is a switchboard used for a im session */
    -
    - char *str = NULL;
    -
    - if (cmd->param_count == 2 && atoi(cmd->params[1]) == 1)
    - {
    - if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_timeout_notice"))
    - {
    - str = g_strdup_printf(_("The conversation has become "
    - "inactive and timed out."));
    - }
    - }
    - else
    - {
    - if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_close_notice"))
    - {
    - char *username;
    - GaimAccount *account;
    - GaimBuddy *b;
    -
    - account = cmdproc->session->account;
    -
    - if ((b = gaim_find_buddy(account, user)) != NULL)
    - username = gaim_escape_html(gaim_buddy_get_alias(b));
    - else
    - username = gaim_escape_html(user);
    -
    - str = g_strdup_printf(_("%s has closed the conversation "
    - "window."), username);
    -
    - g_free(username);
    - }
    - }
    -
    - if (str != NULL)
    - {
    - msn_switchboard_report_user(swboard, GAIM_MESSAGE_SYSTEM, str);
    - g_free(str);
    - }
    -
    msn_switchboard_destroy(swboard);
    }
    }