comparison src/gtkaccount.c @ 12121:943307dd6ee9

[gaim-migrate @ 14421] When adding a new account, set the status before enabling it.That way, the correct status ends up being used, and you don't run into a a weird situation where the account tries to connect and then the offline status is appled when your current status is 'Offline'. Also a warning fix. committer: Tailor Script <[e-mail]>

12120:b8c5b67a5475

	GtkWidget *frame;
	GtkWidget *vbox;
	GtkWidget *check;
	GtkWidget *entry;
	GtkWidget *combo;
	GList *list;
	GList *node;
	gint i, idx;
	GtkListStore *model;
	GtkTreeIter iter;
	GtkCellRenderer *renderer;
	GaimKeyValuePair *kvp;

		gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account);

	/* If this is a new account, then sign on! */
	if (new) {
		const char *current_savedstatus_name;
		const GaimSavedStatus *saved_status;

		gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE);
		current_savedstatus_name = gaim_prefs_get_string("/core/status/current");
		saved_status = gaim_savedstatus_find(current_savedstatus_name);
		gaim_savedstatus_activate_for_account(saved_status, account);
	}

	return account;
}

	gtk_tree_model_get_iter(GTK_TREE_MODEL(dialog->model), &iter, path);
	gtk_tree_path_free(path);
	gtk_tree_model_get(GTK_TREE_MODEL(dialog->model), &iter, COLUMN_DATA, &account, -1);

	if ((account != NULL) && (event->button == 1) &&
		(event->type == GDK_2BUTTON_PRESS) && 
		(strcmp(gtk_tree_view_column_get_title(column), title)))
	{
		gaim_gtk_account_dialog_show(GAIM_GTK_MODIFY_ACCOUNT_DIALOG, account);
		return TRUE;
	}

12121:943307dd6ee9

	GtkWidget *frame;
	GtkWidget *vbox;
	GtkWidget *check;
	GtkWidget *entry;
	GtkWidget *combo;
	const GList *list;
	const GList *node;
	gint i, idx;
	GtkListStore *model;
	GtkTreeIter iter;
	GtkCellRenderer *renderer;
	GaimKeyValuePair *kvp;

		gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account);

	/* If this is a new account, then sign on! */
	if (new) {
		const char *current_savedstatus_name;
		const GaimSavedStatus *saved_status = NULL;

		current_savedstatus_name = gaim_prefs_get_string("/core/status/current");
		if (current_savedstatus_name)
			saved_status = gaim_savedstatus_find(current_savedstatus_name);

		if (saved_status) {
			gaim_savedstatus_activate_for_account(saved_status, account);
			gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE);
		}
	}

	return account;
}

	gtk_tree_model_get_iter(GTK_TREE_MODEL(dialog->model), &iter, path);
	gtk_tree_path_free(path);
	gtk_tree_model_get(GTK_TREE_MODEL(dialog->model), &iter, COLUMN_DATA, &account, -1);

	if ((account != NULL) && (event->button == 1) &&
		(event->type == GDK_2BUTTON_PRESS) &&
		(strcmp(gtk_tree_view_column_get_title(column), title)))
	{
		gaim_gtk_account_dialog_show(GAIM_GTK_MODIFY_ACCOUNT_DIALOG, account);
		return TRUE;
	}