gaim/gaim

This fixes adding buddies on ejabberd and jabberd (I only tested jabber.org which is 1.4.x I think) servers. If people want to double check my testing feel free to, just try adding a new buddy and see if you both get all the right dialogs (that is A add B, B says Ok, B adds A, A says Ok, B gets notified).
oldstatus
2005-05-04, Etan Reisner
a488f8bbf0f0
Parents c1f4d5c41380
Children 3ace3198893b
This fixes adding buddies on ejabberd and jabberd (I only tested jabber.org which is 1.4.x I think) servers. If people want to double check my testing feel free to, just try adding a new buddy and see if you both get all the right dialogs (that is A add B, B says Ok, B adds A, A says Ok, B gets notified).
This isn't exactly pretty, and it's got issues (like the dialogs don't always fill in correctly), but it's much better than not getting the dialogs at all.

I know we're string frozen but I think this should be ok, if I need to do something like edit the .po files let me know. I'm going away for a bit, but I'll be back before the night is out.
1 files changed, 71 insertions(+), 7 deletions(-)
  • +71 -7
    src/protocols/jabber/presence.c
    • --- a/src/protocols/jabber/presence.c Wed May 04 00:45:04 2005 -0400
    +++ b/src/protocols/jabber/presence.c Wed May 04 21:26:27 2005 -0400
    @@ -161,6 +161,40 @@
    char *who;
    };
    +
    +typedef struct
    +{
    + GaimAccount *account;
    + char *username;
    + char *alias;
    +
    +} GaimGtkAccountAddUserData;
    +
    +static void
    +free_add_user_data(GaimGtkAccountAddUserData *data)
    +{
    + g_free(data->username);
    +
    + if (data->alias != NULL)
    + g_free(data->alias);
    +
    + g_free(data);
    +}
    +
    +static void
    +add_user_cb(GaimGtkAccountAddUserData *data)
    +{
    + GaimConnection *gc = gaim_account_get_connection(data->account);
    +
    + if (g_list_find(gaim_connections_get_all(), gc))
    + {
    + gaim_blist_request_add_buddy(data->account, data->username,
    + NULL, data->alias);
    + }
    +
    + free_add_user_data(data);
    +}
    +
    static void authorize_add_cb(struct _jabber_add_permit *jap)
    {
    if(g_list_find(gaim_connections_get_all(), jap->gc)) {
    @@ -175,15 +209,45 @@
    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
    + if ((jb->subscription & JABBER_SUB_TO) == 0) {
    + GaimGtkAccountAddUserData *data;
    + char *buffer = NULL;
    + char *id = jap->who;
    + char *alias = NULL;
    + char *msg = NULL;
    +
    + data = g_new0(GaimGtkAccountAddUserData, 1);
    + data->account = jap->gc->account;
    + data->username = NULL;
    + data->alias = NULL;
    +
    + buffer = g_strdup_printf(_("%s%s%s%s has made %s his or her buddy%s%s%s"),
    + jap->who,
    + (alias != NULL ? " (" : ""),
    + (alias != NULL ? alias : ""),
    + (alias != NULL ? ")" : ""),
    + (id != NULL
    + ? id
    + : (gaim_connection_get_display_name(jap->gc) != NULL
    + ? gaim_connection_get_display_name(jap->gc)
    + : gaim_account_get_username(jap->gc->account))),
    + (msg != NULL ? ": " : "."),
    + (msg != NULL ? msg : ""),
    + (buddy != NULL
    + ? ""
    + : _("\n\nDo you wish to add him or her to your buddy list?")));
    +
    + gaim_request_action(NULL, NULL, _("Add buddy to your list?"),
    + buffer, GAIM_DEFAULT_ACTION_NONE, data, 2,
    + _("Add"), G_CALLBACK(add_user_cb),
    + _("Cancel"), G_CALLBACK(free_add_user_data));
    +
    + g_free(buffer);
    +
    + } else
    gaim_account_notify_added(jap->gc->account, NULL, jap->who, NULL, NULL);
    } else {
    - gaim_account_request_add(jap->gc->account, NULL, jap->who, NULL, NULL);
    + gaim_account_notify_added(jap->gc->account, NULL, jap->who, NULL, NULL);
    }
    }