comparison src/main.c @ 6036:547ba881bc7e

[gaim-migrate @ 6486] Fix the --login=[NAME] command line argument. Fix the password prompt when signing on an account with no password set. I made some similar changes that probably fix problems with the filectl plugin, using gaim-remote to sign on an account, and signing on an account via perl script. (The change is calling gaim_account_connect() instead of serv_login().) Fix a silly compiler warning. committer: Tailor Script <[e-mail]>

6035:8c44020a958e

{
	GaimAccount *account;
	const char *username = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(name)->entry));
	const char *password = gtk_entry_get_text(GTK_ENTRY(pass));

	if (!strlen(username)) {
		gaim_notify_error(NULL, NULL, _("Please enter your login."), NULL);
		return;
	}

	/* if there is more than one user of the same name, then fuck 

		account = gaim_account_new(username, "prpl-oscar");

		gaim_account_set_remember_password(account, TRUE);
	}

	gaim_account_set_password(account, password);

	gaim_account_connect(account);
}

/* <name> is a comma-separated list of names, or NULL

		for (n = names; *n != NULL; n++) {
			account = gaim_accounts_find(*n, -1);
			if (account) {	/* found a user */
				if (gaim_account_get_remember_password(account)) {
					retval = 0;
					serv_login(account);
				}
			}
		}
		g_strfreev(names);
	} else {		/* no name given, use default */
		account = (GaimAccount *)gaim_accounts_get_all()->data;

		if (gaim_account_get_remember_password(account)) {
			retval = 0;
			serv_login(account);
		}
	}

	return retval;
}

6036:547ba881bc7e

{
	GaimAccount *account;
	const char *username = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(name)->entry));
	const char *password = gtk_entry_get_text(GTK_ENTRY(pass));

	if (*username == '\0') {
		gaim_notify_error(NULL, NULL, _("Please enter your login."), NULL);
		return;
	}

	/* if there is more than one user of the same name, then fuck 

		account = gaim_account_new(username, "prpl-oscar");

		gaim_account_set_remember_password(account, TRUE);
	}

	gaim_account_set_password(account, (*password != '\0') ? password : NULL);

	gaim_account_connect(account);
}

/* <name> is a comma-separated list of names, or NULL

		for (n = names; *n != NULL; n++) {
			account = gaim_accounts_find(*n, -1);
			if (account) {	/* found a user */
				if (gaim_account_get_remember_password(account)) {
					retval = 0;
					gaim_account_connect(account);
				}
			}
		}
		g_strfreev(names);
	} else {		/* no name given, use default */
		account = (GaimAccount *)gaim_accounts_get_all()->data;

		if (gaim_account_get_remember_password(account)) {
			retval = 0;
			gaim_account_connect(account);
		}
	}

	return retval;
}