comparison src/connection.c @ 6231:1fc158d6ebdb

[gaim-migrate @ 6724] New accounts added using the login window are now correctly saved. You can now use gaim -l to sign on accounts on prpls with no passwords or with optional passwords. committer: Tailor Script <[e-mail]>

6230:0fef71e24ad5

	if (gaim_connection_get_state(gc) != GAIM_DISCONNECTED)
		return;

	if (!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
		!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL) &&
		gaim_account_get_password(account) == NULL) {

		gchar *primary;
		gaim_debug(GAIM_DEBUG_INFO, "connection", "Requesting password\n");
		primary = g_strdup_printf(_("Enter password for %s"),
								 gaim_account_get_username(account));
		gaim_request_input(gc, NULL, primary, NULL, NULL, FALSE, TRUE,
						   _("OK"), G_CALLBACK(request_pass_ok_cb),
						   _("Cancel"), NULL, account);
		g_free(primary);
		gaim_connection_destroy(gc);

		return;
	}

6231:1fc158d6ebdb

	if (gaim_connection_get_state(gc) != GAIM_DISCONNECTED)
		return;

	if (!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
			!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL) &&
			gaim_account_get_password(account) == NULL) {
		gchar *primary;
		gchar *escaped;
		const gchar *username = gaim_account_get_username(account);

		gaim_debug(GAIM_DEBUG_INFO, "connection", "Requesting password\n");
		escaped = g_markup_escape_text(username, strlen(username));
		primary = g_strdup_printf(_("Enter password for %s"), escaped);
		gaim_request_input(gc, NULL, primary, NULL, NULL, FALSE, TRUE,
						   _("OK"), G_CALLBACK(request_pass_ok_cb),
						   _("Cancel"), NULL, account);
		g_free(primary);
		g_free(escaped);
		gaim_connection_destroy(gc);

		return;
	}