Mercurial > pidgin.yaz

--- a/configure.ac	Thu Aug 18 21:00:50 2005 +0000
+++ b/configure.ac	Fri Aug 19 01:15:13 2005 +0000
@@ -272,7 +272,7 @@
 fi

 if test "x$GCC" = "xyes"; then
-	CFLAGS="$CFLAGS -Wall -g3"
+	CFLAGS="$CFLAGS -Wall -Wdeclaration-after-statement -g3"
 fi
 AC_SUBST(CFLAGS)
--- a/po/POTFILES.in	Thu Aug 18 21:00:50 2005 +0000
+++ b/po/POTFILES.in	Fri Aug 19 01:15:13 2005 +0000
@@ -62,7 +62,6 @@
 src/gtksavedstatuses.c
 src/gtksound.c
 src/gtkstatusbox.c
-src/gtkstatusselector.c
 src/gtkstock.c
 src/gtkutils.c
 src/log.c
--- a/src/Makefile.mingw	Thu Aug 18 21:00:50 2005 +0000
+++ b/src/Makefile.mingw	Fri Aug 19 01:15:13 2005 +0000
@@ -118,7 +118,6 @@
 			gtksound.c \
 			gtksourceiter.c \
 			gtkstatusbox.c \
-			gtkstatusselector.c \
 			gtkstock.c \
 			gtkthemes.c \
 			gtkutils.c \
--- a/src/connection.c	Thu Aug 18 21:00:50 2005 +0000
+++ b/src/connection.c	Fri Aug 19 01:15:13 2005 +0000
@@ -121,7 +121,6 @@
 	gc = g_new0(GaimConnection, 1);
 	GAIM_DBUS_REGISTER_POINTER(gc, GaimConnection);

-
 	gc->prpl = prpl;
 	if ((password != NULL) && (*password != '\0'))
 		gc->password = g_strdup(password);
--- a/src/gtkstatusselector.c	Thu Aug 18 21:00:50 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,675 +0,0 @@
-/**
- * @file gtkstatusselector.c GTK+ Status selector widget
- * @ingroup gtkui
- *
- * gaim
- *
- * Gaim is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * 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 "internal.h"
-#include "gtkgaim.h"
-#include "gtkimhtml.h"
-#include "gtksavedstatuses.h"
-#include "gtkstatusselector.h"
-#include "gtkutils.h"
-
-#include "account.h"
-#include "debug.h"
-#include "prefs.h"
-
-struct _GaimGtkStatusSelectorPrivate
-{
-	GtkWidget *combo;
-	GtkWidget *entry;
-	GtkWidget *frame;
-
-	GtkWidget *optmenu;
-	GtkWidget *menu;
-	GtkSizeGroup *sg;
-
-	GtkListStore *model;
-
-	guint entry_timer;
-};
-
-enum
-{
-	COLUMN_STATUS_TYPE_ID,
-	COLUMN_ICON,
-	COLUMN_NAME,
-	NUM_COLUMNS
-};
-
-#define GAIM_SELECTOR_TEXT "gaim-text"
-#define GAIM_SELECTOR_STATUS_TYPE_ID "gaim-status-type-id"
-
-static void gaim_gtk_status_selector_class_init(GaimGtkStatusSelectorClass *klass);
-static void gaim_gtk_status_selector_init(GaimGtkStatusSelector *selector);
-static void gaim_gtk_status_selector_finalize(GObject *obj);
-static void gaim_gtk_status_selector_destroy(GtkObject *obj);
-static void status_switched_cb(GtkWidget *combo, GaimGtkStatusSelector *selector);
-static gboolean key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer user_data);
-static void signed_on_off_cb(GaimConnection *gc, GaimGtkStatusSelector *selector);
-static void rebuild_list(GaimGtkStatusSelector *selector);
-
-static GtkVBox *parent_class = NULL;
-
-GType
-gaim_gtk_status_selector_get_type(void)
-{
-	static GType type = 0;
-
-	if (!type)
-	{
-		static const GTypeInfo info =
-		{
-			sizeof(GaimGtkStatusSelectorClass),
-			NULL,
-			NULL,
-			(GClassInitFunc)gaim_gtk_status_selector_class_init,
-			NULL,
-			NULL,
-			sizeof(GaimGtkStatusSelector),
-			0,
-			(GInstanceInitFunc)gaim_gtk_status_selector_init
-		};
-
-		type = g_type_register_static(GTK_TYPE_VBOX,
-									  "GaimGtkStatusSelector", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-gaim_gtk_status_selector_class_init(GaimGtkStatusSelectorClass *klass)
-{
-	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
-
-	parent_class = g_type_class_peek_parent(klass);
-
-	gobject_class = G_OBJECT_CLASS(klass);
-	object_class  = GTK_OBJECT_CLASS(klass);
-
-	gobject_class->finalize = gaim_gtk_status_selector_finalize;
-
-	object_class->destroy = gaim_gtk_status_selector_destroy;
-}
-
-static void
-gaim_gtk_status_selector_init(GaimGtkStatusSelector *selector)
-{
-#if GTK_CHECK_VERSION(2,4,0)
-	GtkWidget *combo;
-	GtkCellRenderer *renderer;
-#else
-	GtkWidget *optmenu;
-#endif
-	GtkWidget *entry;
-	GtkWidget *toolbar;
-	GtkWidget *frame;
-
-	selector->priv = g_new0(GaimGtkStatusSelectorPrivate, 1);
-
-#if GTK_CHECK_VERSION(2,4,0)
-	selector->priv->model = gtk_list_store_new(NUM_COLUMNS, G_TYPE_POINTER,
-	                        GDK_TYPE_PIXBUF, G_TYPE_STRING);
-
-	combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(selector->priv->model));
-	selector->priv->combo = combo;
-
-	g_object_unref(G_OBJECT(selector->priv->model));
-
-	renderer = gtk_cell_renderer_pixbuf_new();
-	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, FALSE);
-	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer,
-								   "pixbuf", COLUMN_ICON,
-								   NULL);
-
-	renderer = gtk_cell_renderer_text_new();
-	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE);
-	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer,
-								   "text", COLUMN_NAME,
-								   NULL);
-
-	g_signal_connect(G_OBJECT(combo), "changed",
-					 G_CALLBACK(status_switched_cb), selector);
-
-	/* TODO */
-
-
-	gtk_widget_show(combo);
-	gtk_box_pack_start(GTK_BOX(selector), combo, FALSE, FALSE, 0);
-
-
-#else /* GTK+ < 2.4.0 */
-	selector->priv->optmenu = optmenu = gtk_option_menu_new();
-	gtk_widget_show(optmenu);
-
-	selector->priv->menu = gtk_menu_new();
-	gtk_widget_show(selector->priv->menu);
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), selector->priv->menu);
-
-	selector->priv->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
-	g_signal_connect(G_OBJECT(optmenu), "changed",
-	                 G_CALLBACK(status_switched_cb), selector);
-
-	gtk_box_pack_start(GTK_BOX(selector), optmenu, FALSE, FALSE, 0);
-#endif
-
-	frame = gaim_gtk_create_imhtml(TRUE, &entry, &toolbar);
-	selector->priv->entry = entry;
-	selector->priv->frame = frame;
-	gtk_widget_set_name(entry, "gaim_gtkstatusselector_imhtml");
-	gtk_box_pack_start(GTK_BOX(selector), frame, TRUE, TRUE, 0);
-	gtk_widget_hide(toolbar);
-
-	g_signal_connect(G_OBJECT(entry), "key_press_event",
-	                 G_CALLBACK(key_press_cb), selector);
-	gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
-	                    selector, GAIM_CALLBACK(signed_on_off_cb),
-	                    selector);
-	gaim_signal_connect(gaim_connections_get_handle(), "signed-off",
-	                    selector, GAIM_CALLBACK(signed_on_off_cb),
-	                    selector);
-
-	rebuild_list(selector);
-}
-
-static void
-gaim_gtk_status_selector_finalize(GObject *obj)
-{
-	GaimGtkStatusSelector *selector;
-
-	g_return_if_fail(obj != NULL);
-	g_return_if_fail(GAIM_GTK_IS_STATUS_SELECTOR(obj));
-
-	selector = GAIM_GTK_STATUS_SELECTOR(obj);
-
-	if (selector->priv->sg) {
-		g_object_unref(selector->priv->sg);
-		selector->priv->sg = NULL;
-	}
-
-	g_free(selector->priv);
-
-	if (G_OBJECT_CLASS(parent_class)->finalize)
-		G_OBJECT_CLASS(parent_class)->finalize(obj);
-}
-
-static void
-gaim_gtk_status_selector_destroy(GtkObject *obj)
-{
-	GaimGtkStatusSelector *selector;
-
-	g_return_if_fail(obj != NULL);
-	g_return_if_fail(GAIM_GTK_IS_STATUS_SELECTOR(obj));
-
-	selector = GAIM_GTK_STATUS_SELECTOR(obj);
-
-	gaim_signals_disconnect_by_handle(selector);
-	if (selector->priv->entry_timer != 0)
-		gaim_timeout_remove(selector->priv->entry_timer);
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(obj);
-}
-
-static gboolean
-get_selected_data(GaimGtkStatusSelector *selector, char **text, const char **status_type_id)
-{
-#if GTK_CHECK_VERSION(2,4,0)
-	GtkTreeIter iter;
-
-	if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(selector->priv->combo),
-	    &iter))
-		return FALSE;
-
-	gtk_tree_model_get(GTK_TREE_MODEL(selector->priv->model), &iter,
-	                   COLUMN_NAME, text,
-	                   COLUMN_STATUS_TYPE_ID, status_type_id,
-	                   -1);
-	return TRUE;
-#else
-	GtkWidget *item;
-	int i;
-	GList *l;
-
-	i = gtk_option_menu_get_history(GTK_OPTION_MENU(selector->priv->optmenu));
-	l = GTK_MENU_SHELL(selector->priv->menu)->children;
-	item = g_list_nth_data(l, i);
-	*text = g_strdup(g_object_get_data(G_OBJECT(item), GAIM_SELECTOR_TEXT));
-	*status_type_id = g_object_get_data(G_OBJECT(item), GAIM_SELECTOR_STATUS_TYPE_ID);
-	return TRUE;
-#endif
-}
-
-/*
- * TODO: Is it possible to remove of the duplication in this
- *       function and insert_text_timeout_cb()?
- */
-static void
-status_switched_cb(GtkWidget *combo, GaimGtkStatusSelector *selector)
-{
-	const char *status_type_id = NULL;
-	char *text = NULL;
-
-	/* Reset the status selector */
-	if (selector->priv->entry_timer != 0)
-		gaim_timeout_remove(selector->priv->entry_timer);
-	gtk_widget_hide(selector->priv->frame);
-	gtk_widget_set_sensitive(selector->priv->frame, FALSE);
-
-	if (!get_selected_data(selector, &text, &status_type_id))
-		return;
-
-	if (status_type_id == NULL)
-	{
-		if (!strcmp(text, _("New Status")))
-		{
-			gaim_gtk_status_editor_show(NULL);
-		}
-	}
-	else
-	{
-		/*
-		 * If the chosen status does not require a message, then set the
-		 * status immediately.  Otherwise just register a timeout and the
-		 * status will be set whenever the user stops typing the message.
-		 */
-		GList *l;
-		GtkTextBuffer *buffer;
-		gboolean has_message = FALSE;
-
-		buffer =
-			gtk_text_view_get_buffer(GTK_TEXT_VIEW(selector->priv->entry));
-
-		gtk_text_buffer_set_text(buffer, text, -1);
-
-		for (l = gaim_accounts_get_all(); l != NULL; l = l->next)
-		{
-			GaimAccount *account = (GaimAccount*)l->data;
-			GaimStatusType *status_type;
-
-			if (!gaim_account_get_enabled(account, GAIM_GTK_UI))
-				continue;
-
-			status_type = gaim_account_get_status_type(account, status_type_id);
-
-			if (status_type == NULL)
-				continue;
-
-			if (gaim_status_type_get_attr(status_type, "message") != NULL)
-			{
-				has_message = TRUE;
-			}
-			else
-			{
-				gaim_account_set_status(account, status_type_id, TRUE, NULL);
-			}
-		}
-
-		if (has_message)
-		{
-			gtk_widget_show(selector->priv->frame);
-			gtk_widget_set_sensitive(selector->priv->frame, TRUE);
-			key_press_cb(NULL, NULL, selector);
-		}
-	}
-	g_free(text);
-}
-
-/**
- * This is used to set the message of the selected status.  It
- * is triggered after the user has stopped typing in the little box.
- * It just goes through and, if the selected status type for any
- * given online/enabled account requires a message, then it sets
- * that status with the entered message.
- */
-static gboolean
-insert_text_timeout_cb(gpointer data)
-{
-	GaimGtkStatusSelector *selector = (GaimGtkStatusSelector *)data;
-	const char *status_type_id;
-	char *text;
-	gchar *message;
-	GList *l;
-
-	gtk_widget_set_sensitive(selector->priv->frame, FALSE);
-
-	if (!get_selected_data(selector, &text, &status_type_id))
-		return FALSE;
-
-	if (status_type_id == NULL)
-	{
-		g_free(text);
-		return FALSE;
-	}
-
-	message = gtk_imhtml_get_markup(GTK_IMHTML(selector->priv->entry));
-
-	for (l = gaim_accounts_get_all(); l != NULL; l = l->next)
-	{
-		GaimAccount *account = (GaimAccount*)l->data;
-		GaimStatusType *status_type;
-
-		if (!gaim_account_get_enabled(account, GAIM_GTK_UI))
-			continue;
-
-		status_type = gaim_account_get_status_type(account,
-		              status_type_id);
-
-		if (status_type == NULL)
-			continue;
-
-		if (gaim_status_type_get_attr(status_type, "message") != NULL)
-		{
-			gaim_account_set_status(account,
-			                        status_type_id, TRUE,
-			                        "message", message,
-			                        NULL);
-		}
-	}
-
-	g_free(text);
-	g_free(message);
-
-	return FALSE;
-}
-
-/**
- * The user typed in the IMHTML entry widget.  If the user is finished
- * typing then we want to set the appropriate status message.  So let's
- * wait 3 seconds, and if they haven't typed anything else then set the
- * status message.
- */
-static gboolean
-key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer user_data)
-{
-	GaimGtkStatusSelector *selector = (GaimGtkStatusSelector *)user_data;
-
-	if (selector->priv->entry_timer != 0) {
-		gaim_timeout_remove(selector->priv->entry_timer);
-	}
-
-	selector->priv->entry_timer = gaim_timeout_add(3000,
-												  insert_text_timeout_cb,
-												  selector);
-
-	return FALSE;
-}
-
-static void
-signed_on_off_cb(GaimConnection *gc, GaimGtkStatusSelector *selector)
-{
-	rebuild_list(selector);
-}
-
-static GdkPixbuf *
-load_icon(const char *basename)
-{
-	char *filename;
-	GdkPixbuf *pixbuf, *scale = NULL;
-
-	if (!strcmp(basename, "available.png"))
-		basename = "online.png";
-	else if (!strcmp(basename, "hidden.png"))
-		basename = "invisible.png";
-
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "icons",
-								basename, NULL);
-	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-	g_free(filename);
-
-	if (pixbuf != NULL)
-	{
-		scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16,
-										GDK_INTERP_BILINEAR);
-
-		g_object_unref(G_OBJECT(pixbuf));
-	}
-	else
-	{
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status",
-									"default", basename, NULL);
-		scale = gdk_pixbuf_new_from_file(filename, NULL);
-		g_free(filename);
-	}
-
-	return scale;
-}
-
-static void
-add_item(GaimGtkStatusSelector *selector, const char *status_type_id,
-		 const char *text, GdkPixbuf *pixbuf)
-{
-#if GTK_CHECK_VERSION(2,4,0)
-	GtkTreeIter iter;
-
-	gtk_list_store_append(selector->priv->model, &iter);
-	gtk_list_store_set(selector->priv->model, &iter,
-					   COLUMN_STATUS_TYPE_ID, status_type_id,
-					   COLUMN_ICON, pixbuf,
-					   COLUMN_NAME, text,
-					   -1);
-#else
-	GtkWidget *image = gtk_image_new_from_pixbuf(pixbuf);
-	GtkWidget *item, *hbox, *label;
-
-	/* Create the item. */
-	item = gtk_menu_item_new();
-
-	/* Create the hbox. */
-	hbox = gtk_hbox_new(FALSE, 4);
-	gtk_container_add(GTK_CONTAINER(item), hbox);
-	gtk_widget_show(hbox);
-
-	gtk_size_group_add_widget(selector->priv->sg, image);
-
-	gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-	gtk_widget_show(image);
-
-	/* Create the label. */
-	label = gtk_label_new(text);
-	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show(label);
-
-	g_object_set_data_full(G_OBJECT(item), GAIM_SELECTOR_TEXT, g_strdup(text), g_free);
-	g_object_set_data_full(G_OBJECT(item), GAIM_SELECTOR_STATUS_TYPE_ID, g_strdup(status_type_id), g_free);
-
-	gtk_menu_shell_append(GTK_MENU_SHELL(selector->priv->menu), item);
-	gtk_widget_show(item);
-	gaim_set_accessible_label(item, label);
-#endif
-
-	if (pixbuf != NULL)
-		g_object_unref(G_OBJECT(pixbuf));
-}
-
-
-static void
-rebuild_list(GaimGtkStatusSelector *selector)
-{
-	gboolean single_prpl = TRUE;
-	GList *accounts;
-	gboolean enabled = FALSE;
-	GaimAccount *first_account = NULL;
-	const char *first_prpl_type = NULL;
-	const GList *l;
-
-	g_return_if_fail(selector != NULL);
-	g_return_if_fail(GAIM_GTK_IS_STATUS_SELECTOR(selector));
-
-#if GTK_CHECK_VERSION(2,4,0)
-	gtk_list_store_clear(selector->priv->model);
-#else
-	gtk_option_menu_remove_menu(GTK_OPTION_MENU(selector->priv->optmenu));
-	/* XXX this automaticly destroys the menu, right? */
-	selector->priv->menu = gtk_menu_new();
-	gtk_widget_show(selector->priv->menu);
-#endif
-
-	/*
-	 * If no accounts are enabled then gray ourself out and get
-	 * outta hee.
-	 */
-	for (accounts = gaim_accounts_get_all(); accounts != NULL;
-		 accounts = accounts->next)
-	{
-		GaimAccount *a = accounts->data;
-		if (gaim_account_get_enabled(a, GAIM_GTK_UI))
-		{
-			enabled = TRUE;
-			break;
-		}
-	}
-
-	if (enabled == FALSE)
-	{
-		gtk_widget_set_sensitive(GTK_WIDGET(selector), FALSE);
-		return;
-	}
-	gtk_widget_set_sensitive(GTK_WIDGET(selector), TRUE);
-
-	/*
-	 * If the user only has one IM account or one type of IM account
-	 * connected, they'll see all their statuses. This is ideal for those
-	 * who use only one account, or one single protocol. Everyone else
-	 * gets Available and Away and a list of saved statuses.
-	 */
-	for (l = gaim_accounts_get_all(); l != NULL && single_prpl; l = l->next)
-	{
-		GaimAccount *account = l->data;
-		GaimPluginProtocolInfo *prpl_info;
-		GaimPlugin *plugin;
-		const char *basename;
-
-		if (!gaim_account_get_enabled(account, GAIM_GTK_UI))
-			continue;
-
-		plugin = gaim_find_prpl(account->protocol_id);
-		if (!plugin)
-			continue;
-
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(plugin);
-		basename = prpl_info->list_icon(account, NULL);
-
-		if (first_prpl_type == NULL)
-		{
-			first_prpl_type = basename;
-			first_account = account;
-		}
-		else if (strcmp(first_prpl_type, basename))
-			single_prpl = FALSE;
-	}
-
-	if (single_prpl)
-	{
-		for (l = gaim_account_get_status_types(first_account);
-			 l != NULL;
-			 l = l->next)
-		{
-			GaimStatusType *status_type = (GaimStatusType *)l->data;
-			char filename[BUFSIZ];
-
-			if (!gaim_status_type_is_user_settable(status_type))
-				continue;
-
-			/*
-			 * TODO: Find a way to fallback to the GaimStatusPrimitive
-			 * if an icon for this id does not exist.
-			 */
-			g_snprintf(filename, sizeof(filename), "%s.png",
-					   gaim_status_type_get_id(status_type));
-
-			add_item(selector,
-					 gaim_status_type_get_id(status_type),
-					 gaim_status_type_get_name(status_type),
-					 load_icon(filename));
-		}
-	}
-	else
-	{
-		/* what follows is either really ugly, or brilliant depending on
-		 * how you look at it, and how much you've had to drink */
-		int i;
-		int num_accounts = 0;
-		int options[GAIM_STATUS_NUM_PRIMITIVES];
-		GaimAccount *acct_options[GAIM_STATUS_NUM_PRIMITIVES];
-
-		for(i=0; i<GAIM_STATUS_NUM_PRIMITIVES; i++) {
-			options[i] = 0;
-			acct_options[i] = NULL;
-		}
-
-		for(accounts = gaim_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
-			GaimAccount *account = accounts->data;
-
-			if (!gaim_account_get_enabled(account, GAIM_GTK_UI))
-				continue;
-
-			num_accounts++;
-
-			for(l = gaim_account_get_status_types(account); l != NULL; l = l->next) {
-				GaimStatusType *status_type = l->data;
-
-				if (!gaim_status_type_is_user_settable(status_type))
-					continue;
-
-				acct_options[gaim_status_type_get_primitive(status_type)] = account;
-			}
-
-			for(i=0; i<GAIM_STATUS_NUM_PRIMITIVES; i++) {
-				if(acct_options[i] == account)
-					options[i]++;
-			}
-		}
-
-		for(i=0; i<GAIM_STATUS_NUM_PRIMITIVES; i++) {
-			if(options[i] == num_accounts) {
-				char *filename = g_strdup_printf("%s.png", gaim_primitive_get_id_from_type(i));
-				add_item(selector, gaim_primitive_get_id_from_type(i), gaim_primitive_get_name_from_type(i), load_icon(filename));
-				g_free(filename);
-			}
-		}
-	}
-
-	/* TODO: Add saved statuses here? */
-
-	add_item(selector, NULL, _("New Status"),
-		 gtk_widget_render_icon(GTK_WIDGET(selector), GTK_STOCK_NEW,
-		 GTK_ICON_SIZE_MENU, NULL));
-#if !GTK_CHECK_VERSION(2,4,0)
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(selector->priv->optmenu), selector->priv->menu);
-#endif
-}
-
-GtkWidget *
-gaim_gtk_status_selector_new(void)
-{
-	GaimGtkStatusSelector *selector;
-
-	selector = g_object_new(GAIM_GTK_TYPE_STATUS_SELECTOR, NULL);
-
-	return GTK_WIDGET(selector);
-}
--- a/src/gtkstatusselector.h	Thu Aug 18 21:00:50 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/**
- * @file gtkstatusselector.h Status selector widget
- * @ingroup gtkui
- *
- * gaim
- *
- * Gaim is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * 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
- */
-#ifndef _GAIM_GTKSTATUSSELECTOR_H_
-#define _GAIM_GTKSTATUSSELECTOR_H_
-
-#include <gtk/gtkvbox.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GAIM_GTK_TYPE_STATUS_SELECTOR            (gaim_gtk_status_selector_get_type())
-#define GAIM_GTK_STATUS_SELECTOR(obj)            (GTK_CHECK_CAST((obj), GAIM_GTK_TYPE_STATUS_SELECTOR, GaimGtkStatusSelector))
-#define GAIM_GTK_STATUS_SELECTOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST((klass), GAIM_GTK_TYPE_STATUS_SELECTOR, GaimGtkStatusSelectorClass))
-#define GAIM_GTK_IS_STATUS_SELECTOR(obj)         (GTK_CHECK_TYPE((obj), GAIM_GTK_TYPE_STATUS_SELECTOR))
-#define GAIM_GTK_IS_STATUS_SELECTOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GAIM_GTK_TYPE_STATUS_SELECTOR))
-
-typedef struct _GaimGtkStatusSelector        GaimGtkStatusSelector;
-typedef struct _GaimGtkStatusSelectorClass   GaimGtkStatusSelectorClass;
-typedef struct _GaimGtkStatusSelectorPrivate GaimGtkStatusSelectorPrivate;
-
-struct _GaimGtkStatusSelector
-{
-	GtkVBox parent_object;
-
-	GaimGtkStatusSelectorPrivate *priv;
-
-	void (*_gtk_reserved1)(void);
-	void (*_gtk_reserved2)(void);
-	void (*_gtk_reserved3)(void);
-	void (*_gtk_reserved4)(void);
-};
-
-struct _GaimGtkStatusSelectorClass
-{
-	GtkVBoxClass parent_class;
-
-	void (*_gtk_reserved1)(void);
-	void (*_gtk_reserved2)(void);
-	void (*_gtk_reserved3)(void);
-	void (*_gtk_reserved4)(void);
-};
-
-
-/**
- * Returns the status selector widget's GType.
- *
- * @return GaimGtkStatusSelector's GType.
- */
-GType gaim_gtk_status_selector_get_type(void);
-
-/**
- * Creates a new status selector widget.
- *
- * @return The new status selector widget.
- */
-GtkWidget *gaim_gtk_status_selector_new(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GAIM_GTKSTATUSSELECTOR_H_ */