gaim/gaim

Apparently this broke ABI, I'll look at it again for the next release.
oldstatus
2005-03-17, Etan Reisner
871a00f24975
Parents 90c6d20ed0f4
Children 6a67538a18a0
Apparently this broke ABI, I'll look at it again for the next release.
5 files changed, 5 insertions(+), 9 deletions(-)
  • +0 -2
    ChangeLog
  • +1 -2
    NEWS
  • +0 -3
    src/account.h
  • +1 -2
    src/gtkaccount.c
  • +3 -0
    src/protocols/jabber/presence.c
    • --- a/ChangeLog Thu Mar 17 20:22:10 2005 -0500
    +++ b/ChangeLog Thu Mar 17 21:53:28 2005 -0500
    @@ -9,8 +9,6 @@
    password containing invalid XML characters such as < and >
    (Bastien Durel)
    * Yahoo! privacy improvements (Bleeter)
    - * Fix adding buddies on jabber servers running ejabberd. You will
    - now be asked to add buddies correctly when they add you.
    version 1.1.4 (2/24/2005):
    * Fixed a bug where Yahoo! would lose messages (and any other packet
    --- a/NEWS Thu Mar 17 20:22:10 2005 -0500
    +++ b/NEWS Thu Mar 17 21:53:28 2005 -0500
    @@ -12,8 +12,7 @@
    Jabber will allow you to unsubscribe to someone's presence
    without logging out and in again, this does break seeing yourself
    on your buddy list, but hopefully we'll fix that again for the
    - next release. We should also be able to correctly add buddies
    - when on a jabber server running ejabberd now.
    + next release.
    Stu: Happy St. Guinness^wPatrick's day.
    --- a/src/account.h Thu Mar 17 20:22:10 2005 -0500
    +++ b/src/account.h Thu Mar 17 21:53:28 2005 -0500
    @@ -44,9 +44,6 @@
    void (*notify_added)(GaimAccount *account, const char *remote_user,
    const char *id, const char *alias,
    const char *message);
    - void (*request_add)(GaimAccount *account, const char *remote_user,
    - const char *id, const char *alias,
    - const char *message);
    };
    struct _GaimAccount
    --- a/src/gtkaccount.c Thu Mar 17 20:22:10 2005 -0500
    +++ b/src/gtkaccount.c Thu Mar 17 21:53:28 2005 -0500
    @@ -2599,8 +2599,7 @@
    static GaimAccountUiOps ui_ops =
    {
    - gaim_gtk_accounts_notify_added,
    - gaim_gtk_accounts_request_add
    + gaim_gtk_accounts_notify_added
    };
    GaimAccountUiOps *
    --- a/src/protocols/jabber/presence.c Thu Mar 17 20:22:10 2005 -0500
    +++ b/src/protocols/jabber/presence.c Thu Mar 17 21:53:28 2005 -0500
    @@ -176,7 +176,10 @@
    jb = jabber_buddy_find(jap->js, jap->who, TRUE);
    if ((jb->subscription & JABBER_SUB_TO) == 0)
    + /*
    gaim_account_request_add(jap->gc->account, NULL, jap->who, NULL, NULL);
    + */
    + gaim_account_notify_added(jap->gc->account, NULL, jap->who, NULL, NULL);
    else
    gaim_account_notify_added(jap->gc->account, NULL, jap->who, NULL, NULL);
    } else {