[Gaim-commits] CVS: gaim/src about.c,1.55,1.56 away.c,1.66,1.67 buddy.c,1.270,1.271 buddy_chat.c,1.131,1.132 conversation.c,1.293,1.294 dialogs.c,1.282,1.283 gaim.h,1.291,1.292 gtkspell.c,1.13,1.14 gtkticker.c,1.2,1.3 multi.c,1.105,1.106 plugins.c,1.85,1.86 prefs.c,1.196,1.197 prpl.c,1.47,1.48 ui.h,1.17,1.18

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv28517/src

Modified Files:
	about.c away.c buddy.c buddy_chat.c conversation.c dialogs.c 
	gaim.h gtkspell.c gtkticker.c multi.c plugins.c prefs.c prpl.c 
	ui.h 
Log Message:
this actually doesn't change anything, unless you want to use gtk2.


Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- about.c	2001/10/20 18:41:47	1.55
+++ about.c	2001/11/15 22:47:03	1.56
@@ -89,7 +89,7 @@
 
 	if (!about) {
 
-		about = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(about);
 		gtk_widget_set_usize(GTK_WIDGET(about), 450, -1);
 		g_snprintf(abouttitle, sizeof(abouttitle), _("About Gaim v%s"), VERSION);
 		gtk_window_set_title(GTK_WINDOW(about), abouttitle);

Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- away.c	2001/11/02 01:41:36	1.66
+++ away.c	2001/11/15 22:47:03	1.67
@@ -195,7 +195,7 @@
 		return;
 
 	if (!imaway) {
-		imaway = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(imaway);
 		gtk_window_set_wmclass(GTK_WINDOW(imaway), "imaway", "Gaim");
 		if (strlen(a->name))
 			 gtk_window_set_title(GTK_WINDOW(imaway), a->name);

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- buddy.c	2001/11/06 23:58:21	1.270
+++ buddy.c	2001/11/15 22:47:03	1.271
@@ -500,15 +500,17 @@
 
 #endif
 
-void handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g)
+static int handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g)
 {
 	if (event->type == GDK_2BUTTON_PRESS) {
 		if (GTK_TREE_ITEM(widget)->expanded)
 			gtk_tree_item_collapse(GTK_TREE_ITEM(widget));
 		else
 			gtk_tree_item_expand(GTK_TREE_ITEM(widget));
-	} else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 3)) {
+		return TRUE;
 	}
+
+	return FALSE;
 }
 
 void pressed_im_bud(GtkWidget *widget, struct buddy *b)
@@ -585,10 +587,10 @@
 	g_list_free(first);
 }
 
-void handle_click_buddy(GtkWidget *widget, GdkEventButton *event, struct buddy_show *b)
+static int handle_click_buddy(GtkWidget *widget, GdkEventButton *event, struct buddy_show *b)
 {
 	if (!b->connlist)
-		return;
+		return FALSE;
 	if (event->type == GDK_2BUTTON_PRESS && event->button == 1) {
 		struct conversation *c;
 
@@ -708,6 +710,8 @@
 
 		/* Anything for other buttons? :) */
 	}
+
+	return FALSE;
 }
 
 static void un_alias(GtkWidget *a, struct buddy *b)
@@ -734,10 +738,10 @@
 	GtkWidget *button;
 
 	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
-		return TRUE;
+		return FALSE;
 
 	if (!gtk_clist_get_selection_info(GTK_CLIST(edittree), event->x, event->y, &row, &column))
-		return TRUE;
+		return FALSE;
 
 	node = gtk_ctree_node_nth(GTK_CTREE(edittree), row);
 	type = gtk_ctree_node_get_row_data(GTK_CTREE(edittree), node);
@@ -752,6 +756,8 @@
 		gtk_widget_show(button);
 
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
+
+		return TRUE;
 	} else if (*type == EDIT_BUDDY) {
 		struct buddy *b = (struct buddy *)type;
 		menu = gtk_menu_new();
@@ -793,9 +799,11 @@
 		gtk_widget_show(button);
 
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
+
+		return TRUE;
 	}
 
-	return TRUE;
+	return FALSE;
 }
 
 
@@ -2357,7 +2365,7 @@
 	}
 
 #ifdef USE_APPLET
-	blist = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(blist);
 #else
 	blist = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 #endif

Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- buddy_chat.c	2001/11/09 03:11:56	1.131
+++ buddy_chat.c	2001/11/15 22:47:03	1.132
@@ -256,7 +256,7 @@
 	}
 
 	if (!joinchat) {
-		joinchat = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(joinchat);
 		gtk_window_set_wmclass(GTK_WINDOW(joinchat), "joinchat", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE);
 		gtk_widget_realize(joinchat);
@@ -386,7 +386,7 @@
 	GtkWidget *frame;
 
 	if (!invite) {
-		invite = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(invite);
 		gtk_widget_realize(invite);
 
 		cancel = picture_button(invite, _("Cancel"), cancel_xpm);
@@ -463,7 +463,7 @@
 
 void tab_complete(struct conversation *c)
 {
-	int pos = GTK_EDITABLE(c->entry)->current_pos;
+	int pos = GTK_OLD_EDITABLE(c->entry)->current_pos;
 	int start = pos;
 	int most_matched = -1;
 	char *entered, *partial = NULL;
@@ -1093,8 +1093,8 @@
 	if (!GTK_WIDGET_REALIZED(label))
 		return;
 	style = gtk_style_new();
-	gdk_font_unref(style->font);
-	style->font = gdk_font_ref(label->style->font);
+	gdk_font_unref(gtk_style_get_font(style));
+	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 	gtk_widget_set_style(label, style);
 	gtk_style_unref(style);
 	b->unseen = 0;

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- conversation.c	2001/11/15 20:18:07	1.293
+++ conversation.c	2001/11/15 22:47:03	1.294
@@ -711,12 +711,12 @@
 				break;
 			}
 			if (buf[0]) {
-				if (GTK_EDITABLE(c->entry)->has_selection) {
-					int finish = GTK_EDITABLE(c->entry)->selection_end_pos;
+				if (GTK_OLD_EDITABLE(c->entry)->has_selection) {
+					int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos;
 					gtk_editable_insert_text(GTK_EDITABLE(c->entry),
 								 buf, strlen(buf), &finish);
 				} else {
-					pos = GTK_EDITABLE(c->entry)->current_pos;
+					pos = GTK_OLD_EDITABLE(c->entry)->current_pos;
 					gtk_editable_insert_text(GTK_EDITABLE(c->entry),
 								 buf, strlen(buf), &pos);
 				}
@@ -779,6 +779,7 @@
 	} else if ((event->keyval == GDK_Tab) && c->is_chat && (chat_options & OPT_CHAT_TAB_COMPLETE)) {
 	        tab_complete(c);
 		gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+		return TRUE;
 	} else if (((!c->is_chat && (im_options & OPT_IM_ONE_WINDOW)) ||
 		    (c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW))) &&
 		   (event->state & GDK_MOD1_MASK) && (event->keyval > '0') && (event->keyval <= '9')) {
@@ -787,7 +788,7 @@
 		gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 	}
 
-	return TRUE;
+	return FALSE;
 }
 
 
@@ -941,7 +942,7 @@
 int entry_key_pressed(GtkWidget *w, GtkWidget *entry)
 {
 	check_everything(w);
-	return TRUE;
+	return FALSE;
 }
 
 /*------------------------------------------------------------------------*/
@@ -954,8 +955,8 @@
 	int res = 0;
 	char *tmp, *tmpo, h;
 	tmpo = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-	h = tmpo[GTK_EDITABLE(entry)->current_pos];
-	tmpo[GTK_EDITABLE(entry)->current_pos] = '\0';
+	h = tmpo[GTK_OLD_EDITABLE(entry)->current_pos];
+	tmpo[GTK_OLD_EDITABLE(entry)->current_pos] = '\0';
 	tmp = tmpo;
 	do {
 		p1 = strstr(tmp, s1);
@@ -978,7 +979,7 @@
 			}
 		}
 	} while (p1 || p2);
-	tmpo[GTK_EDITABLE(entry)->current_pos] = h;
+	tmpo[GTK_OLD_EDITABLE(entry)->current_pos] = h;
 	g_free(tmpo);
 	return res;
 }
@@ -986,8 +987,8 @@
 
 int invert_tags(GtkWidget *entry, char *s1, char *s2, int really)
 {
-	int start = GTK_EDITABLE(entry)->selection_start_pos;
-	int finish = GTK_EDITABLE(entry)->selection_end_pos;
+	int start = GTK_OLD_EDITABLE(entry)->selection_start_pos;
+	int finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;
 	char *s;
 
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
@@ -1009,8 +1010,8 @@
 void remove_tags(GtkWidget *entry, char *tag)
 {
 	char *s, *t;
-	int start = GTK_EDITABLE(entry)->selection_start_pos;
-	int finish = GTK_EDITABLE(entry)->selection_end_pos;
+	int start = GTK_OLD_EDITABLE(entry)->selection_start_pos;
+	int finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;
 	int temp;
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 	t = s;
@@ -1090,7 +1091,7 @@
 
 void surround(GtkWidget *entry, char *pre, char *post)
 {
-	int temp, pos = GTK_EDITABLE(entry)->current_pos;
+	int temp, pos = GTK_OLD_EDITABLE(entry)->current_pos;
 	int dummy;
 	int start, finish;
 
@@ -1098,11 +1099,11 @@
 		gtkspell_detach(GTK_TEXT(entry));
 	}
 
-	if (GTK_EDITABLE(entry)->has_selection) {
+	if (GTK_OLD_EDITABLE(entry)->has_selection) {
 		remove_tags(entry, pre);
 		remove_tags(entry, post);
-		start = GTK_EDITABLE(entry)->selection_start_pos;
-		finish = GTK_EDITABLE(entry)->selection_end_pos;
+		start = GTK_OLD_EDITABLE(entry)->selection_start_pos;
+		finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;
 		if (start > finish) {
 			dummy = finish;
 			finish = start;
@@ -1142,7 +1143,7 @@
 	if (invert_tags(entry, pre, post, 1))
 		return;
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-	pos = GTK_EDITABLE(entry)->current_pos;
+	pos = GTK_OLD_EDITABLE(entry)->current_pos;
 	debug_printf(_("Currently at %d, "), pos);
 	s2 = strstr(&s[pos], post);
 	if (s2) {
@@ -1606,8 +1607,8 @@
 		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
 			gtk_widget_realize(label);
-		gdk_font_unref(style->font);
-		style->font = gdk_font_ref(label->style->font);
+		gdk_font_unref(gtk_style_get_font(style));
+		gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 		if (flags & WFLAG_NICK) {
 			style->fg[0].red = 0x0000;
 			style->fg[0].green = 0x0000;
@@ -2111,8 +2112,8 @@
 	if (!GTK_WIDGET_REALIZED(label))
 		return;
 	style = gtk_style_new();
-	gdk_font_unref(style->font);
-	style->font = gdk_font_ref(label->style->font);
+	gdk_font_unref(gtk_style_get_font(style));
+	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 	gtk_widget_set_style(label, style);
 	gtk_style_unref(style);
 	c->unseen = 0;

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- dialogs.c	2001/11/06 23:58:21	1.282
+++ dialogs.c	2001/11/15 22:47:03	1.283
@@ -372,7 +372,7 @@
 	w->who = who;
 	w->gc = gc;
 
-	w->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(w->window);
 	dialogwindows = g_list_prepend(dialogwindows, w->window);
 	gtk_window_set_wmclass(GTK_WINDOW(w->window), "warning", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(w->window), FALSE, FALSE, TRUE);
@@ -511,7 +511,7 @@
 	GtkWidget *box;
 	GtkWidget *eedialog;
 
-	eedialog = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(eedialog);
 	gtk_widget_realize(eedialog);
 	ok = picture_button(eedialog, _("OK"), ok_xpm);
 	box = gtk_vbox_new(FALSE, 10);
@@ -556,7 +556,7 @@
 	GtkWidget *label;
 
 	if (!imdialog) {
-		imdialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(imdialog);
 		gtk_window_set_wmclass(GTK_WINDOW(imdialog), "imdialog", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(imdialog), FALSE, TRUE, TRUE);
 		gtk_window_set_title(GTK_WINDOW(imdialog), _("Gaim - IM user"));
@@ -612,7 +612,7 @@
 
 	if (!infodialog) {
 
-		infodialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(infodialog);
 		gtk_window_set_wmclass(GTK_WINDOW(infodialog), "infodialog", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(infodialog), FALSE, TRUE, TRUE);
 		gtk_widget_realize(infodialog);
@@ -749,7 +749,7 @@
 	struct addbuddy *a = g_new0(struct addbuddy, 1);
 	a->gc = gc;
 
-	a->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(a->window);
 	gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_group", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
 	gtk_widget_realize(a->window);
@@ -876,7 +876,7 @@
 	struct addbuddy *a = g_new0(struct addbuddy, 1);
 	a->gc = gc ? gc : connections->data;
 
-	a->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(a->window);
 	gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_buddy", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy"));
@@ -1076,7 +1076,7 @@
 	struct addbp *b = g_new0(struct addbp, 1);
 	b->user = gc ? gc->user : aim_users->data;
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "new_bp", "Gaim");
@@ -1299,7 +1299,7 @@
 	struct set_dir_dlg *b = g_new0(struct set_dir_dlg, 1);
 	b->gc = gc;
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_dir", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
@@ -1485,7 +1485,7 @@
 	struct passwddlg *b = g_new0(struct passwddlg, 1);
 	b->gc = gc;
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "change_passwd", "Gaim");
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change"));
@@ -1584,7 +1584,7 @@
 	tmp = gc->user;
 	b->user = tmp;
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_info", "Gaim");
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info"));
@@ -1671,7 +1671,7 @@
 
 	va_start(ap, info);
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_title(GTK_WINDOW(b->window), "Gaim");
 	gtk_container_border_width(GTK_CONTAINER(b->window), 5);
 	bbox = gtk_vbox_new(FALSE, 5);
@@ -1794,7 +1794,7 @@
 	p->gc = gc;
 	p->permit = permit;
 
-	p->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(p->window);
 	gtk_container_set_border_width(GTK_CONTAINER(p->window), 5);
 	gtk_window_set_policy(GTK_WINDOW(p->window), FALSE, FALSE, TRUE);
 	gtk_widget_realize(p->window);
@@ -1986,7 +1986,7 @@
 
 	struct findbyinfo *b = g_new0(struct findbyinfo, 1);
 	b->gc = gc;
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_info", "Gaim");
 	gtk_widget_show(b->window);
@@ -2143,7 +2143,7 @@
 	struct findbyemail *b = g_new0(struct findbyemail, 1);
 	if (g_slist_find(connections, gc))
 		b->gc = gc;
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_email", "Gaim");
 	gtk_widget_realize(b->window);
@@ -2229,7 +2229,7 @@
 
 	if (!c->link_dialog) {
 		struct linkdlg *b = g_new0(struct linkdlg, 1);
-		c->link_dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(c->link_dialog);
 		gtk_window_set_wmclass(GTK_WINDOW(c->link_dialog), "add_link", "Gaim");
 		dialogwindows = g_list_prepend(dialogwindows, c->link_dialog);
 
@@ -2875,7 +2875,7 @@
 	struct create_away *ca = g_new0(struct create_away, 1);
 
 	/* Set up window */
-	ca->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(ca->window);
 	gtk_widget_set_usize(ca->window, -1, 250);
 	gtk_container_border_width(GTK_CONTAINER(ca->window), 5);
 	gtk_window_set_wmclass(GTK_WINDOW(ca->window), "away_mess", "Gaim");
@@ -3047,12 +3047,12 @@
 
 	/* surround(c->entry, smiley_text, ""); */
 
-	if (GTK_EDITABLE(c->entry)->has_selection) {
-		int finish = GTK_EDITABLE(c->entry)->selection_end_pos;
+	if (GTK_OLD_EDITABLE(c->entry)->has_selection) {
+		int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos;
 		gtk_editable_insert_text(GTK_EDITABLE(c->entry),
 					 smiley_text, strlen(smiley_text), &finish);
 	} else {
-		int pos = GTK_EDITABLE(c->entry)->current_pos;
+		int pos = GTK_OLD_EDITABLE(c->entry)->current_pos;
 		gtk_editable_insert_text(GTK_EDITABLE(c->entry), smiley_text, strlen(smiley_text), &pos);
 	}
 
@@ -3097,7 +3097,7 @@
 
 	win = c->window;
 
-	dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(dialog);
 	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(dialog), "smiley_dialog", "Gaim");
 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
@@ -3178,7 +3178,7 @@
 	if (aliasdlg)
 		gtk_widget_destroy(aliasdlg);
 
-	aliasdlg = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(aliasdlg);
 	gtk_window_set_policy(GTK_WINDOW(aliasdlg), FALSE, FALSE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(aliasdlg), "alias_dialog", "Gaim");
 	gtk_widget_realize(aliasdlg);
@@ -3354,7 +3354,7 @@
 	GtkWidget *label;
 	GtkWidget *hsep;
 
-	window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(window);
 	gtk_window_set_wmclass(GTK_WINDOW(window), "dialog", "Gaim");
 	gtk_container_set_border_width(GTK_CONTAINER(window), 10);
 	gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
@@ -3624,7 +3624,7 @@
 	gtk_container_add(GTK_CONTAINER(frame), sw);
 	gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
 
-	gtk_signal_connect(GTK_OBJECT(layout), "url_clicked", open_url_nw, NULL);
+	gtk_signal_connect(GTK_OBJECT(layout), "url_clicked", GTK_SIGNAL_FUNC(open_url_nw), NULL);
 	gtk_container_add(GTK_CONTAINER(sw), layout);
 	gaim_setup_imhtml(layout);
 
@@ -3710,7 +3710,7 @@
 	GtkWidget *label;
 
 	if (!rename_dialog) {
-		rename_dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(rename_dialog);
 		gtk_window_set_wmclass(GTK_WINDOW(rename_dialog), "rename_dialog", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(rename_dialog), FALSE, TRUE, TRUE);
 		gtk_window_set_title(GTK_WINDOW(rename_dialog), _("Gaim - Rename Group"));
@@ -3815,7 +3815,7 @@
 	GtkWidget *label;
 
 	if (!rename_bud_dialog) {
-		rename_bud_dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(rename_bud_dialog);
 		gtk_window_set_wmclass(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(rename_bud_dialog), FALSE, TRUE, TRUE);
 		gtk_window_set_title(GTK_WINDOW(rename_bud_dialog), _("Gaim - Rename Buddy"));

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- gaim.h	2001/11/10 08:02:39	1.291
+++ gaim.h	2001/11/15 22:47:03	1.292
@@ -82,6 +82,11 @@
 #define CUI_CHAT_RECV		6
 
 
+#define BROWSER_NETSCAPE              0
+#define BROWSER_KFM                   1
+#define BROWSER_MANUAL                2
+/*#define BROWSER_INTERNAL              3*/
+#define BROWSER_GNOME                 4
 
 #define IM_FLAG_AWAY     0x01
 #define IM_FLAG_CHECKBOX 0x02

Index: gtkspell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gtkspell.c	2001/11/04 10:46:39	1.13
+++ gtkspell.c	2001/11/15 22:47:03	1.14
@@ -431,7 +431,7 @@
 		if (highlight.pixel == 0) {
 			/* add an entry for the highlight in the color map. */
 			GdkColormap *gc = gtk_widget_get_colormap(GTK_WIDGET(gtktext));
-			gdk_colormap_alloc_color(gc, &highlight, FALSE, TRUE);;
+			gdk_colormap_alloc_color(gc, &highlight, FALSE, TRUE);
 		}
 		change_color(gtktext, start, end, &highlight);
 		if (buf)

Index: gtkticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkticker.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtkticker.c	2000/11/21 01:00:45	1.2
+++ gtkticker.c	2001/11/15 22:47:03	1.3
@@ -22,6 +22,7 @@
  */
 
 #include "gtkticker.h"
+#include <gtk/gtk.h>
 
 static void gtk_ticker_compute_offsets (GtkTicker    *ticker);
 static void gtk_ticker_class_init    (GtkTickerClass    *klass);
@@ -94,7 +95,9 @@
   widget_class->realize = gtk_ticker_realize;
   widget_class->size_request = gtk_ticker_size_request;
   widget_class->size_allocate = gtk_ticker_size_allocate;
+#if ! GTK_CHECK_VERSION(1,3,0)
   widget_class->draw = gtk_ticker_draw;
+#endif
   widget_class->expose_event = gtk_ticker_expose;
 
   container_class->add = gtk_ticker_add_real;

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- multi.c	2001/11/13 06:07:32	1.105
+++ multi.c	2001/11/15 22:47:03	1.106
@@ -812,7 +812,7 @@
 	p->u = u;
 	passes = g_slist_append(passes, p);
 
-	p->win = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(p->win);
 	gtk_window_set_wmclass(GTK_WINDOW(p->win), "password", "Gaim");
 	gtk_container_border_width(GTK_CONTAINER(p->win), 5);
 	gtk_signal_connect(GTK_OBJECT(p->win), "destroy", GTK_SIGNAL_FUNC(pass_des), p);
@@ -1152,7 +1152,7 @@
 		meter->gc = gc;
 		meters = g_slist_append(meters, meter);
 
-		meter->window = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(meter->window);
 		gtk_window_set_policy(GTK_WINDOW(meter->window), 0, 0, 1);
 		gtk_window_set_wmclass(GTK_WINDOW(meter->window), "signon", "Gaim");
 		gtk_container_set_border_width(GTK_CONTAINER(meter->window), 5);

Index: plugins.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/plugins.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- plugins.c	2001/10/12 22:31:12	1.85
+++ plugins.c	2001/11/15 22:47:03	1.86
@@ -171,7 +171,7 @@
 	if (plugwindow)
 		return;
 
-	plugwindow = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(plugwindow);
 	gtk_window_set_wmclass(GTK_WINDOW(plugwindow), "plugins", "Gaim");
 	gtk_widget_realize(plugwindow);
 	aol_icon(plugwindow->window);

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- prefs.c	2001/11/05 15:29:34	1.196
+++ prefs.c	2001/11/15 22:47:04	1.197
@@ -2441,7 +2441,7 @@
 	if (!dw)
 		dw = g_new0(struct debug_window, 1);
 
-	dw->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(dw->window);
 	gtk_window_set_title(GTK_WINDOW(dw->window), _("Gaim debug output window"));
 	gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");
 	gtk_signal_connect(GTK_OBJECT(dw->window), "delete_event", GTK_SIGNAL_FUNC(debug_delete), NULL);

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- prpl.c	2001/11/14 23:42:14	1.47
+++ prpl.c	2001/11/15 22:47:04	1.48
@@ -127,7 +127,7 @@
 	GtkWidget *hbox;
 	GtkWidget *button;
 
-	window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(window);
 	gtk_window_set_wmclass(GTK_WINDOW(window), "accept", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(window), _("Accept?"));
@@ -192,7 +192,7 @@
 	p->doit = doit;
 	p->dont = dont;
 
-	window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(window);
 	p->window = window;
 	gtk_window_set_wmclass(GTK_WINDOW(window), "prompt", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
@@ -413,7 +413,7 @@
 	}
 
 
-	mn->email_win = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(mn->email_win);
 	gtk_window_set_wmclass(GTK_WINDOW(mn->email_win), "mail", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(mn->email_win), FALSE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail"));

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ui.h	2001/11/09 03:11:56	1.17
+++ ui.h	2001/11/15 22:47:04	1.18
@@ -37,6 +37,18 @@
 #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()
+#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 BROWSER_NETSCAPE              0
 #define BROWSER_KFM                   1
 #define BROWSER_MANUAL                2