Mercurial > pidgin.yaz
comparison gtk/gtkaccount.c @ 15103:37a792fc9800
[gaim-migrate @ 17888]
this is hackish, but works. Fixes 1549152.
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Mon, 04 Dec 2006 03:44:42 +0000 |
parents | d24de6319f87 |
children | 31603a03cc02 |
comparison
equal
deleted
inserted
replaced
15102:9b3f844a02d7 | 15103:37a792fc9800 |
---|---|
133 GtkWidget *proxy_dropdown; | 133 GtkWidget *proxy_dropdown; |
134 GtkWidget *proxy_host_entry; | 134 GtkWidget *proxy_host_entry; |
135 GtkWidget *proxy_port_entry; | 135 GtkWidget *proxy_port_entry; |
136 GtkWidget *proxy_user_entry; | 136 GtkWidget *proxy_user_entry; |
137 GtkWidget *proxy_pass_entry; | 137 GtkWidget *proxy_pass_entry; |
138 | |
139 /* Are we registering? */ | |
140 gboolean registering; | |
138 | 141 |
139 } AccountPrefsDialog; | 142 } AccountPrefsDialog; |
140 | 143 |
141 typedef struct | 144 typedef struct |
142 { | 145 { |
1333 gaim_accounts_add(account); | 1336 gaim_accounts_add(account); |
1334 else | 1337 else |
1335 gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account); | 1338 gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account); |
1336 | 1339 |
1337 /* If this is a new account, then sign on! */ | 1340 /* If this is a new account, then sign on! */ |
1338 if (new) { | 1341 if (new && !dialog->registering) { |
1339 const GaimSavedStatus *saved_status; | 1342 const GaimSavedStatus *saved_status; |
1340 | 1343 |
1341 saved_status = gaim_savedstatus_get_current(); | 1344 saved_status = gaim_savedstatus_get_current(); |
1342 if (saved_status != NULL) { | 1345 if (saved_status != NULL) { |
1343 gaim_savedstatus_activate_for_account(saved_status, account); | 1346 gaim_savedstatus_activate_for_account(saved_status, account); |
1349 } | 1352 } |
1350 | 1353 |
1351 static void | 1354 static void |
1352 register_account_prefs_cb(GtkWidget *w, AccountPrefsDialog *dialog) | 1355 register_account_prefs_cb(GtkWidget *w, AccountPrefsDialog *dialog) |
1353 { | 1356 { |
1354 GaimAccount *account = ok_account_prefs_cb(NULL, dialog); | 1357 GaimAccount *account; |
1358 | |
1359 dialog->registering = TRUE; | |
1360 | |
1361 account = ok_account_prefs_cb(NULL, dialog); | |
1355 | 1362 |
1356 gaim_account_register(account); | 1363 gaim_account_register(account); |
1357 } | 1364 } |
1358 | 1365 |
1359 | 1366 |