Mercurial > pidgin

changeset 3472:d33ec392a5e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 3523] Rob McQueen went and removed all the GTK version preprocessor statements. Thanks! committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Thu, 29 Aug 2002 21:40:08 +0000
parents 7fb93ecd631c
children 0073a014e55b
files plugins/filectl.c plugins/iconaway.c src/about.c src/aim.c src/away.c src/browser.c src/buddy.c src/conversation.c src/dialogs.c src/gaim.h src/gtkimhtml.c src/multi.c src/plugins.c src/prefs.c src/server.c src/ui.h
diffstat 16 files changed, 175 insertions(+), 785 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/filectl.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/plugins/filectl.c	Thu Aug 29 21:40:08 2002 +0000
@@ -1,6 +1,5 @@
 #include "config.h"
 #include "gaim.h"
-#include "applet.h"
 
 #include <gtk/gtk.h>
 #include <stdlib.h>
--- a/plugins/iconaway.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/plugins/iconaway.c	Thu Aug 29 21:40:08 2002 +0000
@@ -1,8 +1,7 @@
 #include "../config.h"
 #include "gaim.h"
 
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
+#include <gtk/gtk.h>
 
 void *handle;
 
@@ -18,18 +17,12 @@
 void iconify_windows(struct gaim_connection *gc, char *state, char *message, void *data) {
 	if (!imaway || !gc->away)
 		return;
-	XIconifyWindow(GDK_DISPLAY(),
-			GDK_WINDOW_XWINDOW(imaway->window),
-		       ((_XPrivDisplay)GDK_DISPLAY())->default_screen);
+	gtk_window_iconify(GTK_WINDOW(imaway));
 	hide_buddy_list();
 	if (all_convos)
-		XIconifyWindow(GDK_DISPLAY(),
-				GDK_WINDOW_XWINDOW(all_convos->window),
-				((_XPrivDisplay)GDK_DISPLAY())->default_screen);
+		gtk_window_iconify(GTK_WINDOW(all_convos));
 	if (all_chats)
-		XIconifyWindow(GDK_DISPLAY(),
-				GDK_WINDOW_XWINDOW(all_chats->window),
-				((_XPrivDisplay)GDK_DISPLAY())->default_screen);
+		gtk_window_iconify(GTK_WINDOW(all_chats));
 }
 
 char *gaim_plugin_init(GModule *h) {
--- a/src/about.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/about.c	Thu Aug 29 21:40:08 2002 +0000
@@ -69,15 +69,6 @@
 	return VERSION;
 }
 
-gboolean is_applet()
-{
-#ifdef USE_APPLET
-	return TRUE;
-#else
-	return FALSE;
-#endif
-}
-
 void show_about(GtkWidget *w, void *null)
 {
 	GtkWidget *vbox;
--- a/src/aim.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/aim.c	Thu Aug 29 21:40:08 2002 +0000
@@ -22,14 +22,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#ifdef USE_APPLET
-#include "applet.h"
-#include <gnome.h>
-#else
-#ifdef USE_GNOME
-#include <gnome.h>
-#endif /* USE_GNOME */
-#endif /* USE_APPLET */
 #ifdef GAIM_PLUGINS
 #include <dlfcn.h>
 #endif /* GAIM_PLUGINS */
@@ -58,9 +50,7 @@
 #endif
 #include "locale.h"
 #include "gtkspell.h"
-#ifndef USE_APPLET
 #include <getopt.h>
-#endif
 
 static gchar *aspell_cmd[] = { "aspell", "--sug-mode=fast","-a", NULL };
 static gchar *ispell_cmd[] = { "ispell", "-a", NULL };
@@ -106,11 +96,6 @@
 
 void cancel_logon(void)
 {
-#ifdef USE_APPLET
-	applet_buddy_show = FALSE;
-	if (mainwindow)
-		gtk_widget_hide(mainwindow);
-#else
 #ifdef GAIM_PLUGINS
 	/* first we tell those who have requested it we're quitting */
 	plugin_event(event_quit, 0, 0, 0, 0);
@@ -123,7 +108,6 @@
 #endif
 
 	gtk_main_quit();
-#endif /* USE_APPLET */
 }
 
 static int snd_tmout;
@@ -143,12 +127,6 @@
 		logins_not_muted = 0;
 		snd_tmout = gtk_timeout_add(10000, (GtkFunction)sound_timeout, NULL);
 	}
-#ifdef USE_APPLET
-	set_user_state(online);
-	applet_widget_unregister_callback(APPLET_WIDGET(applet), "autologin");
-	applet_widget_register_callback(APPLET_WIDGET(applet),
-					"signoff", _("Signoff"), (AppletCallbackFunc)signoff_all, NULL);
-#endif /* USE_APPLET */
 }
 
 
@@ -311,11 +289,9 @@
 	gtk_box_pack_start(GTK_BOX(sbox), bbox, TRUE, TRUE, 0);
 	gtk_widget_show(bbox);
 
-#ifndef USE_APPLET
 	cancel = gtk_button_new_with_label(_("Quit"));
-#else
-	cancel = gtk_button_new_with_label(_("Close"));
-#endif
+/* fixme: docklet					*
+ *	cancel = gtk_button_new_with_label(_("Close"));	*/
 #ifndef NO_MULTI
 	accts = gtk_button_new_with_label(_("Accounts"));
 #endif
@@ -556,30 +532,9 @@
 	sigset_t sigset;
 	void (*prev_sig_disp)();
 #endif
-#ifndef USE_APPLET
 	int opt, opt_user = 0;
 	int i;
 
-#ifdef USE_GNOME
-	struct poptOption popt_options[] = {
-		{"acct", 'a', POPT_ARG_NONE, &opt_acct, 'a',
-		 "Display account editor window", NULL},
-		{"away", 'w', POPT_ARG_STRING, NULL, 'w',
-		 "Make away on signon (optional argument MESG specifies name of away message to use)",
-		 "[MESG]"},
-		{"login", 'l', POPT_ARG_STRING, NULL, 'l',
-		 "Automatically login (optional argument NAME specifies account(s) to use)", "[NAME]"},
-		{"loginwin", 'n', POPT_ARG_NONE, &opt_nologin, 'n',
-		 "Don't automatically login; show login window",  NULL},
-		{"user", 'u', POPT_ARG_STRING, &opt_user_arg, 'u',
-		 "Use account NAME", "NAME"},
-		{"file", 'f', POPT_ARG_STRING, &opt_rcfile_arg, 'f',
-		 "Use FILE as config", "FILE"},
-		{"debug", 'd', POPT_ARG_NONE, &opt_debug, 'd',
-		 "Print debugging messages to stdout", NULL},
-		{0, 0, 0, 0, 0, 0, 0}
-	};
-#endif /* USE_GNOME */
 	struct option long_options[] = {
 		{"acct", no_argument, NULL, 'a'},
 		/*{"away", optional_argument, NULL, 'w'}, */
@@ -592,7 +547,6 @@
 		{"version", no_argument, NULL, 'v'},
 		{0, 0, 0, 0}
 	};
-#endif
 
 #ifdef DEBUG
 	opt_debug = 1;
@@ -644,10 +598,6 @@
 	}		
 #endif
 
-
-#ifdef USE_APPLET
-	init_applet_mgr(argc, argv);
-#else
 	for (i = 0; i < argc; i++) {
 		/* --login option */
 		if (strstr(argv[i], "--l") == argv[i]) {
@@ -721,18 +671,10 @@
 	 */
 
 	gtk_set_locale();
-#ifdef USE_GNOME
-	gnome_init_with_popt_table(PACKAGE, VERSION, argc, argv, popt_options, 0, NULL);
-#else
 	gtk_init(&argc, &argv);
-#endif
 
 	/* scan command-line options */
-#ifdef USE_GNOME
-	opterr = 0;
-#else
 	opterr = 1;
-#endif
 	while ((opt = getopt_long(argc, argv, "adhu:f:vn", long_options, NULL)) != -1) {
 		switch (opt) {
 		case 'u':	/* set user */
@@ -757,18 +699,14 @@
 		case 'n':       /* don't autologin */
 			opt_nologin = 1;
 			break;
-#ifndef USE_GNOME
 		case '?':
 		default:
 			show_usage(1, argv[0]);
 			return 0;
 			break;
-#endif
 		}
 	}
 
-#endif /* USE_APPLET */
-
 	/* show help message */
 	if (opt_help) {
 		show_usage(0, argv[0]);
@@ -783,7 +721,6 @@
 		return 0;
 	}
 
-
 	load_prefs();
 
 	core_main();
@@ -792,10 +729,8 @@
 	/* set the default username */
 	if (opt_user_arg != NULL) {
 		set_first_user(opt_user_arg);
-#ifndef USE_GNOME
 		g_free(opt_user_arg);
 		opt_user_arg = NULL;
-#endif /* USE_GNOME */
 	}
 
 	if (misc_options & OPT_MISC_DEBUG)
@@ -826,25 +761,6 @@
 			opt_login_arg = NULL;
 		}
 	}
-#ifdef USE_APPLET
-	applet_widget_register_callback(APPLET_WIDGET(applet),
-					"prefs", _("Preferences"), show_prefs, NULL);
-	applet_widget_register_callback(APPLET_WIDGET(applet),
-					"accounts",
-					_("Accounts"), (AppletCallbackFunc)account_editor, (void *)1);
-#ifdef GAIM_PLUGINS
-	applet_widget_register_callback(APPLET_WIDGET(applet),
-					"plugins", _("Plugins"), GTK_SIGNAL_FUNC(show_plugins), NULL);
-#endif /* GAIM_PLUGINS */
-
-	applet_widget_register_callback(APPLET_WIDGET(applet),
-					"autologin", _("Auto-login"), (AppletCallbackFunc)auto_login, NULL);
- 
-	if (!opt_acct)
-		auto_login();
-
-	applet_widget_gtk_main();
-#else
 
 	if (!opt_acct && !opt_nologin)
 		auto_login();
@@ -856,8 +772,6 @@
 
 	gtk_main();
 
-#endif /* USE_APPLET */
-
 	if (convo_options & OPT_CONVO_CHECK_SPELLING)
 		gtkspell_stop();
 	core_quit();
--- a/src/away.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/away.c	Thu Aug 29 21:40:08 2002 +0000
@@ -22,11 +22,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#ifdef USE_APPLET
-#include <gnome.h>
-#include <applet-widget.h>
-#include "applet.h"
-#endif /* USE_APPLET */
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -123,10 +118,6 @@
 	g_free(name);
 	gtk_clist_remove(GTK_CLIST(clist), row);
 
-#ifdef USE_APPLET
-	set_user_state(away);
-#endif
-	
 }
 	
 	
@@ -170,11 +161,6 @@
 	awaymessage = NULL;
 	clistqueue = NULL;
 	clistqueuesw = NULL;
-#ifdef USE_APPLET
-	applet_widget_unregister_callback(APPLET_WIDGET(applet), "away");
-	set_user_state(online);
-	insert_applet_away();
-#endif /* USE_APPLET */
 }
 
 
@@ -260,13 +246,6 @@
 		return;
 	}
 
-#ifdef USE_APPLET
-	remove_applet_away();
-	applet_widget_register_callback(APPLET_WIDGET(applet),
-					"away", _("Back"), (AppletCallbackFunc)do_im_back, NULL);
-	set_user_state(away);
-#endif
-
 	/* New away message... Clear out the old sent_aways */
 	while (away_time_queue) {
 		struct queued_away_response *qar = away_time_queue->data;
@@ -284,15 +263,6 @@
 void rem_away_mess(GtkWidget *w, struct away_message *a)
 {
 	int default_index;
-#ifdef USE_APPLET
-	char *awayname;
-	awayname = g_malloc(sizeof(*awayname) * (6 + strlen(a->name)));
-	awayname[0] = '\0';
-	strcat(awayname, "away/");
-	strcat(awayname, a->name);
-	applet_widget_unregister_callback(APPLET_WIDGET(applet), awayname);
-	g_free(awayname);
-#endif
 	default_index = g_slist_index(away_messages, default_away);
 	if (default_index == -1) {
 		if (away_messages != NULL)
@@ -339,15 +309,6 @@
 	struct gaim_connection *gc = NULL;
 	int count = 0;
 
-#ifdef USE_APPLET
-	remove_applet_away();
-	if (imaway && applet)
-		applet_widget_register_callback(APPLET_WIDGET(applet),
-						"away", _("Back"), (AppletCallbackFunc)do_im_back, NULL);
-	else if (applet && !imaway)
-		insert_applet_away();
-#endif
-
 	if (prefs_away_list != NULL) {
 		GtkWidget *hbox;
 		gtk_list_clear_items(GTK_LIST(prefs_away_list), 0, -1);
--- a/src/browser.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/browser.c	Thu Aug 29 21:40:08 2002 +0000
@@ -576,10 +576,9 @@
 
 		netscape_command(command);
 		g_free(command);
-#ifdef USE_GNOME
-	} else if (web_browser == BROWSER_GNOME) {
-		gnome_url_show(url);
-#endif /* USE_GNOME */
+/* fixme: GNOME helper					*
+ *	} else if (web_browser == BROWSER_GNOME) {	*
+ *		gnome_url_show(url);			*/
 	} else {
 		pid_t pid;
 
--- a/src/buddy.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/buddy.c	Thu Aug 29 21:40:08 2002 +0000
@@ -22,11 +22,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#ifdef USE_APPLET
-#include <gnome.h>
-#include <applet-widget.h>
-#include "applet.h"
-#endif /* USE_APPLET */
 #ifdef GAIM_PLUGINS
 #include <dlfcn.h>
 #endif /* GAIM_PLUGINS */
@@ -41,7 +36,6 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
 #include "prpl.h"
 #include "gaim.h"
 #include "pixmaps/login_icon.xpm"
@@ -61,11 +55,8 @@
 #endif
 #include "pixmaps/prefs_small.xpm"
 #include "pixmaps/search_small.xpm"
-#ifdef USE_APPLET
 #include "pixmaps/close_small.xpm"
-#else
 #include "pixmaps/exit_small.xpm"
-#endif
 #include "pixmaps/pounce_small.xpm"
 #include "pixmaps/about_small.xpm"
 
@@ -96,7 +87,6 @@
 
 typedef struct _GtkTreePixmaps GtkTreePixmaps;
 
-
 struct buddy_show {
 	GtkWidget *item;
 	GtkWidget *pix;
@@ -120,6 +110,9 @@
 };
 static GSList *shows = NULL;
 
+static gboolean blist_hidden;
+static int docklet_refcount = 0;
+
 /* Predefine some functions */
 static void new_bp_callback(GtkWidget *w, struct buddy *bs);
 static struct group_show *find_group_show(char *group);
@@ -521,16 +514,6 @@
 }
 
 
-#ifdef USE_APPLET
-gint applet_destroy_buddy(GtkWidget *widget, GdkEvent *event, gpointer *data)
-{
-	applet_buddy_show = FALSE;
-	gtk_widget_hide(blist);
-	return (TRUE);
-}
-
-#endif
-
 static int handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g)
 {
 	if (event->type == GDK_2BUTTON_PRESS) {
@@ -1418,10 +1401,6 @@
 
 void do_quit()
 {
-#ifdef USE_APPLET
-	applet = NULL;
-#endif
-
 	/* first we tell those who have requested it we're quitting */
 	plugin_event(event_quit, 0, 0, 0, 0);
 
@@ -2016,16 +1995,71 @@
 	return g;
 }
 
+/* used by this file, and by iconaway.so */
 void hide_buddy_list() {
-	if (blist)
-		XIconifyWindow(GDK_DISPLAY(),
-			       GDK_WINDOW_XWINDOW(blist->window),
-			       ((_XPrivDisplay)GDK_DISPLAY())->default_screen);
+	if (!blist) return;
+	if (!connections || docklet_refcount) {
+		gtk_widget_hide(blist);
+	} else {
+		gtk_window_iconify(GTK_WINDOW(blist));
+	}
+	blist_hidden = TRUE;
+}
+
+/* shared code... not in lschiere/faceprint tree though. oh well */
+static void move_buddy_list() {
+	if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
+		if (blist_pos.width != 0) {	/* Sanity check! */
+			gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff,
+						 blist_pos.y - blist_pos.yoff);
+			gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height);
+		}
+	}
+}
+
+/* mostly used by code in this file */
+void unhide_buddy_list() {
+	if (!blist) return;
+	gtk_window_present(GTK_WINDOW(blist));
+	move_buddy_list();
+	blist_hidden = FALSE;
 }
 
-void unhide_buddy_list() {
-	if (blist)
-		gdk_window_show(blist->window);
+/* used by the docklet */
+void toggle_buddy_list() {
+	if (blist_hidden) {
+		unhide_buddy_list();
+	} else {
+		hide_buddy_list();
+	}
+}
+
+/* for the delete_event handler */
+static void close_buddy_list() {
+	if (docklet_refcount) {
+		hide_buddy_list();
+	} else {
+		do_quit();
+	}
+}
+
+void docklet_add() {
+	docklet_refcount++;
+	printf("docklet_refcount: %d\n",docklet_refcount);
+}
+
+void docklet_remove() {
+	if (docklet_refcount) {
+		docklet_refcount--;
+	}
+	printf("docklet_refcount: %d\n",docklet_refcount);
+	if (!docklet_refcount) {
+		if (connections) {
+			unhide_buddy_list();
+		} else {
+			gtk_window_present(GTK_WINDOW(mainwindow));
+		}
+	}
 }
 
 static gint log_timeout(struct buddy_show *b)
@@ -2205,9 +2239,6 @@
 		gtk_widget_show(bs->idle);
 
 	style = gtk_style_new();
-#if !GTK_CHECK_VERSION(1,3,0)
-	gdk_font_unref(gtk_style_get_font(style));
-#endif
 	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style)));
 	for (i = 0; i < 5; i++)
 		style->fg[i] = bs->idle->style->fg[i];
@@ -2413,9 +2444,8 @@
 	gdk_window_get_position(blist->window, &x, &y);
 	gdk_window_get_size(blist->window, &width, &height);
 
-#ifdef USE_APPLET
-	if (applet_buddy_show){
-#endif
+/* fixme: docklet		*
+ *	if (applet_buddy_show){	*/
 
 	if (e->send_event) {	/* Is a position event */
 		if (blist_pos.x != x || blist_pos.y != y)
@@ -2435,10 +2465,6 @@
 	if (save)
 		save_prefs();
 
-#ifdef USE_APPLET
-	}
-#endif
-	
 }
 
 
@@ -2626,15 +2652,11 @@
 	GtkWidget *tbox;
 
 	if (blist) {
-		gtk_widget_show(blist);
+		unhide_buddy_list;
 		return;
 	}
 
-#ifdef USE_APPLET
-	GAIM_DIALOG(blist);
-#else
 	blist = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-#endif
 
 	gtk_window_set_wmclass(GTK_WINDOW(blist), "buddy_list", "Gaim");
 
@@ -2675,13 +2697,11 @@
 	gaim_new_item_with_pixmap(menu, _("Signoff"), logout_menu_xpm,
 				  GTK_SIGNAL_FUNC(signoff_all), (void*)1, 'd', GDK_CONTROL_MASK, "Ctl+D");
 
-#ifndef USE_APPLET
+	gaim_new_item_with_pixmap(menu, _("Hide"), close_small_xpm,
+				  GTK_SIGNAL_FUNC(hide_buddy_list), NULL, 'h', GDK_CONTROL_MASK, "Ctl+H");
+
 	gaim_new_item_with_pixmap(menu, _("Quit"), exit_small_xpm,
 				  GTK_SIGNAL_FUNC(do_quit), NULL, 'q', GDK_CONTROL_MASK, "Ctl+Q");
-#else
-	gaim_new_item_with_pixmap(menu, _("Close"), close_small_xpm,
-				  GTK_SIGNAL_FUNC(applet_destroy_buddy), NULL, 'x', GDK_CONTROL_MASK, "Ctl+X");
-#endif
 
 	menu = gtk_menu_new();
 
@@ -2878,12 +2898,8 @@
 
 	gtk_container_add(GTK_CONTAINER(blist), vbox);
 
-#ifndef USE_APPLET
-	gtk_signal_connect(GTK_OBJECT(blist), "delete_event", GTK_SIGNAL_FUNC(do_quit), blist);
-#else
-	gtk_signal_connect(GTK_OBJECT(blist), "delete_event", GTK_SIGNAL_FUNC(applet_destroy_buddy),
+	gtk_signal_connect(GTK_OBJECT(blist), "delete_event", GTK_SIGNAL_FUNC(close_buddy_list),
 			   NULL);
-#endif
 
 	gtk_signal_connect(GTK_OBJECT(blist), "configure_event", GTK_SIGNAL_FUNC(move_blist_window),
 			   NULL);
@@ -2897,14 +2913,8 @@
 
 
 	gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List"));
-
-	if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
-		if (blist_pos.width != 0) {	/* Sanity check! */
-			gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff,
-						 blist_pos.y - blist_pos.yoff);
-			gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height);
-		}
-	}
+	move_buddy_list();
+	blist_hidden = FALSE;
 }
 
 void refresh_buddy_window()
--- a/src/conversation.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/conversation.c	Thu Aug 29 21:40:08 2002 +0000
@@ -272,10 +272,8 @@
 		gtk_widget_destroy(c->link_dialog);
 	if (c->log_dialog)
 		gtk_widget_destroy(c->log_dialog);
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 	if (c->save_icon)
 		gtk_widget_destroy(c->save_icon);
-#endif
 	c->send_history = g_list_first(c->send_history);
 	while (c->send_history) {
 		if (c->send_history->data)
@@ -2642,9 +2640,6 @@
 		return;
 	if (c->unseen == -1) return;
 	style = gtk_style_new();
-#if !GTK_CHECK_VERSION(1,3,0)
-	gdk_font_unref(gtk_style_get_font(style));
-#endif
 	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 	gtk_widget_set_style(label, style);
 	gtk_style_unref(style);
@@ -2669,9 +2664,6 @@
 		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
 			gtk_widget_realize(label);
-#if !GTK_CHECK_VERSION(1,3,0)
-		gdk_font_unref(gtk_style_get_font(style));
-#endif
 		gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 		style->fg[0].red = 0x0000;
 		style->fg[0].green = 0x9999;
@@ -2731,9 +2723,6 @@
 		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
 			gtk_widget_realize(label);
-#if !GTK_CHECK_VERSION(1,3,0)
-		gdk_font_unref(gtk_style_get_font(style));
-#endif
 		gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 		c->unseen = 0;
 		gtk_widget_set_style(label, style);
@@ -2903,16 +2892,7 @@
 	gtk_text_set_editable(GTK_TEXT(entry), TRUE);
 	gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE);
 
-#if !GTK_CHECK_VERSION(1,3,0) /* This gtk bug should be fixed in gtk2 */
-	/* I hate hackish workarounds.  According to Ari Pollak, a gtk bug causes Gaim to loop
-	 * infinitely if the entry is smaller than the text height.  This is a hackish workaround */ 
-	gtk_widget_set_usize(entry, conv_size.width - 20, 
-			     MAX(conv_size.entry_height, 
-				 gdk_char_height(gtk_widget_get_default_style()->font, '0') +
-				 gtk_widget_get_default_style()->font->ascent + 1));
-#else
 	gtk_widget_set_usize(entry, conv_size.width - 20, MAX(conv_size.entry_height, 25));
-#endif
 
 	gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback), c);
 	gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c);
@@ -3357,7 +3337,6 @@
 	}
 }
 
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #define SCALE(x) ((gdk_pixbuf_animation_get_width(x) <= 48 && gdk_pixbuf_animation_get_height(x) <= 48) \
@@ -3497,11 +3476,7 @@
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 	}
-#if GTK_CHECK_VERSION(1,3,0)
 	 else if (c->anim && !(gdk_pixbuf_animation_is_static_image(c->anim))) 
-#else
-	 else if (c->anim && (gdk_pixbuf_animation_get_num_frames(c->anim) > 1)) 
-#endif
 	{
 		button = gtk_menu_item_new_with_label(_("Enable Animation"));
 		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(start_anim), c);
@@ -3524,11 +3499,9 @@
 
 	return TRUE;
 }
-#endif
 
 void remove_icon(struct conversation *c)
 {
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 	if (c->icon)
 		gtk_container_remove(GTK_CONTAINER(c->bbox), c->icon->parent->parent);
 	c->icon = NULL;
@@ -3538,13 +3511,8 @@
 	if (c->icon_timer)
 		gtk_timeout_remove(c->icon_timer);
 	c->icon_timer = 0;
-#if GTK_CHECK_VERSION(1,3,0)
 	if(c->iter)
 		g_object_unref(c->iter);
-#else
-	c->frame = 0;
-#endif
-#endif
 }
 
 void update_smilies(struct conversation *c)
@@ -3670,7 +3638,6 @@
 	gdk_pixmap_unref(pm);
 	if (bm)
 		gdk_bitmap_unref(bm);
-	
 }
 
 void got_new_icon(struct gaim_connection *gc, char *who)
@@ -3691,7 +3658,6 @@
 
 void set_anim()
 {
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 	GList *c = conversations;
 	if (im_options & OPT_IM_HIDE_ICONS)
 		return;
@@ -3702,7 +3668,6 @@
 			start_anim(NULL, c->data);
 		c = c->next;
 	}
-#endif
 }
 
 static void remove_checkbox(struct conversation *c)
--- a/src/dialogs.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/dialogs.c	Thu Aug 29 21:40:08 2002 +0000
@@ -43,9 +43,6 @@
 #include "gaim.h"
 #include "gtkimhtml.h"
 #include "prpl.h"
-#ifdef USE_APPLET
-#include "applet.h"
-#endif
 
 #include "pixmaps/gnome_preferences.xpm"
 #include "pixmaps/cancel.xpm"
@@ -3410,11 +3407,6 @@
 	if (!ca->mess)
 		am = g_new0(struct away_message, 1);
 	else {
-#ifdef USE_APPLET
-		char *awayname = g_strdup_printf("away/%s", ca->mess->name);
-		applet_widget_unregister_callback(APPLET_WIDGET(applet), awayname);
-		g_free(awayname);
-#endif
 		am = ca->mess;
 	}
 
@@ -4604,7 +4596,7 @@
 		gdk_window_set_group(w, mainwindow->window);
 #endif
 }
- 
+
 GtkWidget *pixbuf_button(char *text, char *iconfile)
 {
 	GtkWidget *button, *image, *label, *bbox;
@@ -4629,7 +4621,6 @@
 	return button;
 }
 
-
 GtkWidget *picture_button(GtkWidget *window, char *text, char **xpm)
 {
 	GtkWidget *button;
--- a/src/gaim.h	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/gaim.h	Thu Aug 29 21:40:08 2002 +0000
@@ -111,7 +111,6 @@
 
 #define WEBSITE "http://gaim.sourceforge.net/"
 
-#ifndef USE_GNOME
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  define _(x) gettext(x)
@@ -124,7 +123,6 @@
 #  define N_(String) (String)
 #  define _(x) (x)
 #endif
-#endif
 
 #define OPT_USR_AUTO		0x00000001
 /*#define OPT_USR_KEEPALV	0x00000002 this shouldn't be optional */
--- a/src/gtkimhtml.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/gtkimhtml.c	Thu Aug 29 21:40:08 2002 +0000
@@ -36,12 +36,8 @@
 #include <locale.h>
 #endif
 
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#else
-#include "pixmaps/broken.xpm"
-#endif
 
 #include "pixmaps/angel.xpm"
 #include "pixmaps/bigsmile.xpm"
@@ -266,9 +262,7 @@
 	gint width,height;
 	GtkIMHtml *imhtml;
 	GtkIMHtmlBit *bit;
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 	GdkPixbuf *pb;
-#endif
 };
 
 struct _GtkIMHtmlBit {
@@ -340,11 +334,7 @@
 static gint      gtk_imhtml_motion_notify_event (GtkWidget *, GdkEventMotion *);
 
 static void
-#if GTK_CHECK_VERSION(1,3,0)
 gtk_imhtml_finalize (GObject *object)
-#else
-gtk_imhtml_destroy (GtkObject *object)
-#endif
 {
 	GtkIMHtml *imhtml;
 
@@ -371,12 +361,7 @@
 
 	gtk_smiley_tree_destroy (imhtml->smiley_data);
 
-#if GTK_CHECK_VERSION(1,3,0)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
-#else
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-#endif
 }
 
 static void
@@ -408,13 +393,8 @@
 					 &attributes, attributes_mask);
 	gdk_window_set_user_data (widget->window, widget);
 
-#if GTK_CHECK_VERSION(1,3,0)
 	attributes.x = widget->style->xthickness + BORDER_SIZE;
 	attributes.y = widget->style->xthickness + BORDER_SIZE;
-#else
-	attributes.x = widget->style->klass->xthickness + BORDER_SIZE;
-	attributes.y = widget->style->klass->xthickness + BORDER_SIZE;
-#endif
 	attributes.width = MAX (1, (gint) widget->allocation.width - (gint) attributes.x * 2);
 	attributes.height = MAX (1, (gint) widget->allocation.height - (gint) attributes.y * 2);
 	attributes.event_mask = gtk_widget_get_events (widget)
@@ -429,7 +409,7 @@
 
 	gdk_window_set_cursor (widget->window, imhtml->arrow_cursor);
 
-	imhtml->default_font = gdk_font_ref (GTK_IMHTML_GET_STYLE_FONT (widget->style));
+	imhtml->default_font = gdk_font_ref (gtk_style_get_font (widget->style));
 
 	gdk_window_set_background (widget->window, &widget->style->base [GTK_STATE_NORMAL]);
 	gdk_window_set_background (GTK_LAYOUT (imhtml)->bin_window,
@@ -734,13 +714,8 @@
 		return;
 
 	if (GTK_WIDGET_HAS_FOCUS (widget)) {
-#if GTK_CHECK_VERSION(1,3,0)
 		gtk_paint_focus (widget->style, widget->window, GTK_STATE_NORMAL, NULL, widget, "text", 
 				 0, 0, widget->allocation.width - 1, widget->allocation.height - 1);
-#else
-		gtk_paint_focus (widget->style, widget->window, NULL, widget, "text", 0, 0,
-				 widget->allocation.width - 1, widget->allocation.height - 1);
-#endif
 		x = 1; y = 1; w = 2; h = 2;
 	}
 
@@ -757,11 +732,7 @@
 	GList *chunks;
 	struct line_info *line;
 	gfloat x, y;
-#if GTK_CHECK_VERSION(1,3,0)
 	guint32 width, height;
-#else
-	gint width, height;
-#endif
 
 	x = GTK_LAYOUT (imhtml)->hadjustment->value;
 	y = GTK_LAYOUT (imhtml)->vadjustment->value;
@@ -814,18 +785,6 @@
 	gtk_imhtml_draw_focus (GTK_WIDGET (imhtml));
 }
 
-#if !GTK_CHECK_VERSION(1,3,0)
-static void
-gtk_imhtml_draw (GtkWidget    *widget,
-		 GdkRectangle *area)
-{
-	GtkIMHtml *imhtml;
-
-	imhtml = GTK_IMHTML (widget);
-	gtk_imhtml_draw_exposed (imhtml);
-}
-#endif
-
 static void
 gtk_imhtml_style_set (GtkWidget *widget,
 		      GtkStyle  *style)
@@ -856,7 +815,7 @@
 	imhtml->default_hlfg_color=gdk_color_copy (&GTK_WIDGET (imhtml)->style->fg [GTK_STATE_SELECTED]);
 	if (imhtml->default_font)
 		gdk_font_unref (imhtml->default_font);
-	imhtml->default_font = gdk_font_ref (GTK_IMHTML_GET_STYLE_FONT (widget->style));
+	imhtml->default_font = gdk_font_ref (gtk_style_get_font (widget->style));
 	gdk_window_set_background (widget->window, &widget->style->base [GTK_STATE_NORMAL]);
 	gdk_window_set_background (GTK_LAYOUT (imhtml)->bin_window,
 				   &widget->style->base [GTK_STATE_NORMAL]);
@@ -971,7 +930,6 @@
 
 	widget->allocation = *allocation;
 
-#if GTK_CHECK_VERSION(1,3,0)
 	new_xsize = MAX (1, (gint) allocation->width -
 			    (gint) (widget->style->xthickness + BORDER_SIZE) * 2);
 	new_ysize = MAX (1, (gint) allocation->height -
@@ -986,22 +944,6 @@
 		gdk_window_move_resize (layout->bin_window,
 					x, y, new_xsize, new_ysize);
 	}
-#else
-	new_xsize = MAX (1, (gint) allocation->width -
-			    (gint) (widget->style->klass->xthickness + BORDER_SIZE) * 2);
-	new_ysize = MAX (1, (gint) allocation->height -
-			    (gint) (widget->style->klass->ythickness + BORDER_SIZE) * 2);
-
-	if (GTK_WIDGET_REALIZED (widget)) {
-		gint x = widget->style->klass->xthickness + BORDER_SIZE;
-		gint y = widget->style->klass->ythickness + BORDER_SIZE;
-		gdk_window_move_resize (widget->window,
-					allocation->x, allocation->y,
-					allocation->width, allocation->height);
-		gdk_window_move_resize (layout->bin_window,
-					x, y, new_xsize, new_ysize);
-	}
-#endif
 
 	layout->hadjustment->page_size = new_xsize;
 	layout->hadjustment->page_increment = new_xsize / 2;
@@ -1989,16 +1931,12 @@
 static void
 gtk_imhtml_class_init (GtkIMHtmlClass *class)
 {
-#if GTK_CHECK_VERSION(1,3,0)
 	GObjectClass  *gobject_class;
-#endif
 	GtkObjectClass *object_class;
 	GtkWidgetClass *widget_class;
 	GtkLayoutClass *layout_class;
 
-#if GTK_CHECK_VERSION(1,3,0)
 	gobject_class = (GObjectClass*) class;
-#endif
 	object_class = (GtkObjectClass*) class;
 	widget_class = (GtkWidgetClass*) class;
 	layout_class = (GtkLayoutClass*) class;
@@ -2014,19 +1952,9 @@
 				GTK_TYPE_NONE, 1,
 				GTK_TYPE_POINTER);
 
-#if GTK_CHECK_VERSION(1,3,0)
 	gobject_class->finalize = gtk_imhtml_finalize;
-#else
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	object_class->destroy = gtk_imhtml_destroy;
-#endif
 
 	widget_class->realize = gtk_imhtml_realize;
-#if !GTK_CHECK_VERSION(1,3,0)
-	widget_class->draw = gtk_imhtml_draw;
-	widget_class->draw_focus = gtk_imhtml_draw_focus;
-#endif
 	widget_class->style_set = gtk_imhtml_style_set;
 	widget_class->expose_event  = gtk_imhtml_expose_event;
 	widget_class->size_allocate = gtk_imhtml_size_allocate;
@@ -2651,7 +2579,6 @@
 
 		g_free (copy);
 	} else if ((bit->type == TYPE_SMILEY) || (bit->type == TYPE_IMG)) {
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 	  if (bit->img) {
 			GdkPixbuf *imagepb = bit->img->pb;
 			GdkPixbuf *tmp = NULL;
@@ -2679,7 +2606,6 @@
 				gdk_pixbuf_render_pixmap_and_mask(imagepb, &(bit->pm), &(bit->bm), 100);
 			}
 	  }
-#endif
 		
 		gdk_window_get_size (bit->pm, &width, &height);
 
@@ -2910,13 +2836,13 @@
 		*replace = ' ';
 		*length = 6;
 	} else if (!g_strncasecmp (string, "&copy;", 6)) {
-		*replace = '©';
+		*replace = '©';
 		*length = 6;
 	} else if (!g_strncasecmp (string, "&quot;", 6)) {
 		*replace = '\"';
 		*length = 6;
 	} else if (!g_strncasecmp (string, "&reg;", 5)) {
-		*replace = '®';
+		*replace = '®';
 		*length = 5;
 	} else if (*(string + 1) == '#') {
 		guint pound = 0;
@@ -3383,13 +3309,9 @@
 					char *tmp, *imagedata, *e;
 					const gchar *alltext;
 					struct im_image *img;
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 					GdkPixbufLoader *load;
 					GdkPixbuf *imagepb = NULL;
-#if GTK_CHECK_VERSION(1,3,0)
 					GError *err;
-#endif
-#endif
 					NEW_BIT (NEW_TEXT_BIT);
 					if (!id || !datasize)
 						break;
@@ -3428,22 +3350,15 @@
 					if (img->len) {
 						img->data = g_malloc(img->len);
 						memcpy(img->data, imagedata, img->len);
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 						load = gdk_pixbuf_loader_new();
 
-#if GTK_CHECK_VERSION(1,3,0)
 						if (!gdk_pixbuf_loader_write(load, imagedata, 
 									img->len, &err))
-#else 
-						if (!gdk_pixbuf_loader_write(load, imagedata, img->len))
-#endif
 							g_print("IM Image corrupt or unreadable.\n");
 						else 
 							imagepb = gdk_pixbuf_loader_get_pixbuf(load);
 						img->pb = imagepb;
-#endif
 					}
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 					if (imagepb) {
 						bit = g_new0 (GtkIMHtmlBit, 1);
 						bit->type = TYPE_IMG;
@@ -3456,19 +3371,6 @@
 						g_free(img->filename);
 						g_free(img->data);
 					}
-#else
-					bit = g_new0 (GtkIMHtmlBit, 1);
-						bit->type = TYPE_IMG;
-						bit->img = img;
-						if (url)
-							bit->url = g_strdup (url);
-						if (!fonts || ((clr = ((FontDetail *) fonts->data)->back) == NULL))
-							clr = (bg != NULL) ? bg : imhtml->default_bg_color;
-						
-						bit->pm = gdk_pixmap_create_from_xpm_d (GTK_WIDGET (imhtml)->window,
-											&bit->bm, clr, broken_xpm);
-						NEW_BIT (bit);
-#endif
 					g_free(imagedata);
 					g_free(e);
 					g_free(id);
@@ -3554,7 +3456,6 @@
 
 	gtk_widget_set_usize (GTK_WIDGET (imhtml), -1, imhtml->y);
 
-#if GTK_CHECK_VERSION(1,3,0)
 	if (!(options & GTK_IMHTML_NO_SCROLL) &&
 	    scrolldown &&
 	    (imhtml->y >= MAX (1,
@@ -3564,17 +3465,6 @@
 					  MAX (1, (GTK_WIDGET (imhtml)->allocation.height - 
 						   (GTK_WIDGET (imhtml)->style->ythickness +
 						    BORDER_SIZE) * 2)));
-#else
-	if (!(options & GTK_IMHTML_NO_SCROLL) &&
-	    scrolldown &&
-	    (imhtml->y >= MAX (1,
-			       (GTK_WIDGET (imhtml)->allocation.height -
-				(GTK_WIDGET (imhtml)->style->klass->ythickness + BORDER_SIZE) * 2))))
-		gtk_adjustment_set_value (vadj, imhtml->y -
-					  MAX (1, (GTK_WIDGET (imhtml)->allocation.height - 
-						   (GTK_WIDGET (imhtml)->style->klass->ythickness +
-						    BORDER_SIZE) * 2)));
-#endif
 
 	if (url) {
 		g_free (url);
@@ -3664,14 +3554,12 @@
 			gdk_pixmap_unref (bit->pm);
 		if (bit->bm)
 			gdk_bitmap_unref (bit->bm);
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 		if (bit->img) {
 			g_free(bit->img->filename);
 			g_free(bit->img->data);
 			gdk_pixbuf_unref(bit->img->pb);
 			g_free(bit->img);
 		}
-#endif 
 		
 		while (bit->chunks) {
 			struct line_info *li = bit->chunks->data;
@@ -3688,11 +3576,9 @@
 		imhtml->click = g_list_remove (imhtml->click, imhtml->click->data);
 	}
 	
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 	while (imhtml->im_images) {
 		imhtml->im_images = g_list_remove(imhtml->im_images, imhtml->im_images->data);
 	}
-#endif
 	
 	if (imhtml->selected_text) {
 		g_string_free (imhtml->selected_text, TRUE);
@@ -3720,10 +3606,8 @@
 		imhtml->scroll_timer = 0;
 	}
 
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 	g_list_free(imhtml->im_images);
 	imhtml->im_images = NULL;
-#endif
 
 	imhtml->x = 0;
 	imhtml->y = TOP_BORDER;
--- a/src/multi.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/multi.c	Thu Aug 29 21:40:08 2002 +0000
@@ -25,9 +25,6 @@
 #include "prpl.h"
 #include "multi.h"
 #include "gaim.h"
-#ifdef USE_APPLET
-#include "applet.h"
-#endif
 
 #include "pixmaps/gnome_add.xpm"
 #include "pixmaps/gnome_preferences.xpm"
@@ -129,10 +126,9 @@
 		g = g_slist_remove(g, g->data);
 	}
 	g_free(gc);
-#ifndef USE_APPLET
+/* fixme: docklet */
 	if (!connections && mainwindow)
 		gtk_widget_show(mainwindow);
-#endif
 }
 
 static void delete_acctedit(GtkWidget *w, gpointer d)
@@ -846,9 +842,6 @@
 {
 	const char *txt = gtk_entry_get_text(GTK_ENTRY(p->entry));
 	g_snprintf(p->u->password, sizeof(p->u->password), "%s", txt);
-#ifdef USE_APPLET
-	set_user_state(signing_on);
-#endif
 	serv_login(p->u);
 	gtk_widget_destroy(p->win);
 }
@@ -935,9 +928,6 @@
 				do_pass_dlg(u);
 			} else {
 				serv_login(u);
-#ifdef USE_APPLET
-				set_user_state(signing_on);
-#endif /* USE_APPLET */
 				gtk_clist_set_text(GTK_CLIST(list), row, 1, "Attempting");
 			}
 		} else if (u->gc) {
@@ -1016,7 +1006,7 @@
 	GtkWidget *button;	/* used for many things */
 
 	if (acctedit) {
-		gtk_widget_show(acctedit);
+		gtk_window_present(GTK_WINDOW(acctedit));
 		return;
 	}
 
@@ -1144,7 +1134,7 @@
 	if (mainwindow)
 		gtk_widget_hide(mainwindow);
 
-#ifdef USE_APPLET
+/* fixme: docklet
 	if (blist_options & OPT_BLIST_APP_BUDDY_SHOW) {
 		show_buddy_list();
 		refresh_buddy_window();
@@ -1158,11 +1148,10 @@
 	} else {
 		build_edit_tree();
 	}
-	set_user_state(online);
-#else
+	set_user_state(online); */
+
 	show_buddy_list();
 	refresh_buddy_window();
-#endif
 
 	update_privacy_connections();
 	do_away_menu();
@@ -1220,9 +1209,6 @@
 	while (u) {
 		a = (struct aim_user *)u->data;
 		if ((a->options & OPT_USR_AUTO) && (a->options & OPT_USR_REM_PASS)) {
-#ifdef USE_APPLET
-			set_user_state(signing_on);
-#endif /* USE_APPLET */
 			serv_login(a);
 		}
 		u = u->next;
@@ -1469,10 +1455,6 @@
 	do_away_menu();
 	do_proto_menu();
 	redo_convo_menus();
-#ifdef USE_APPLET
-	if (connections)
-		set_user_state(online);
-#endif
 	update_privacy_connections();
 
 	if (connections)
@@ -1480,20 +1462,19 @@
 
 	destroy_all_dialogs();
 	destroy_buddy();
-#ifdef USE_APPLET
+/* fixme: docklet
 	set_user_state(offline);
 	applet_buddy_show = FALSE;
 
 	if (applet) {
-		/* These don't have any purpose if the applet is gone :-P */
+		/* These don't have any purpose if the applet is gone :-P
 		applet_widget_unregister_callback(APPLET_WIDGET(applet), "signoff");
 		applet_widget_register_callback(APPLET_WIDGET(applet),
 						"autologin", _("Auto-login"), (AppletCallbackFunc)auto_login, NULL);
 		remove_applet_away();
-	}
-#else
+	} */
+
 	show_login();
-#endif /* USE_APPLET */
 }
 
 struct aim_user *new_user(const char *name, int proto, int opts)
--- a/src/plugins.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/plugins.c	Thu Aug 29 21:40:08 2002 +0000
@@ -90,13 +90,9 @@
 void update_show_plugins();
 static void hide_plugins(GtkWidget *, gpointer);
 static void clear_plugin_display();
-#if GTK_CHECK_VERSION(1,3,0)
 static struct gaim_plugin *get_selected_plugin(GtkWidget *);
 static void select_plugin(GtkWidget *w, struct gaim_plugin *p);
 static void list_clicked(GtkWidget *, gpointer);
-#else
-static void list_clicked(GtkWidget *, struct gaim_plugin *);
-#endif
 
 /* ------------------ Code Below ---------------------------- */
 
@@ -165,11 +161,7 @@
 	/* Select newly loaded plugin */
 	if(p == NULL)
 		return;
-#if GTK_CHECK_VERSION(1,3,0)
 	select_plugin(pluglist, p);
-#else
-	gtk_list_select_item(GTK_LIST(pluglist), g_list_index(plugins, p));
-#endif
 }
 
 void show_plugins(GtkWidget *w, gpointer data)
@@ -185,7 +177,6 @@
 	GtkWidget *label;
 	GtkWidget *add;
 	GtkWidget *close;
-#if GTK_CHECK_VERSION(1,3,0)
 	/* stuff needed for GtkTreeView *pluglist */
 	GtkListStore *store;
 	GtkCellRenderer *renderer;
@@ -193,19 +184,17 @@
 	GtkTreeSelection *selection;
 	/* needed for GtkTextView *plugtext */
 	GtkTextBuffer *buffer;
-#endif
 	
-	if (plugwindow)
+	if (plugwindow) {
+		gtk_window_present(GTK_WINDOW(plugwindow));
 		return;
+	}
 
 	GAIM_DIALOG(plugwindow);
 	gtk_window_set_wmclass(GTK_WINDOW(plugwindow), "plugins", "Gaim");
 	gtk_widget_realize(plugwindow);
 	aol_icon(plugwindow->window);
 	gtk_window_set_title(GTK_WINDOW(plugwindow), _("Gaim - Plugins"));
-#if !GTK_CHECK_VERSION(1,3,0)
-	gtk_widget_set_usize(plugwindow, 515, 300);
-#endif
 	gtk_signal_connect(GTK_OBJECT(plugwindow), "destroy", GTK_SIGNAL_FUNC(hide_plugins), NULL);
 
 	mainvbox = gtk_vbox_new(FALSE, 0);
@@ -220,9 +209,6 @@
 	/* Left side: frame with list of plugin file names */
 	frame = gtk_frame_new(_("Loaded Plugins"));
 	gtk_box_pack_start(GTK_BOX(tophbox), frame, FALSE, FALSE, 0);
-#if !GTK_CHECK_VERSION(1,3,0)
-	gtk_widget_set_usize(frame, 140, -1);
-#endif
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
 	gtk_frame_set_label_align(GTK_FRAME(frame), 0.05, 0.5);
 	gtk_widget_show(frame);
@@ -232,7 +218,6 @@
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_widget_show(scrolledwindow);
-#if GTK_CHECK_VERSION(1,3,0)
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow),
 					GTK_SHADOW_IN);
 
@@ -252,12 +237,6 @@
 	g_signal_connect(G_OBJECT(selection), "changed", 
 			G_CALLBACK(list_clicked),
 			NULL);
-#else
-	pluglist = gtk_list_new();
-	gtk_list_set_selection_mode(GTK_LIST(pluglist), GTK_SELECTION_BROWSE);
-	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledwindow), 
-			pluglist);
-#endif /* GTK_CHECK_VERSION */
 
 	gtk_widget_show(pluglist);
 
@@ -277,7 +256,6 @@
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_widget_show(scrolledwindow);
-#if GTK_CHECK_VERSION(1,3,0)
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow),
 					GTK_SHADOW_IN);		
 	
@@ -291,13 +269,6 @@
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(plugtext));
 	gtk_text_buffer_create_tag(buffer, "bold", "weight", 
 			PANGO_WEIGHT_BOLD, NULL);
-#else
-	plugtext = gtk_text_new(NULL, NULL);
-	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledwindow), 
-				plugtext);
-	gtk_text_set_word_wrap(GTK_TEXT(plugtext), TRUE);
-	gtk_text_set_editable(GTK_TEXT(plugtext), FALSE);
-#endif
 	gtk_widget_show(plugtext);
 
 	hbox = gtk_hbox_new(FALSE, 5);
@@ -357,47 +328,20 @@
 {
 	GList *plugs = plugins;
 	struct gaim_plugin *p;
-#if GTK_CHECK_VERSION(1,3,0)
 	int pnum = 0;
 	GtkListStore *store;
 	GtkTreeIter iter;
-#else
-	GtkWidget *label;
-	GtkWidget *list_item;
-	GtkWidget *hbox;
-#endif
 	
 	if (plugwindow == NULL)
 		return;
 
-#if GTK_CHECK_VERSION(1,3,0)
 	store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(pluglist)));
 	gtk_list_store_clear(store);
-#else
-	gtk_list_clear_items(GTK_LIST(pluglist), 0, -1);
-#endif
 	while (plugs) {
 		p = (struct gaim_plugin *)plugs->data;
-#if GTK_CHECK_VERSION(1,3,0)
 		gtk_list_store_append(store, &iter);
 		gtk_list_store_set(store, &iter, 0, plugin_makelistname(p->handle), -1);
 		gtk_list_store_set(store, &iter, 1, pnum++, -1);
-#else
-		label = gtk_label_new(plugin_makelistname(p->handle));
-		hbox = gtk_hbox_new(FALSE, 0);  /* for left justification */
-		gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
-		list_item = gtk_list_item_new();
-		gtk_container_add(GTK_CONTAINER(list_item), hbox);
-		gtk_signal_connect(GTK_OBJECT(list_item), "select", 
-				GTK_SIGNAL_FUNC(list_clicked), p);
-		gtk_object_set_user_data(GTK_OBJECT(list_item), p);
-		
-		gtk_widget_show(hbox);
-		gtk_widget_show(label);
-		gtk_container_add(GTK_CONTAINER(pluglist), list_item);
-		gtk_widget_show(list_item);
-#endif
 		plugs = g_list_next(plugs);
 	}
 
@@ -407,20 +351,9 @@
 static void unload_plugin_cb(GtkWidget *w, gpointer data)
 {
 	struct gaim_plugin *p;
-#if GTK_CHECK_VERSION(1,3,0)
 	p = get_selected_plugin(pluglist);
 	if(p == NULL)
 		return;
-#else
-	GList *i;
-	
-	i = GTK_LIST(pluglist)->selection;
-
-	if (i == NULL)
-		return;
-
-	p = gtk_object_get_user_data(GTK_OBJECT(i->data));
-#endif
 	unload_plugin(p);
 	update_show_plugins();
 }
@@ -428,56 +361,31 @@
 static void plugin_reload_cb(GtkWidget *w, gpointer data)
 {
 	struct gaim_plugin *p;
-#if GTK_CHECK_VERSION(1,3,0)
 	p = get_selected_plugin(pluglist);
 	if(p == NULL)
 		return;
 	p = reload_plugin(p);
-#else
-	GList *i;
-
-	i = GTK_LIST(pluglist)->selection;
-	if (i == NULL)
-		return;
-
-	/* Just pass off plugin to the actual function */
-	p = reload_plugin(gtk_object_get_user_data(GTK_OBJECT(i->data)));
-#endif
 	update_show_plugins();
 
 	/* Try and reselect the plugin in list */
 	if (!pluglist)
 		return;
-#if GTK_CHECK_VERSION(1,3,0)
 	select_plugin(pluglist, p);
-#else
-	gtk_list_select_item(GTK_LIST(pluglist), g_list_index(plugins, p));
-#endif
 }
 
 
-#if GTK_CHECK_VERSION(1,3,0)
 static void list_clicked(GtkWidget *w, gpointer data)
-#else
-static void list_clicked(GtkWidget *w, struct gaim_plugin *p)
-#endif
 {
 	void (*gaim_plugin_config)();
-#if GTK_CHECK_VERSION(1,3,0)
 	struct gaim_plugin *p;
 	GtkTextBuffer *buffer;
 	GtkTextIter iter;
-#else
-	gchar *temp;
-	guint text_len;
-#endif
 
 	if (confighandle != 0) {
 		gtk_signal_disconnect(GTK_OBJECT(config), confighandle);
 		confighandle = 0;
 	}
 
-#if GTK_CHECK_VERSION(1,3,0)
 	p = get_selected_plugin(pluglist);
 	if(p == NULL) { /* No selected plugin */
 		clear_plugin_display();
@@ -501,18 +409,6 @@
 					(p->description != NULL) ? p->description : "", -1);
 
 	gtk_entry_set_text(GTK_ENTRY(plugentry), g_module_name(p->handle));
-#else
-	text_len = gtk_text_get_length(GTK_TEXT(plugtext));
-	gtk_text_set_point(GTK_TEXT(plugtext), 0);
-	gtk_text_forward_delete(GTK_TEXT(plugtext), text_len);
-
-	temp = g_strdup_printf("Name:   %s\n\nDescription:\n%s",
-				(p->name != NULL) ? p->name : "",
-				(p->description != NULL) ? p->description : "");
-	gtk_text_insert(GTK_TEXT(plugtext), NULL, NULL, NULL, temp, -1);
-	g_free(temp);
-	gtk_entry_set_text(GTK_ENTRY(plugentry), g_module_name(p->handle));
-#endif
 	/* Find out if this plug-in has a configuration function */
 	if (g_module_symbol(p->handle, "gaim_plugin_config", (gpointer *)&gaim_plugin_config)) {
 		confighandle = gtk_signal_connect(GTK_OBJECT(config), "clicked",
@@ -559,7 +455,6 @@
 	return filename;
 }		
 
-#if GTK_CHECK_VERSION(1,3,0)
 static struct gaim_plugin *get_selected_plugin(GtkWidget *w) {
 	/* Given the pluglist widget, this will return a pointer to the plugin
 	 * currently selected in the list, and NULL if none is selected. */
@@ -600,10 +495,8 @@
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(w));
 	gtk_tree_selection_select_iter(sel, &iter);
 }
-#endif /* GTK_CHECK_VERSION */
 
 static void clear_plugin_display() {
-#if GTK_CHECK_VERSION(1,3,0)
 	GtkTreeSelection *selection;
 	GtkTextBuffer *buffer;
 	
@@ -618,19 +511,6 @@
 		gtk_widget_set_sensitive(reload, FALSE);
 		gtk_widget_set_sensitive(unload, FALSE);
 	}
-#else
-	/* Clear the display if nothing's selected */
-	if (GTK_LIST(pluglist)->selection == NULL) {
-		guint text_len = gtk_text_get_length(GTK_TEXT(plugtext));
-		gtk_text_set_point(GTK_TEXT(plugtext), 0);
-		gtk_text_forward_delete(GTK_TEXT(plugtext), text_len);
-		gtk_entry_set_text(GTK_ENTRY(plugentry), "");
-
-		gtk_widget_set_sensitive(config, FALSE);
-		gtk_widget_set_sensitive(reload, FALSE);
-		gtk_widget_set_sensitive(unload, FALSE);
-	}
-#endif
 }
 
 #endif
--- a/src/prefs.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/prefs.c	Thu Aug 29 21:40:08 2002 +0000
@@ -39,21 +39,6 @@
 #include "prpl.h"
 #include "proxy.h"
 
-/* xpms for gtk1.2 */
-#if !GTK_CHECK_VERSION (1,3,0)
-#include "pixmaps/cancel.xpm"
-#include "pixmaps/fontface2.xpm"
-#include "pixmaps/gnome_add.xpm"
-#include "pixmaps/gnome_remove.xpm"
-#include "pixmaps/gnome_preferences.xpm"
-#include "pixmaps/bgcolor.xpm"
-#include "pixmaps/fgcolor.xpm"
-#include "pixmaps/save.xpm"
-#include "pixmaps/ok.xpm"
-#include "pixmaps/join.xpm"
-#endif
-
-
 /* temporary preferences */
 static guint misc_options_new;
 static guint logging_options_new;
@@ -77,10 +62,6 @@
 GdkColor fgcolor_new, bgcolor_new;
 static struct window_size conv_size_new, buddy_chat_size_new;
 char fontface_new[128];
-#if !GTK_CHECK_VERSION(1,3,0)
-char fontxfld_new[256];
-char fontfacexfld[256];
-#endif
 char fontface[128];
 
 GtkWidget *prefs_away_list = NULL;
@@ -88,9 +69,7 @@
 GtkWidget *preftree = NULL;
 GtkWidget *fontseld = NULL;
 
-#if GTK_CHECK_VERSION(1,3,0)
 GtkListStore *prefs_away_store = NULL;
-#endif
 
 static int sound_row_sel = 0;
 static char *last_sound_dir = NULL;
@@ -127,18 +106,12 @@
 	 debugbutton=NULL;
 	 if(sounddialog)
 		gtk_widget_destroy(sounddialog);
-#if GTK_CHECK_VERSION(1,3,0)
 	 g_object_unref(G_OBJECT(prefs_away_store)); 	
-#endif
 }
 
 GtkWidget *preflabel;
 GtkWidget *prefsnotebook;
-#if GTK_CHECK_VERSION(1,3,0)
 GtkTreeStore *prefstree;
-#else
-GtkWidget *prefstree;
-#endif
 
 static void set_misc_options();	
 static void set_logging_options();
@@ -234,9 +207,6 @@
 
 
 	g_snprintf(fontface, sizeof(fontface), fontface_new);
-#if !GTK_CHECK_VERSION(1,3,0)
-	g_snprintf(fontxfld, sizeof(fontxfld), fontxfld_new);
-#endif	
 	update_convo_font();
 	update_convo_color();
 	save_prefs();
@@ -267,7 +237,6 @@
 
 }
 
-
 /* These are the pages in the preferences notebook */
 GtkWidget *interface_page() {
 	GtkWidget *ret;
@@ -353,6 +322,7 @@
 	pref_bg_picture = show_color_pref(hbox, FALSE);
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(update_color),
 			   pref_bg_picture);
+
 	if (!(font_options_new & OPT_FONT_BGCOL))
 		gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
 	gtk_signal_connect(GTK_OBJECT(select), "clicked", GTK_SIGNAL_FUNC(show_bgcolor_dialog), NULL);
@@ -413,6 +383,11 @@
 	ret = gtk_vbox_new(FALSE, 18);
 	gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
 
+/* fixme: docklet
+	gaim_button(_("Automatically show buddy list on sign on"), &blist_options_new,
+		    OPT_BLIST_APP_BUDDY_SHOW, vbox);
+	gaim_button(_("Display Buddy List near applet"), &blist_options_new, OPT_BLIST_NEAR_APPLET, vbox); */
+
 	vbox = make_frame (ret, _("Buttons"));
 	gaim_button(_("_Hide IM/Info/Chat buttons"), &blist_options_new, OPT_BLIST_NO_BUTTONS, vbox);
 	gaim_button(_("Show _pictures on buttons"), &blist_options_new, OPT_BLIST_SHOW_BUTTON_XPM, vbox);
@@ -672,6 +647,8 @@
 			      "Konqueror", BROWSER_KONQ,
 			      "Mozilla", BROWSER_MOZILLA,
 			      "Manual", BROWSER_MANUAL,
+/* fixme: GNOME binary helper
+			      "GNOME URL Handler", BROWSER_GNOME, */
 			      "Galeon", BROWSER_GALEON,
 			      "Opera", BROWSER_OPERA, NULL);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
@@ -862,7 +839,6 @@
 	return ret;
 }
 
-#if GTK_CHECK_VERSION (1,3,0)
 static void event_toggled (GtkCellRendererToggle *cell, gchar *pth, gpointer data)
 {
 	GtkTreeModel *model = (GtkTreeModel *)data;
@@ -876,7 +852,6 @@
 	sound_options_new ^= sounds[soundnum].opt;	
 	gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, sound_options_new & sounds[soundnum].opt, -1);
 }
-#endif
 
 static void test_sound(GtkWidget *button, gpointer i_am_NULL)
 {
@@ -975,7 +950,6 @@
 }
 
 
-#if GTK_CHECK_VERSION (1,3,0)
 static void prefs_sound_sel (GtkTreeSelection *sel, GtkTreeModel *model) {
 	GtkTreeIter  iter;
 	GValue val = { 0, };
@@ -990,7 +964,6 @@
 	if (sounddialog)
 		gtk_widget_destroy(sounddialog);
 }
-#endif
 
 GtkWidget *sound_events_page() {
 
@@ -1076,7 +1049,6 @@
 	return ret;
 }
 
-#if GTK_CHECK_VERSION (1,3,0)
 void away_message_sel(GtkTreeSelection *sel, GtkTreeModel *model)
 {
 	GtkTreeIter  iter;
@@ -1121,44 +1093,6 @@
 	gtk_tree_selection_select_path(sel, path);
 }
 
-#else
-static struct away_message *cur_message;
-void away_message_sel(GtkWidget *w, struct away_message *a) {
-	gchar buffer[BUF_LONG];
-	char *tmp;
-
-	cur_message = a;
-
-	/* Clear the Box */
-	gtk_imhtml_clear(GTK_IMHTML(away_text));
-
-	/* Fill the text box with new message */
-	strncpy(buffer, a->message, BUF_LONG);
-	tmp = stylize(buffer, BUF_LONG);
-
-	debug_printf("FSD: %s\n", tmp);
-	gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, -1, GTK_IMHTML_NO_TITLE |
-			       GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
-	gtk_imhtml_append_text(GTK_IMHTML(away_text), "<BR>", -1, GTK_IMHTML_NO_TITLE |
-			       GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
-	g_free(tmp);
-}
-void remove_away_message(GtkWidget *widget, GtkWidget *list) {
-	GList *i;
-	struct away_message *a;
-
-	i = GTK_LIST(prefs_away_list)->selection;
-
-	if (!i)
-		return;
-	if (!i->next) {
-		gtk_imhtml_clear(GTK_IMHTML(away_text));
-	}
-	a = gtk_object_get_user_data(GTK_OBJECT(i->data));
-	rem_away_mess(NULL, a);
-}
-#endif
-
 GtkWidget *away_message_page() {
 	GtkWidget *ret;
 	GtkWidget *hbox;
@@ -1230,12 +1164,13 @@
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_size_group_add_widget(sg, button);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_away_mess), NULL);
-       
+
 	button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
 	gtk_size_group_add_widget(sg, button);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(remove_away_message), event_view);
-	
+
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+
 	button = pixbuf_button(_("_Edit"), "edit.png");
 	gtk_size_group_add_widget(sg, button);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_away_mess), event_view);
@@ -1244,7 +1179,7 @@
 	gtk_widget_show_all(ret);
 	return ret;
 }
-#if GTK_CHECK_VERSION (1,3,0)
+
 GtkTreeIter *prefs_notebook_add_page(char *text, 
 				     GdkPixbuf *pixbuf, 
 				     GtkWidget *page, 
@@ -1266,40 +1201,10 @@
 	gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
 	return iter;
 }
-#else
-GtkCTreeNode *prefs_notebook_add_page(char *text, 
-				     GdkPixmap *pixmap, 
-				     GtkWidget *page, 
-				     GtkCTreeNode **iter,
-				     GtkCTreeNode **parent, 
-				     int ind) {
-
-	GtkCTreeNode *itern;
-	char *texts[1];
-
-	texts[0] = text;
-
-	*iter = gtk_ctree_insert_node (GTK_CTREE(prefstree), parent ? *parent : NULL, NULL, &text,
-			       0, NULL, NULL, NULL, NULL, 0, 1);
-	gtk_ctree_node_set_row_data(GTK_CTREE(prefstree), GTK_CTREE_NODE(*iter), (void *)ind);
-	if (pixmap)
-		gdk_pixmap_unref(pixmap);
-	
-	debug_printf("%s\n", texts[0]);
-
-	gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
-	return iter;
-}
-#endif
 
 void prefs_notebook_init() {
 	int a = 0;
-#if GTK_CHECK_VERSION(1,3,0)	
 	GtkTreeIter p, c;
-#else
-	GtkCTreeNode *p = NULL;
-	GtkCTreeNode *c = NULL;
-#endif	
 	prefs_notebook_add_page(_("Interface"), NULL, interface_page(), &p, NULL, a++);
 	prefs_notebook_add_page(_("Fonts"), NULL, font_page(), &c, &p, a++);
 	prefs_notebook_add_page(_("Message Text"), NULL, messages_page(), &c, &p, a++);
@@ -1323,12 +1228,10 @@
 	GtkWidget *vbox, *vbox2;
 	GtkWidget *hbox;
 	GtkWidget *frame;
-#if GTK_CHECK_VERSION (1,3,0)
 	GtkWidget *tree_v;
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *cell;
 	GtkTreeSelection *sel;
-#endif	
 	GtkWidget *notebook;
 	GtkWidget *sep;
 	GtkWidget *button;
@@ -1336,7 +1239,7 @@
 	int r;
 
 	if (prefs) {
-		gtk_widget_show(prefs);
+		gtk_window_present(GTK_WINDOW(prefs));
 		return;
 	}
 
@@ -1364,9 +1267,6 @@
 	g_snprintf(web_command_new, sizeof(web_command_new), "%s", 
 		   web_command ? web_command : "xterm -e lynx %%s");
 	g_snprintf(fontface_new, sizeof(fontface_new), fontface);
-#if !GTK_CHECK_VERSION(1,3,0)
-	g_snprintf(fontxfld_new, sizeof(fontxfld_new), fontxfld);
-#endif
 	memcpy(&conv_size_new, &conv_size, sizeof(struct window_size));
 	memcpy(&buddy_chat_size_new, &buddy_chat_size, sizeof(struct window_size));	
 	memcpy(&fgcolor_new, &fgcolor, sizeof(GdkColor));
@@ -1397,7 +1297,6 @@
 	gtk_widget_show (frame);
 	
 	/* The tree -- much inspired by the Gimp */
-#if GTK_CHECK_VERSION(1,3,0)
 	prefstree = gtk_tree_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
 	tree_v = gtk_tree_view_new_with_model (GTK_TREE_MODEL (prefstree));
 	gtk_container_add (GTK_CONTAINER (frame), tree_v);
@@ -1414,84 +1313,70 @@
 	 
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_v), column);
 
-#else
-	 prefstree = gtk_ctree_new(1,0);
-	 gtk_ctree_set_line_style(prefstree, GTK_CTREE_LINES_NONE);
-	 gtk_ctree_set_expander_style(GTK_CTREE(prefstree), GTK_CTREE_EXPANDER_TRIANGLE);
-	 gtk_container_add(GTK_CONTAINER (frame), prefstree);
-	 gtk_widget_set_usize(prefstree, 150, -1);
-	 gtk_widget_show(prefstree);
-#endif /* GTK_CHECK_VERSION */
-
-	 /* The right side */
-	 frame = gtk_frame_new (NULL);
-	 gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-	 gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
-	 gtk_widget_show (frame);
-	 
-	 vbox2 = gtk_vbox_new (FALSE, 4);
-	 gtk_container_add (GTK_CONTAINER (frame), vbox2);
-	 gtk_widget_show (vbox2);
-	 
-	 frame = gtk_frame_new (NULL);
-	 gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	 gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, TRUE, 0);
-	 gtk_widget_show (frame);
-	 
-	 hbox = gtk_hbox_new (FALSE, 4);
-	 gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
-	 gtk_container_add (GTK_CONTAINER (frame), hbox);
-	 gtk_widget_show (hbox);
-	 
-	 preflabel = gtk_label_new(NULL);
-	 gtk_box_pack_end (GTK_BOX (hbox), preflabel, FALSE, FALSE, 0);
-	 gtk_widget_show (preflabel);
-
+	/* The right side */
+	frame = gtk_frame_new (NULL);
+	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+	gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+	gtk_widget_show (frame);
+	
+	vbox2 = gtk_vbox_new (FALSE, 4);
+	gtk_container_add (GTK_CONTAINER (frame), vbox2);
+	gtk_widget_show (vbox2);
+	
+	frame = gtk_frame_new (NULL);
+	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+	gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, TRUE, 0);
+	gtk_widget_show (frame);
+	
+	hbox = gtk_hbox_new (FALSE, 4);
+	gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
+	gtk_container_add (GTK_CONTAINER (frame), hbox);
+	gtk_widget_show (hbox);
+	
+	preflabel = gtk_label_new(NULL);
+	gtk_box_pack_end (GTK_BOX (hbox), preflabel, FALSE, FALSE, 0);
+	gtk_widget_show (preflabel);
 	 
-	 /* The notebook */
-	 prefsnotebook = notebook = gtk_notebook_new ();
-	 gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
-	 gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-	 gtk_box_pack_start (GTK_BOX (vbox2), notebook, FALSE, FALSE, 0);
+	/* The notebook */
+	prefsnotebook = notebook = gtk_notebook_new ();
+	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
+	gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
+	gtk_box_pack_start (GTK_BOX (vbox2), notebook, FALSE, FALSE, 0);
 
-#if GTK_CHECK_VERSION(1,3,0)
-	 sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_v));
-	 g_signal_connect (G_OBJECT (sel), "changed",
-	 		   G_CALLBACK (pref_nb_select),
-	 		   notebook);
-#else
-	 gtk_signal_connect(GTK_OBJECT(prefstree), "tree-select-row", GTK_SIGNAL_FUNC(pref_nb_select), notebook);
-#endif
-	 gtk_widget_show(notebook);	 
-	 sep = gtk_hseparator_new();
-	 gtk_widget_show(sep);
-	 gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, FALSE, 0);
-	 
-	 /* The buttons to press! */
-	 hbox = gtk_hbox_new (FALSE, 6);
-	 gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
-	 gtk_container_add (GTK_CONTAINER(vbox), hbox);
-	 gtk_widget_show (hbox); 
+	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_v));
+	g_signal_connect (G_OBJECT (sel), "changed",
+			   G_CALLBACK (pref_nb_select),
+			   notebook);
+	gtk_widget_show(notebook);	 
+	sep = gtk_hseparator_new();
+	gtk_widget_show(sep);
+	gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, FALSE, 0);
+	
+	/* The buttons to press! */
+	hbox = gtk_hbox_new (FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
+	gtk_container_add (GTK_CONTAINER(vbox), hbox);
+	gtk_widget_show (hbox); 
 
-	 button = gtk_button_new_from_stock (GTK_STOCK_OK);
-	 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs); 
-	 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-	 gtk_widget_show(button);
+	button = gtk_button_new_from_stock (GTK_STOCK_OK);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs); 
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
 
-	 button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
-	 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(apply_cb), prefs); 
-	 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-	 gtk_widget_show(button);
-	 
-	 button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-	 gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
-	 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-	 gtk_widget_show(button);
+	button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(apply_cb), prefs); 
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
+	
+	button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+	gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
 
-	 prefs_notebook_init(); 
+	prefs_notebook_init(); 
 
-	 gtk_tree_view_expand_all (GTK_TREE_VIEW(tree_v));
-	 gtk_widget_show(prefs);
+	gtk_tree_view_expand_all (GTK_TREE_VIEW(tree_v));
+	gtk_widget_show(prefs);
 }
 
 static gint debug_delete(GtkWidget *w, GdkEvent *event, void *dummy)
@@ -1803,36 +1688,16 @@
 
 void apply_color_dlg(GtkWidget *w, gpointer d)
 {
-#if GTK_CHECK_VERSION(1,3,0)
 	if ((int)d == 1) {
 		gtk_color_selection_get_current_color(GTK_COLOR_SELECTION
 						      (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), 
 						      &fgcolor_new);
-#else
-	gdouble color[3];
-	if ((int)d == 1) {
-		gtk_color_selection_get_color(GTK_COLOR_SELECTION
-					      (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), color);
-
-		fgcolor_new.red = ((guint16)(color[0] * 65535)) >> 8;
-		fgcolor_new.green = ((guint16)(color[1] * 65535)) >> 8;
-		fgcolor_new.blue = ((guint16)(color[2] * 65535)) >> 8;
-#endif
 		destroy_colorsel(NULL, (void *)1);
 		update_color(NULL, pref_fg_picture);
 	} else {
-#if GTK_CHECK_VERSION(1,3,0)
 		gtk_color_selection_get_current_color(GTK_COLOR_SELECTION
 						      (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), 
 						      &bgcolor_new);
-#else
-		gtk_color_selection_get_color(GTK_COLOR_SELECTION
-					      (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), color);
-		
-		bgcolor_new.red = ((guint16)(color[0] * 65535)) >> 8;
-		bgcolor_new.green = ((guint16)(color[1] * 65535)) >> 8;
-		bgcolor_new.blue = ((guint16)(color[2] * 65535)) >> 8;
-#endif
 		destroy_colorsel(NULL, (void *)0);
 		update_color(NULL, pref_bg_picture);
 	}
@@ -2052,30 +1917,15 @@
 void apply_font_dlg(GtkWidget *w, GtkWidget *f)
 {
 	int i = 0;
-#if !GTK_CHECK_VERSION(1,3,0)
-	int j = 0, k = 0;
-#endif
 	char *fontname;
 
 	fontname = g_strdup(gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(fontseld)));
 	destroy_fontsel(0, 0);
 
-#if !GTK_CHECK_VERSION(1,3,0)
-	for (i = 0; i < strlen(fontname); i++) {
-		if (fontname[i] == '-') {
-			if (++j > 2)
-				break;
-		} else if (j == 2)
-			fontface_new[k++] = fontname[i];
-	}
-	fontface_new[k] = '\0';
-	g_snprintf(fontxfld_new, sizeof(fontxfld_new), "%s", fontname);
-#else
 	while(fontname[i] && !isdigit(fontname[i]) && i < sizeof(fontface_new)) { 
 		fontface_new[i] = fontname[i];
 		i++;
 	}
 	
-#endif	
 	g_free(fontname);
 }
--- a/src/server.c	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/server.c	Thu Aug 29 21:40:08 2002 +0000
@@ -35,9 +35,6 @@
 #include "prpl.h"
 #include "multi.h"
 #include "gaim.h"
-#ifdef USE_APPLET
-#include "applet.h"
-#endif
 
 #include "pixmaps/ok.xpm"
 #include "pixmaps/cancel.xpm"
@@ -597,10 +594,6 @@
 			qm->len = len;
 			message_queue = g_slist_append(message_queue, qm);
 
-#ifdef USE_APPLET
-			set_user_state(away);
-#endif
-
 			row = find_queue_row_by_name(qm->name);
 
 			if (row >= 0) {
--- a/src/ui.h	Thu Aug 29 21:12:00 2002 +0000
+++ b/src/ui.h	Thu Aug 29 21:40:08 2002 +0000
@@ -27,29 +27,14 @@
 #endif
 
 #include <gtk/gtk.h>
-#ifdef USE_APPLET
-#include <applet-widget.h>
-#endif /* USE_APPLET */
-#ifdef USE_GNOME
-#include <gnome.h>
-#endif
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#endif
 
-#if GTK_CHECK_VERSION(1,3,0)
 #define GAIM_DIALOG(x)	x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \
 			gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
 #define GdkWindowPrivate GdkWindowObject
 #define gtk_toolbar_new(x,y) gtk_toolbar_new()
 #define gtk_accel_group_attach(x, y) _gtk_accel_group_attach(x, y)
 #define gtk_widget_lock_accelerators(x)
-#else
-#define GAIM_DIALOG(x)	x = gtk_window_new(GTK_WINDOW_DIALOG)
-#define GTK_OLD_EDITABLE(x) GTK_EDITABLE(x)
-#define gtk_style_get_font(style) (style)->font
-#define gtk_style_set_font(s, f) (s)->font = f
-#endif
 
 #define DEFAULT_FONT_XFLD "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
 #define DEFAULT_FONT_FACE "helvetica"
@@ -185,18 +170,12 @@
 	/* something to distinguish */
 	gboolean is_chat;
 
-#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0)
 	/* buddy icon stuff. sigh. */
 	GtkWidget *icon;
 	GdkPixbufAnimation *anim;
 	guint32 icon_timer;
-	#if GTK_CHECK_VERSION(1,3,0)
 	GdkPixbufAnimationIter *iter;
-	#else
-	int frame;
-	#endif
 	GtkWidget *save_icon;
-#endif
 };
 
 struct log_conversation {
@@ -369,6 +348,10 @@
 extern void redo_buddy_list(); /* you really shouldn't call this function */
 extern void set_blist_tab();
 extern void hide_buddy_list();
+extern void unhide_buddy_list();
+extern void toggle_buddy_list();
+extern void docklet_add();
+extern void docklet_remove();
 
 /* Functions in buddy_chat.c */
 extern void join_chat();
@@ -469,9 +452,7 @@
 extern void aol_icon(GdkWindow *);
 extern GtkWidget *picture_button(GtkWidget *, char *, char **);
 extern GtkWidget *picture_button2(GtkWidget *, char *, char **, short);
-#if GTK_CHECK_VERSION(1,3,0) || GTK_CHECK_VERSION(1,3,0)
 extern GtkWidget *pixbuf_button(char *, char *);
-#endif
 extern int file_is_dir(const char *, GtkWidget *);
 extern void update_privacy_connections();
 extern void show_privacy_options();