comparison gtk/gtkaccount.c @ 15136:31603a03cc02

[gaim-migrate @ 17921] Etan had changed the account notify stuff so that the prpl decides if the person is a buddy or not; I totally wiped that out with my authorization stuff. This brings it back. Additionally, I added a googletalk flag to JabberStream which can determine at runtime if you're connected to Google Talk. All of the Google Talk extensions can be detected individually with disco, but this might be used for working with perfectly standard XMPP that's implemented in what might be considered a quirky way in Google Talk. For instance, Google Talk automatically adds buddies to your roster when you authorize them to add you. I was going to use this flag so that the Jabber prpl would never ask me to add a Google Talk buddy who's just been automatically added anyway. I decided to keep it, though, since I may still want to specify what group he's in. This opens the door for more Google Talk customization though >:) committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Fri, 08 Dec 2006 02:51:47 +0000
parents 37a792fc9800
children 63d554c2675d
comparison
equal deleted inserted replaced
15135:9e1d9c9229ce 15136:31603a03cc02
2418 g_free(aa); 2418 g_free(aa);
2419 } 2419 }
2420 2420
2421 static void 2421 static void
2422 gaim_gtk_accounts_request_authorization(GaimAccount *account, const char *remote_user, 2422 gaim_gtk_accounts_request_authorization(GaimAccount *account, const char *remote_user,
2423 const char *id, const char *alias, const char *message, 2423 const char *id, const char *alias, const char *message, gboolean on_list,
2424 GCallback auth_cb, GCallback deny_cb, void *user_data) 2424 GCallback auth_cb, GCallback deny_cb, void *user_data)
2425 { 2425 {
2426 char *buffer; 2426 char *buffer;
2427 GaimConnection *gc; 2427 GaimConnection *gc;
2428 GtkWidget *alert; 2428 GtkWidget *alert;
2443 : gaim_account_get_username(account))), 2443 : gaim_account_get_username(account))),
2444 (message != NULL ? ": " : "."), 2444 (message != NULL ? ": " : "."),
2445 (message != NULL ? message : "")); 2445 (message != NULL ? message : ""));
2446 2446
2447 2447
2448 if (!gaim_find_buddy(account, remote_user)) { 2448 if (!on_list) {
2449 struct auth_and_add *aa = g_new0(struct auth_and_add, 1); 2449 struct auth_and_add *aa = g_new0(struct auth_and_add, 1);
2450 aa->auth_cb = (GaimAccountRequestAuthorizationCb)auth_cb; 2450 aa->auth_cb = (GaimAccountRequestAuthorizationCb)auth_cb;
2451 aa->deny_cb = (GaimAccountRequestAuthorizationCb)deny_cb; 2451 aa->deny_cb = (GaimAccountRequestAuthorizationCb)deny_cb;
2452 aa->data = user_data; 2452 aa->data = user_data;
2453 aa->username = g_strdup(remote_user); 2453 aa->username = g_strdup(remote_user);