view src/accountopt.c @ 7450:685736e14aac

[gaim-migrate @ 8061] from bug #836143 ----------------------------------------------------------------- Date: 2003-11-06 17:19 Sender: zuperdee Logged In: YES user_id=347499 Alright folks, I HAVE A FIX!!!! I repeat, I HAVE A FIX!!!!!!!!! Basically, this is what was wrong: the account_win_destroy_cb function was failing to destroy the window when the "window delete" event was happening. I reviewed the code, and it appears there are only 2 places where that function is called, and in BOTH cases, gtk_widget_destroy(dialog->window) was called before calling account_win_destroy_cb. That's ugly!!!! So, my patch rearranges things so gtk_widget_destroy is called at the beginning of account_win_destroy_cb. That way, it *DOES* destroy the window as it is supposed to, and it removes a couple unnecessary lines of code. Woohoo!!!!!!!!! I've tested it here on my own system, and it appears to work, but I'd appreciate it if someone else could verify my fix before it is checked in (should it be accepted). The fix is in Patch #837542 here on Sourceforge. :-) Yours Truly, Daniel (Yes, I am excited!!! I just fixed a problem in Gaim that has been bugging me for some time. I *HATE* instability... Call me the Segfault Avenger. ;-)) --------------------------------------------------------------- committer: Tailor Script <[e-mail]>

/**
 * @file accountopt.c Account Options API
 * @ingroup core
 *
 * gaim
 *
 * Copyright (C) 2003 Christian Hammond <[e-mail]>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
#include "accountopt.h"

GaimAccountOption *
gaim_account_option_new(GaimPrefType type, const char *text,
						const char *pref_name)
{
	GaimAccountOption *option;

	g_return_val_if_fail(type == GAIM_PREF_BOOLEAN ||
						 type == GAIM_PREF_INT ||
						 type == GAIM_PREF_STRING,
						 NULL);
	g_return_val_if_fail(text != NULL, NULL);
	g_return_val_if_fail(pref_name != NULL, NULL);

	option = g_new0(GaimAccountOption, 1);

	option->type      = type;
	option->text      = g_strdup(text);
	option->pref_name = g_strdup(pref_name);

	return option;
}

GaimAccountOption *
gaim_account_option_bool_new(const char *text, const char *pref_name,
							 gboolean default_value)
{
	GaimAccountOption *option;

	option = gaim_account_option_new(GAIM_PREF_BOOLEAN, text, pref_name);

	if (option == NULL)
		return NULL;

	option->default_value.boolean = default_value;

	return option;
}

GaimAccountOption *
gaim_account_option_int_new(const char *text, const char *pref_name,
							int default_value)
{
	GaimAccountOption *option;

	option = gaim_account_option_new(GAIM_PREF_INT, text, pref_name);

	if (option == NULL)
		return NULL;

	option->default_value.integer = default_value;

	return option;
}

GaimAccountOption *
gaim_account_option_string_new(const char *text, const char *pref_name,
							   const char *default_value)
{
	GaimAccountOption *option;

	option = gaim_account_option_new(GAIM_PREF_STRING, text, pref_name);

	if (option == NULL)
		return NULL;

	if (default_value != NULL)
		option->default_value.string = g_strdup(default_value);

	return option;
}

void
gaim_account_option_destroy(GaimAccountOption *option)
{
	g_return_if_fail(option != NULL);

	if (option->text != NULL)
		g_free(option->text);

	if (option->pref_name != NULL)
		g_free(option->pref_name);

	if (option->type == GAIM_PREF_STRING &&
		option->default_value.string != NULL) {

		g_free(option->default_value.string);
	}

	g_free(option);
}

void
gaim_account_option_set_default_bool(GaimAccountOption *option,
									 gboolean value)
{
	g_return_if_fail(option != NULL);
	g_return_if_fail(option->type == GAIM_PREF_BOOLEAN);

	option->default_value.boolean = value;
}

void
gaim_account_option_set_default_int(GaimAccountOption *option, int value)
{
	g_return_if_fail(option != NULL);
	g_return_if_fail(option->type == GAIM_PREF_INT);

	option->default_value.integer = value;
}

void
gaim_account_option_set_default_string(GaimAccountOption *option,
									   const char *value)
{
	g_return_if_fail(option != NULL);
	g_return_if_fail(option->type == GAIM_PREF_STRING);

	if (option->default_value.string != NULL)
		g_free(option->default_value.string);

	option->default_value.string = (value == NULL ? NULL : g_strdup(value));
}

GaimPrefType
gaim_account_option_get_type(const GaimAccountOption *option)
{
	g_return_val_if_fail(option != NULL, GAIM_PREF_NONE);

	return option->type;
}

const char *
gaim_account_option_get_text(const GaimAccountOption *option)
{
	g_return_val_if_fail(option != NULL, NULL);

	return option->text;
}

const char *
gaim_account_option_get_setting(const GaimAccountOption *option)
{
	g_return_val_if_fail(option != NULL, NULL);

	return option->pref_name;
}

gboolean
gaim_account_option_get_default_bool(const GaimAccountOption *option)
{
	g_return_val_if_fail(option != NULL, FALSE);
	g_return_val_if_fail(option->type == GAIM_PREF_BOOLEAN, FALSE);

	return option->default_value.boolean;
}

int
gaim_account_option_get_default_int(const GaimAccountOption *option)
{
	g_return_val_if_fail(option != NULL, -1);
	g_return_val_if_fail(option->type == GAIM_PREF_INT, -1);

	return option->default_value.integer;
}

const char *
gaim_account_option_get_default_string(const GaimAccountOption *option)
{
	g_return_val_if_fail(option != NULL, NULL);
	g_return_val_if_fail(option->type == GAIM_PREF_STRING, NULL);

	return option->default_value.string;
}


GaimAccountUserSplit *
gaim_account_user_split_new(const char *text, const char *default_value,
							char sep)
{
	GaimAccountUserSplit *split;

	g_return_val_if_fail(text != NULL, NULL);
	g_return_val_if_fail(sep != 0, NULL);

	split = g_new0(GaimAccountUserSplit, 1);

	split->text = g_strdup(text);
	split->field_sep = sep;
	split->default_value = (default_value == NULL
							? NULL : g_strdup(default_value));

	return split;
}

void
gaim_account_user_split_destroy(GaimAccountUserSplit *split)
{
	g_return_if_fail(split != NULL);

	if (split->text != NULL)
		g_free(split->text);

	if (split->default_value != NULL)
		g_free(split->default_value);

	g_free(split);
}

const char *
gaim_account_user_split_get_text(const GaimAccountUserSplit *split)
{
	g_return_val_if_fail(split != NULL, NULL);

	return split->text;
}

const char *
gaim_account_user_split_get_default_value(const GaimAccountUserSplit *split)
{
	g_return_val_if_fail(split != NULL, NULL);

	return split->default_value;
}

char
gaim_account_user_split_get_separator(const GaimAccountUserSplit *split)
{
	g_return_val_if_fail(split != NULL, 0);

	return split->field_sep;
}