[Gaim-commits] CVS: gaim/src about.c,1.82,1.83 aim.c,1.216,1.217 away.c,1.80,1.81 buddy.c,1.375,1.376 buddy_chat.c,1.183,1.184 conversation.c,1.455,1.456 dialogs.c,1.389,1.390 ft.c,1.8,1.9 multi.c,1.149,1.150 prefs.c,1.286,1.287 prpl.c,1.75,1.76 server.c,1.260,1.261 util.c,1.149,1.150

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15967/src

Modified Files:
	about.c aim.c away.c buddy.c buddy_chat.c conversation.c 
	dialogs.c ft.c multi.c prefs.c prpl.c server.c util.c 
Log Message:
gtk_signal_connect() to g_signal_connect()

Everything seems fine, and nothing should be broken. However, please let me
know if anything strange happens.


Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- about.c	31 Dec 2002 18:19:13 -0000	1.82
+++ about.c	31 Dec 2002 19:32:35 -0000	1.83
@@ -173,10 +173,10 @@
 		button = gaim_pixbuf_button_from_stock(_("Close"), GTK_STOCK_CLOSE, GAIM_BUTTON_HORIZONTAL);
 		gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
-		gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
-					  GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
-		gtk_signal_connect(GTK_OBJECT(about), "destroy",
-					   GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
+		g_signal_connect_swapped(G_OBJECT(button), "clicked",
+								 G_CALLBACK(destroy_about), G_OBJECT(about));
+		g_signal_connect(G_OBJECT(about), "destroy",
+						 G_CALLBACK(destroy_about), G_OBJECT(about));
 		gtk_widget_show(button);
 
 		/* this makes the sizes not work. */

Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- aim.c	31 Dec 2002 05:22:56 -0000	1.216
+++ aim.c	31 Dec 2002 19:32:35 -0000	1.217
@@ -284,8 +284,8 @@
 	gtk_widget_realize(mainwindow);
 	gdk_window_set_group(mainwindow->window, mainwindow->window);
 	gtk_container_set_border_width(GTK_CONTAINER(mainwindow), 5);
-	gtk_signal_connect(GTK_OBJECT(mainwindow), "delete_event", 
-					GTK_SIGNAL_FUNC(do_quit), mainwindow);
+	g_signal_connect(G_OBJECT(mainwindow), "delete_event",
+					 G_CALLBACK(do_quit), mainwindow);
 
 
 	icon = gaim_pixbuf(NULL, "gaim.png");
@@ -311,10 +311,10 @@
 	tmp = combo_user_names();
 	gtk_combo_set_popdown_strings(GTK_COMBO(name), tmp);
 	g_list_free(tmp);
-	gtk_signal_connect(GTK_OBJECT(GTK_COMBO(name)->entry), "activate",
-			   GTK_SIGNAL_FUNC(doenter), mainwindow);
-	gtk_signal_connect(GTK_OBJECT(GTK_COMBO(name)->entry), "changed",
-			   GTK_SIGNAL_FUNC(combo_changed), name);
+	g_signal_connect(G_OBJECT(GTK_COMBO(name)->entry), "activate",
+					 G_CALLBACK(doenter), mainwindow);
+	g_signal_connect(G_OBJECT(GTK_COMBO(name)->entry), "changed",
+					 G_CALLBACK(combo_changed), name);
 	gtk_box_pack_start(GTK_BOX(vbox2), name, FALSE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0);
 
@@ -327,7 +327,8 @@
 
 	pass = gtk_entry_new();
 	gtk_entry_set_visibility(GTK_ENTRY(pass), FALSE);
-	gtk_signal_connect(GTK_OBJECT(pass), "activate", GTK_SIGNAL_FUNC(doenter), mainwindow);
+	g_signal_connect(G_OBJECT(pass), "activate",
+					 G_CALLBACK(doenter), mainwindow);
 	gtk_box_pack_start(GTK_BOX(vbox2), pass, FALSE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0);
 
@@ -338,7 +339,8 @@
 	/* And now for the buttons */
 	button = gaim_pixbuf_button("Accounts", "accounts.png", GAIM_BUTTON_VERTICAL);
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(account_editor), mainwindow);
+	g_signal_connect(G_OBJECT(button), "clicked",
+					 G_CALLBACK(account_editor), mainwindow);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
 #ifdef NO_MULTI
@@ -347,12 +349,14 @@
 
 	button = gaim_pixbuf_button("Settings", "preferences.png", GAIM_BUTTON_VERTICAL);
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(show_prefs), mainwindow);
+	g_signal_connect(G_OBJECT(button), "clicked",
+					 G_CALLBACK(show_prefs), mainwindow);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
 	button = gaim_pixbuf_button("Sign On", "signon.png", GAIM_BUTTON_VERTICAL);
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(dologin), mainwindow);
+	g_signal_connect(G_OBJECT(button), "clicked",
+					 G_CALLBACK(dologin), mainwindow);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
 #ifdef _WIN32

Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- away.c	23 Dec 2002 23:08:11 -0000	1.80
+++ away.c	31 Dec 2002 19:32:35 -0000	1.81
@@ -190,7 +190,8 @@
 			 gtk_window_set_title(GTK_WINDOW(imaway), a->name);
 		else
 			gtk_window_set_title(GTK_WINDOW(imaway), _("Gaim - Away!"));
-		gtk_signal_connect(GTK_OBJECT(imaway), "destroy", GTK_SIGNAL_FUNC(do_im_back), imaway);
+		g_signal_connect(G_OBJECT(imaway), "destroy",
+						 G_CALLBACK(do_im_back), imaway);
 		gtk_widget_realize(imaway);
 
 		vbox = gtk_vbox_new(FALSE, 5);
@@ -250,7 +251,7 @@
 
 		back = picture_button(imaway, _("I'm Back!"), join_xpm);
 		gtk_box_pack_start(GTK_BOX(vbox), back, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(back), "clicked", GTK_SIGNAL_FUNC(do_im_back), imaway);
+		g_signal_connect(GTK_OBJECT(back), "clicked", G_CALLBACK(do_im_back), imaway);
 		gtk_window_set_focus(GTK_WINDOW(imaway), back);
 
 		awaymessage = a;
@@ -336,8 +337,8 @@
 			a = (struct away_message *)awy->data;
 			list_item = gtk_list_item_new();
 			gtk_container_add(GTK_CONTAINER(prefs_away_list), list_item);
-			gtk_signal_connect(GTK_OBJECT(list_item), "select",
-					   GTK_SIGNAL_FUNC(away_list_clicked), a);
+			g_signal_connect(GTK_OBJECT(list_item), "select",
+					   G_CALLBACK(away_list_clicked), a);
 			gtk_object_set_user_data(GTK_OBJECT(list_item), a);
 			gtk_widget_show(list_item);
 
@@ -369,7 +370,7 @@
 		menuitem = gtk_menu_item_new_with_label(_("New Away Message"));
 		gtk_menu_append(GTK_MENU(awaymenu), menuitem);
 		gtk_widget_show(menuitem);
-		gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(create_away_mess),
+		g_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(create_away_mess),
 				   NULL);
 
 		awy = away_messages;
@@ -379,8 +380,8 @@
 			remitem = gtk_menu_item_new_with_label(a->name);
 			gtk_menu_append(GTK_MENU(remmenu), remitem);
 			gtk_widget_show(remitem);
-			gtk_signal_connect(GTK_OBJECT(remitem), "activate",
-					   GTK_SIGNAL_FUNC(rem_away_mess), a);
+			g_signal_connect(GTK_OBJECT(remitem), "activate",
+					   G_CALLBACK(rem_away_mess), a);
 
 			awy = g_slist_next(awy);
 
@@ -430,8 +431,8 @@
 					gtk_object_set_user_data(GTK_OBJECT(menuitem), a);
 					gtk_menu_append(GTK_MENU(awaymenu), menuitem);
 					gtk_widget_show(menuitem);
-					gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-							   GTK_SIGNAL_FUNC(do_away_message), a);
+					g_signal_connect(GTK_OBJECT(menuitem), "activate",
+							   G_CALLBACK(do_away_message), a);
 
 					awy = g_slist_next(awy);
 				}
@@ -445,8 +446,8 @@
 					gtk_widget_show(menuitem);
 
 					if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
-						gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-								   GTK_SIGNAL_FUNC(set_gc_state), gc);
+						g_signal_connect(GTK_OBJECT(menuitem), "activate",
+								   G_CALLBACK(set_gc_state), gc);
 					} else {
 						submenu = gtk_menu_new();
 						gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
@@ -461,9 +462,9 @@
 										 a);
 							gtk_menu_append(GTK_MENU(submenu), menuitem);
 							gtk_widget_show(menuitem);
-							gtk_signal_connect(GTK_OBJECT(menuitem),
+							g_signal_connect(GTK_OBJECT(menuitem),
 									   "activate",
-									   GTK_SIGNAL_FUNC
+									   G_CALLBACK
 									   (do_away_message), a);
 
 							awy = g_slist_next(awy);
@@ -501,8 +502,8 @@
 					menuitem = gtk_menu_item_new_with_label(_("Back"));
 					gtk_menu_append(GTK_MENU(submenu), menuitem);
 					gtk_widget_show(menuitem);
-					gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-							   GTK_SIGNAL_FUNC(set_gc_away), gc);
+					g_signal_connect(GTK_OBJECT(menuitem), "activate",
+							   G_CALLBACK(set_gc_away), gc);
 
 					sep = gtk_hseparator_new();
 					menuitem = gtk_menu_item_new();
@@ -521,8 +522,8 @@
 						gtk_object_set_user_data(GTK_OBJECT(menuitem), a);
 						gtk_menu_append(GTK_MENU(submenu), menuitem);
 						gtk_widget_show(menuitem);
-						gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-								   GTK_SIGNAL_FUNC(set_gc_away), gc);
+						g_signal_connect(GTK_OBJECT(menuitem), "activate",
+								   G_CALLBACK(set_gc_away), gc);
 
 						awy = g_slist_next(awy);
 					}
@@ -537,9 +538,9 @@
 						gtk_widget_show(menuitem);
 
 						if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
-							gtk_signal_connect(GTK_OBJECT(menuitem),
+							g_signal_connect(GTK_OBJECT(menuitem),
 									   "activate",
-									   GTK_SIGNAL_FUNC(set_gc_state),
+									   G_CALLBACK(set_gc_state),
 									   gc);
 						} else {
 							submenu2 = gtk_menu_new();
@@ -558,9 +559,9 @@
 								gtk_menu_append(GTK_MENU(submenu2),
 										menuitem);
 								gtk_widget_show(menuitem);
-								gtk_signal_connect(GTK_OBJECT(menuitem),
+								g_signal_connect(GTK_OBJECT(menuitem),
 										   "activate",
-										   GTK_SIGNAL_FUNC
+										   G_CALLBACK
 										   (set_gc_away), gc);
 
 								awy = g_slist_next(awy);
@@ -591,8 +592,8 @@
 				gtk_object_set_user_data(GTK_OBJECT(menuitem), a);
 				gtk_menu_append(GTK_MENU(submenu), menuitem);
 				gtk_widget_show(menuitem);
-				gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-						   GTK_SIGNAL_FUNC(do_away_message), a);
+				g_signal_connect(GTK_OBJECT(menuitem), "activate",
+						   G_CALLBACK(do_away_message), a);
 
 				awy = g_slist_next(awy);
 			}

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- buddy.c	31 Dec 2002 05:22:56 -0000	1.375
+++ buddy.c	31 Dec 2002 19:32:36 -0000	1.376
@@ -642,25 +642,25 @@
 		menu = gtk_menu_new();
 
 		button = gtk_menu_item_new_with_label(_("IM"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_im), b);
+		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_im), b);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
 		button = gtk_menu_item_new_with_label(_("Alias"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_alias_bs), b);
+		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_alias_bs), b);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
 		button = gtk_menu_item_new_with_label(_("Add Buddy Pounce"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate",
-				   GTK_SIGNAL_FUNC(new_bp_callback),
+		g_signal_connect(GTK_OBJECT(button), "activate",
+				   G_CALLBACK(new_bp_callback),
 				   cn ? find_buddy(cn->data, b->name) : NULL);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
 		button = gtk_menu_item_new_with_label(_("View Log"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate",
-				   GTK_SIGNAL_FUNC(pressed_log), b->name);
+		g_signal_connect(GTK_OBJECT(button), "activate",
+				   G_CALLBACK(pressed_log), b->name);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
@@ -683,8 +683,8 @@
 						GtkWidget *button;
 
 						button = gtk_menu_item_new_with_label(pbm->label);
-						gtk_signal_connect(GTK_OBJECT(button), "activate",
-								   GTK_SIGNAL_FUNC(menu_click), b->name);
+						g_signal_connect(GTK_OBJECT(button), "activate",
+								   G_CALLBACK(menu_click), b->name);
 						gtk_object_set_user_data(GTK_OBJECT(button), mo);
 						gtk_menu_append(GTK_MENU(conmenu), button);
 						gtk_widget_show(button);
@@ -704,8 +704,8 @@
 					GtkWidget *button;
 
 					button = gtk_menu_item_new_with_label(pbm->label);
-					gtk_signal_connect(GTK_OBJECT(button), "activate",
-							   GTK_SIGNAL_FUNC(menu_click), b->name);
+					g_signal_connect(GTK_OBJECT(button), "activate",
+							   G_CALLBACK(menu_click), b->name);
 					gtk_object_set_user_data(GTK_OBJECT(button), mo);
 					gtk_menu_append(GTK_MENU(menu), button);
 					gtk_widget_show(button);
@@ -797,8 +797,8 @@
 		menu = gtk_menu_new();
 
 		button = gtk_menu_item_new_with_label(_("Rename"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate",
-				   GTK_SIGNAL_FUNC(show_rename_group), group);
+		g_signal_connect(GTK_OBJECT(button), "activate",
+				   G_CALLBACK(show_rename_group), group);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
@@ -810,38 +810,38 @@
 		menu = gtk_menu_new();
 
 		button = gtk_menu_item_new_with_label(_("IM"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_im_bud), b);
+		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_im_bud), b);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
 		button = gtk_menu_item_new_with_label(_("Alias"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate",
-				   GTK_SIGNAL_FUNC(pressed_alias_bud), b);
+		g_signal_connect(GTK_OBJECT(button), "activate",
+				   G_CALLBACK(pressed_alias_bud), b);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
 		if (strcmp(b->name, b->show)) {
 			button = gtk_menu_item_new_with_label(_("Un-Alias"));
-			gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(un_alias), b);
+			g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(un_alias), b);
 			gtk_menu_append(GTK_MENU(menu), button);
 			gtk_widget_show(button);
 		}
 
 		button = gtk_menu_item_new_with_label(_("Rename"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate",
-				   GTK_SIGNAL_FUNC(show_rename_buddy), b);
+		g_signal_connect(GTK_OBJECT(button), "activate",
+				   G_CALLBACK(show_rename_buddy), b);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
 		button = gtk_menu_item_new_with_label(_("Add Buddy Pounce"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate",
-				   GTK_SIGNAL_FUNC(new_bp_callback), b);
+		g_signal_connect(GTK_OBJECT(button), "activate",
+				   G_CALLBACK(new_bp_callback), b);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
 		button = gtk_menu_item_new_with_label(_("View Log"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate",
-				   GTK_SIGNAL_FUNC(pressed_log), b->name);
+		g_signal_connect(GTK_OBJECT(button), "activate",
+				   G_CALLBACK(pressed_log), b->name);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
@@ -856,8 +856,8 @@
 				GtkWidget *button;
 
 				button = gtk_menu_item_new_with_label(pbm->label);
-				gtk_signal_connect(GTK_OBJECT(button), "activate",
-						   GTK_SIGNAL_FUNC(menu_click), b->name);
+				g_signal_connect(GTK_OBJECT(button), "activate",
+						   G_CALLBACK(menu_click), b->name);
 				gtk_object_set_user_data(GTK_OBJECT(button), mo);
 				gtk_menu_append(GTK_MENU(menu), button);
 				gtk_widget_show(button);
@@ -1535,8 +1535,8 @@
 
 		menuitem = gtk_menu_item_new_with_label(a->name);
 		gtk_menu_append(GTK_MENU(menu), menuitem);
-		gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-				   GTK_SIGNAL_FUNC(do_away_message), a);
+		g_signal_connect(GTK_OBJECT(menuitem), "activate",
+				   G_CALLBACK(do_away_message), a);
 		gtk_widget_show(menuitem);
 		awy = awy->next;
 	}
@@ -1683,7 +1683,7 @@
 	menuitem = gtk_menu_item_new_with_label(_("New Buddy Pounce"));
 	gtk_menu_append(GTK_MENU(bpmenu), menuitem);
 	gtk_widget_show(menuitem);
-	gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(new_bp_callback), NULL);
+	g_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(new_bp_callback), NULL);
 
 
 	while (bp) {
@@ -1692,7 +1692,7 @@
 		remitem = gtk_menu_item_new_with_label(b->name);
 		gtk_menu_append(GTK_MENU(remmenu), remitem);
 		gtk_widget_show(remitem);
-		gtk_signal_connect(GTK_OBJECT(remitem), "activate", GTK_SIGNAL_FUNC(rem_bp), b);
+		g_signal_connect(GTK_OBJECT(remitem), "activate", G_CALLBACK(rem_bp), b);
 
 		bp = bp->next;
 
@@ -1731,7 +1731,7 @@
 		gtk_menu_append(GTK_MENU(messmenu), mess);
 		gtk_tooltips_set_tip(bp_tooltip, GTK_WIDGET(mess), _("[Click to edit]"), NULL);
 		gtk_widget_show(mess);
-		gtk_signal_connect(GTK_OBJECT(mess), "activate", GTK_SIGNAL_FUNC(edit_bp_callback), b);
+		g_signal_connect(GTK_OBJECT(mess), "activate", G_CALLBACK(edit_bp_callback), b);
 		bp = bp->next;
 
 	}
@@ -1852,8 +1852,8 @@
 
 	g->item = gtk_tree_item_new();
 
-	gtk_signal_connect(GTK_OBJECT(g->item), "button_press_event",
-			   GTK_SIGNAL_FUNC(handle_click_group), g);
+	g_signal_connect(GTK_OBJECT(g->item), "button_press_event",
+			   G_CALLBACK(handle_click_group), g);
 
 	gtk_tree_insert(GTK_TREE(buddies), g->item, pos);
 
@@ -1926,8 +1926,8 @@
 	b->item = gtk_tree_item_new();
 	gtk_tree_insert(GTK_TREE(gs->tree), b->item, pos);
 	gtk_object_set_user_data(GTK_OBJECT(b->item), b);
-	gtk_signal_connect(GTK_OBJECT(b->item), "button_press_event",
-			   GTK_SIGNAL_FUNC(handle_click_buddy), b);
+	g_signal_connect(GTK_OBJECT(b->item), "button_press_event",
+			   G_CALLBACK(handle_click_buddy), b);
 	gtk_widget_show(b->item);
 
 	box = gtk_hbox_new(FALSE, 1);
@@ -2549,13 +2549,13 @@
 		gtk_box_pack_start(GTK_BOX(imchatbox), awaybutton, TRUE, TRUE, 0);
 		gtk_container_border_width(GTK_CONTAINER(imchatbox), 5);
 
-		gtk_signal_connect(GTK_OBJECT(imbutton), "clicked", GTK_SIGNAL_FUNC(im_callback),
+		g_signal_connect(GTK_OBJECT(imbutton), "clicked", G_CALLBACK(im_callback),
 				   buddies);
-		gtk_signal_connect(GTK_OBJECT(infobutton), "clicked", GTK_SIGNAL_FUNC(info_callback),
+		g_signal_connect(GTK_OBJECT(infobutton), "clicked", G_CALLBACK(info_callback),
 				   buddies);
-		gtk_signal_connect(GTK_OBJECT(chatbutton), "clicked", GTK_SIGNAL_FUNC(chat_callback),
+		g_signal_connect(GTK_OBJECT(chatbutton), "clicked", G_CALLBACK(chat_callback),
 				   buddies);
-		gtk_signal_connect(GTK_OBJECT(awaybutton), "clicked", GTK_SIGNAL_FUNC(away_callback),
+		g_signal_connect(GTK_OBJECT(awaybutton), "clicked", G_CALLBACK(away_callback),
 				   buddies);
 
 		gtk_tooltips_set_tip(tips, infobutton, _("Information on selected Buddy"), "Penguin");
@@ -2629,27 +2629,27 @@
 	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem);
 
 	gaim_new_item_from_stock(menu, _("_Add A Buddy"), GTK_STOCK_ADD,
-				  GTK_SIGNAL_FUNC(add_buddy_callback), NULL,  'b', GDK_CONTROL_MASK, "Ctl+B");
+				  G_CALLBACK(add_buddy_callback), NULL,  'b', GDK_CONTROL_MASK, "Ctl+B");
 	gaim_new_item_from_stock(menu, _("_Join A Chat"), GTK_STOCK_JUMP_TO,
-				  GTK_SIGNAL_FUNC(chat_callback), NULL, 'c', GDK_CONTROL_MASK, "Ctl+C");
+				  G_CALLBACK(chat_callback), NULL, 'c', GDK_CONTROL_MASK, "Ctl+C");
 	gaim_new_item_from_stock(menu, _("_New Message"), GTK_STOCK_CONVERT,
-				  GTK_SIGNAL_FUNC(show_im_dialog), NULL, 'i', GDK_CONTROL_MASK, "Ctl+I");
+				  G_CALLBACK(show_im_dialog), NULL, 'i', GDK_CONTROL_MASK, "Ctl+I");
 	gaim_new_item_from_stock(menu, _("_Get User Info"), GTK_STOCK_FIND,
-				  GTK_SIGNAL_FUNC(show_info_dialog), NULL, 'j', GDK_CONTROL_MASK, "Ctl+J");
+				  G_CALLBACK(show_info_dialog), NULL, 'j', GDK_CONTROL_MASK, "Ctl+J");
 
 	gaim_separator(menu);
 
 	gaim_new_item_from_pixbuf(menu, _("Import Buddy List"), "import-menu.png",
-				  GTK_SIGNAL_FUNC(import_callback), NULL, 0, 0, 0);
+				  G_CALLBACK(import_callback), NULL, 0, 0, 0);
 
 	gaim_separator(menu);
 
 	gaim_new_item_from_stock(menu, _("Signoff"), NULL,
-				  GTK_SIGNAL_FUNC(signoff_all), (void*)1, 'd', GDK_CONTROL_MASK, "Ctl+D");
+				  G_CALLBACK(signoff_all), (void*)1, 'd', GDK_CONTROL_MASK, "Ctl+D");
 	gaim_new_item_from_stock(menu, _("Hide"), NULL,
-				  GTK_SIGNAL_FUNC(hide_buddy_list), NULL, 'h', GDK_CONTROL_MASK, "Ctl+H");
+				  G_CALLBACK(hide_buddy_list), NULL, 'h', GDK_CONTROL_MASK, "Ctl+H");
 	gaim_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT,
-				  GTK_SIGNAL_FUNC(do_quit), NULL, 'q', GDK_CONTROL_MASK, "Ctl+Q");
+				  G_CALLBACK(do_quit), NULL, 'q', GDK_CONTROL_MASK, "Ctl+Q");
 
 	menu = gtk_menu_new();
 
@@ -2671,10 +2671,10 @@
 
 #ifndef NO_MULTI
 	gaim_new_item_from_pixbuf(menu, _("_Accounts..."), "accounts-menu.png",
-				  GTK_SIGNAL_FUNC(account_editor), NULL, 'a', GDK_CONTROL_MASK, "Ctl+A");
+				  G_CALLBACK(account_editor), NULL, 'a', GDK_CONTROL_MASK, "Ctl+A");
 #endif
 	gaim_new_item_from_stock(menu, _("_Preferences..."), GTK_STOCK_PREFERENCES,
-				  GTK_SIGNAL_FUNC(show_prefs), NULL, 'p', GDK_CONTROL_MASK, "Ctl+P");
+				  G_CALLBACK(show_prefs), NULL, 'p', GDK_CONTROL_MASK, "Ctl+P");
 
 	gaim_separator(menu);
 
@@ -2684,10 +2684,10 @@
 	do_proto_menu();
 
 	gaim_new_item_from_stock(menu, _("Pr_ivacy..."), NULL,
-				  GTK_SIGNAL_FUNC(show_privacy_options), NULL, 0, 0, 0);
+				  G_CALLBACK(show_privacy_options), NULL, 0, 0, 0);
 
 	gaim_new_item_from_stock(menu, _("_View System Log..."), NULL,
-				  GTK_SIGNAL_FUNC(show_syslog), NULL, 0, 0, 0);
+				  G_CALLBACK(show_syslog), NULL, 0, 0, 0);
 
 	menu = gtk_menu_new();
 
@@ -2695,12 +2695,12 @@
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
 	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem);
 
-	gaim_new_item_from_stock(menu, _("Online Help"), GTK_STOCK_HELP, GTK_SIGNAL_FUNC(open_url), WEBSITE"documentation.php", GDK_F1, 0, NULL);
-	gaim_new_item_from_stock(menu, _("Debug Window"), NULL, GTK_SIGNAL_FUNC(clicked_debug), NULL, 0, 0, NULL);
+	gaim_new_item_from_stock(menu, _("Online Help"), GTK_STOCK_HELP, G_CALLBACK(open_url), WEBSITE"documentation.php", GDK_F1, 0, NULL);
+	gaim_new_item_from_stock(menu, _("Debug Window"), NULL, G_CALLBACK(clicked_debug), NULL, 0, 0, NULL);
 	
 	gaim_separator(menu);
 
-	gaim_new_item_from_pixbuf(menu, _("About Gaim"), "about_menu.png", GTK_SIGNAL_FUNC(show_about), NULL, GDK_F1, GDK_CONTROL_MASK, NULL);
+	gaim_new_item_from_pixbuf(menu, _("About Gaim"), "about_menu.png", G_CALLBACK(show_about), NULL, GDK_F1, GDK_CONTROL_MASK, NULL);
 	
 	gtk_widget_show(menubar);
 
@@ -2740,15 +2740,15 @@
 	gtk_ctree_set_line_style(GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID);;
 	gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE);
 	gtk_clist_set_reorderable(GTK_CLIST(edittree), TRUE);
-	gtk_signal_connect(GTK_OBJECT(edittree), "button_press_event",
-			   GTK_SIGNAL_FUNC(click_edit_tree), NULL);
+	g_signal_connect(GTK_OBJECT(edittree), "button_press_event",
+			   G_CALLBACK(click_edit_tree), NULL);
 
 	gtk_ctree_set_drag_compare_func(GTK_CTREE(edittree),
 					(GtkCTreeCompareDragFunc) edit_drag_compare_func);
 
 
-	gtk_signal_connect_after(GTK_OBJECT(edittree), "tree_move",
-				 GTK_SIGNAL_FUNC(edit_tree_move), NULL);
+	g_signal_connect_after(GTK_OBJECT(edittree), "tree_move",
+				 G_CALLBACK(edit_tree_move), NULL);
 
 
 	bbox = gtk_hbox_new(TRUE, 5);

Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- buddy_chat.c	17 Dec 2002 15:12:21 -0000	1.183
+++ buddy_chat.c	31 Dec 2002 19:32:36 -0000	1.184
@@ -186,8 +186,8 @@
 				gtk_widget_grab_focus(entry);
 				focus = FALSE;
 			}
-			gtk_signal_connect(GTK_OBJECT(entry), "activate",
-					   GTK_SIGNAL_FUNC(do_join_chat), NULL);
+			g_signal_connect(GTK_OBJECT(entry), "activate",
+					   G_CALLBACK(do_join_chat), NULL);
 			gtk_widget_show(entry);
 		}
 
@@ -230,7 +230,7 @@
 		g_snprintf(buf, sizeof buf, "%s (%s)", g->username, g->prpl->name);
 		opt = gtk_menu_item_new_with_label(buf);
 		gtk_object_set_user_data(GTK_OBJECT(opt), g);
-		gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(joinchat_choose), g);
+		g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(joinchat_choose), g);
 		gtk_menu_append(GTK_MENU(menu), opt);
 		gtk_widget_show(opt);
 	}
@@ -270,8 +270,8 @@
 		gtk_window_set_role(GTK_WINDOW(joinchat), "joinchat");
 		gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE);
 		gtk_widget_realize(joinchat);
-		gtk_signal_connect(GTK_OBJECT(joinchat), "delete_event",
-				   GTK_SIGNAL_FUNC(destroy_join_chat), joinchat);
+		g_signal_connect(GTK_OBJECT(joinchat), "delete_event",
+				   G_CALLBACK(destroy_join_chat), joinchat);
 		gtk_window_set_title(GTK_WINDOW(joinchat), _("Join Chat"));
 
 		mainbox = gtk_vbox_new(FALSE, 5);
@@ -312,12 +312,12 @@
 
 		join = picture_button(joinchat, _("Join"), join_xpm);
 		gtk_box_pack_end(GTK_BOX(bbox), join, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(join), "clicked", GTK_SIGNAL_FUNC(do_join_chat), NULL);
+		g_signal_connect(GTK_OBJECT(join), "clicked", G_CALLBACK(do_join_chat), NULL);
 
 		cancel = picture_button(joinchat, _("Cancel"), cancel_xpm);
 		gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(cancel), "clicked",
-				   GTK_SIGNAL_FUNC(destroy_join_chat), joinchat);
+		g_signal_connect(GTK_OBJECT(cancel), "clicked",
+				   G_CALLBACK(destroy_join_chat), joinchat);
 	}
 	gtk_widget_show_all(joinchat);
 }
@@ -442,13 +442,13 @@
 		gtk_box_pack_end(GTK_BOX(bbox), invite_btn, FALSE, FALSE, 0);
 
 		/* Handle closes right */
-		gtk_signal_connect(GTK_OBJECT(invite), "delete_event",
-				   GTK_SIGNAL_FUNC(destroy_invite), invite);
+		g_signal_connect(GTK_OBJECT(invite), "delete_event",
+				   G_CALLBACK(destroy_invite), invite);
 
-		gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_invite), b);
-		gtk_signal_connect(GTK_OBJECT(invite_btn), "clicked", GTK_SIGNAL_FUNC(do_invite), b);
-		gtk_signal_connect(GTK_OBJECT(GTK_ENTRY(GTK_COMBO(inviteentry)->entry)), "activate",
-				   GTK_SIGNAL_FUNC(do_invite), b);
+		g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_invite), b);
+		g_signal_connect(GTK_OBJECT(invite_btn), "clicked", G_CALLBACK(do_invite), b);
+		g_signal_connect(GTK_OBJECT(GTK_ENTRY(GTK_COMBO(inviteentry)->entry)), "activate",
+				   G_CALLBACK(do_invite), b);
 
 		/* Finish up */
 		gtk_widget_set_usize(GTK_WIDGET(invite), 550, 115);
@@ -867,7 +867,7 @@
 		menu = gtk_menu_new();
 
 		button = gtk_menu_item_new_with_label(_("IM"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(chat_press_im), b);
+		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(chat_press_im), b);
 		gtk_object_set_user_data(GTK_OBJECT(button), who);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
@@ -877,15 +877,15 @@
 		else
 			button = gtk_menu_item_new_with_label(_("Ignore"));
 		
-		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(chat_press_ign), b);
+		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(chat_press_ign), b);
 		gtk_object_set_user_data(GTK_OBJECT(button), who);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
 		if (b->gc && b->gc->prpl->get_info) {
 			button = gtk_menu_item_new_with_label(_("Info"));
-			gtk_signal_connect(GTK_OBJECT(button), "activate",
-					   GTK_SIGNAL_FUNC(chat_press_info), b);
+			g_signal_connect(GTK_OBJECT(button), "activate",
+					   G_CALLBACK(chat_press_info), b);
 			gtk_object_set_user_data(GTK_OBJECT(button), who);
 			gtk_menu_append(GTK_MENU(menu), button);
 			gtk_widget_show(button);
@@ -893,8 +893,8 @@
 
 		if (b->gc && b->gc->prpl->get_cb_away) {
 			button = gtk_menu_item_new_with_label(_("Get Away Msg"));
-			gtk_signal_connect(GTK_OBJECT(button), "activate",
-					   GTK_SIGNAL_FUNC(chat_press_away), b);
+			g_signal_connect(GTK_OBJECT(button), "activate",
+					   G_CALLBACK(chat_press_away), b);
 			gtk_object_set_user_data(GTK_OBJECT(button), who);
 			gtk_menu_append(GTK_MENU(menu), button);
 			gtk_widget_show(button);
@@ -906,8 +906,8 @@
 				button = gtk_menu_item_new_with_label(_("Remove"));
 			else
 				button = gtk_menu_item_new_with_label(_("Add"));
-			gtk_signal_connect(GTK_OBJECT(button), "activate",
-					   GTK_SIGNAL_FUNC(chat_press_add), b);
+			g_signal_connect(GTK_OBJECT(button), "activate",
+					   G_CALLBACK(chat_press_add), b);
 			gtk_object_set_user_data(GTK_OBJECT(button), 
 						 who);
 			gtk_menu_append(GTK_MENU(menu), button);
@@ -1208,8 +1208,8 @@
 			gtk_container_border_width(GTK_CONTAINER(win), 0);
 			gtk_widget_realize(win);
 			gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Group Chats"));
-			gtk_signal_connect(GTK_OBJECT(win), "delete_event",
-					   GTK_SIGNAL_FUNC(delete_all_convo), NULL);
+			g_signal_connect(GTK_OBJECT(win), "delete_event",
+					   G_CALLBACK(delete_all_convo), NULL);
 
 			chat_notebook = gtk_notebook_new();
 			if ((convo_options & OPT_CONVO_COMBINE) && (im_options & OPT_IM_ONE_WINDOW))
@@ -1239,8 +1239,8 @@
 			gtk_notebook_set_scrollable(GTK_NOTEBOOK(chat_notebook), TRUE);
 			gtk_notebook_popup_enable(GTK_NOTEBOOK(chat_notebook));
 			gtk_container_add(GTK_CONTAINER(win), testidea);
-			gtk_signal_connect(GTK_OBJECT(chat_notebook), "switch-page",
-					   GTK_SIGNAL_FUNC(convo_switch), NULL);
+			g_signal_connect(GTK_OBJECT(chat_notebook), "switch-page",
+					   G_CALLBACK(convo_switch), NULL);
 			gtk_widget_show(chat_notebook);
 		} else
 			win = b->window = all_chats;
@@ -1255,7 +1255,7 @@
 		gtk_button_set_relief(GTK_BUTTON(b->close), GTK_RELIEF_NONE);
 		b->tab_label = gtk_label_new(b->name);
 
-		gtk_signal_connect(GTK_OBJECT(b->close), "clicked", GTK_SIGNAL_FUNC(close_callback), b);
+		g_signal_connect(GTK_OBJECT(b->close), "clicked", G_CALLBACK(close_callback), b);
 
 		gtk_box_pack_start(GTK_BOX(tabby), b->tab_label, FALSE, FALSE, 0);
 		gtk_box_pack_start(GTK_BOX(tabby), b->close, FALSE, FALSE, 0);
@@ -1272,7 +1272,7 @@
 		gtk_widget_realize(win);
 		g_snprintf(buf, sizeof(buf), "Gaim - %s (chat)", b->name);
 		gtk_window_set_title(GTK_WINDOW(win), buf);
-		gtk_signal_connect(GTK_OBJECT(win), "destroy", GTK_SIGNAL_FUNC(close_callback), b);
+		g_signal_connect(GTK_OBJECT(win), "destroy", G_CALLBACK(close_callback), b);
 
 		cont = gtk_vbox_new(FALSE, 5);
 		gtk_container_add(GTK_CONTAINER(win), cont);
@@ -1342,14 +1342,14 @@
 	rend = gtk_cell_renderer_text_new();
 	col = gtk_tree_view_column_new_with_attributes(NULL, rend, "text", 0, NULL);
 	gtk_tree_view_column_set_clickable(GTK_TREE_VIEW_COLUMN(col), TRUE);
-	gtk_signal_connect(GTK_OBJECT(list), "button_press_event",
-		GTK_SIGNAL_FUNC(right_click_chat), b);
+	g_signal_connect(GTK_OBJECT(list), "button_press_event",
+		G_CALLBACK(right_click_chat), b);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
 
 	col = gtk_tree_view_column_new_with_attributes(NULL, rend, "text", 1, NULL);
 	gtk_tree_view_column_set_clickable(GTK_TREE_VIEW_COLUMN(col), TRUE);
-	gtk_signal_connect(GTK_OBJECT(list), "button_press_event",
-		GTK_SIGNAL_FUNC(right_click_chat), b);
+	g_signal_connect(GTK_OBJECT(list), "button_press_event",
+		G_CALLBACK(right_click_chat), b);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
 
 	gtk_widget_set_usize(list, 150, -1);
@@ -1367,19 +1367,19 @@
 	button = gaim_pixbuf_button_from_stock(NULL, "gtk-redo", GAIM_BUTTON_VERTICAL);
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(im_callback), b);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(im_callback), b);
 	gtk_widget_show(button);
 
 	button = gaim_pixbuf_button_from_stock(NULL, "gtk-dialog-error", GAIM_BUTTON_VERTICAL);
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ignore_callback), b);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(ignore_callback), b);
 	gtk_widget_show(button);
 
 	button = gaim_pixbuf_button_from_stock(NULL, "gtk-find", GAIM_BUTTON_VERTICAL);
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(info_callback), b);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(info_callback), b);
 	gtk_widget_show(button);
 	b->info = button;
 
@@ -1427,7 +1427,7 @@
 	close = picture_button2(win, _("Close"), cancel_xpm, dispstyle);
 	b->close = close;
 	gtk_object_set_user_data(GTK_OBJECT(close), b);
-	gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback), b);
+	g_signal_connect(GTK_OBJECT(close), "clicked", G_CALLBACK(close_callback), b);
 	gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0);
 	*/
 
@@ -1438,7 +1438,7 @@
 				GAIM_BUTTON_VERTICAL);
 
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(send_callback), b);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(send_callback), b);
 	gtk_widget_show(button);
 	gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	b->send = button;
@@ -1453,7 +1453,7 @@
 				(dispstyle == 1 ? NULL : "gtk-jump-to"),
 				GAIM_BUTTON_VERTICAL);
 
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(invite_callback), b);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(invite_callback), b);
 	gtk_widget_show(button);
 	gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
@@ -1548,10 +1548,10 @@
 			gtk_box_pack_end(GTK_BOX(parent), c->send, FALSE, FALSE, 0);
 			gtk_box_pack_end(GTK_BOX(parent), c->invite, FALSE, FALSE, 0);
 
-			gtk_signal_connect(GTK_OBJECT(c->send), "clicked",
-					   GTK_SIGNAL_FUNC(send_callback), c);
-			gtk_signal_connect(GTK_OBJECT(c->invite), "clicked",
-					   GTK_SIGNAL_FUNC(invite_callback), c);
+			g_signal_connect(GTK_OBJECT(c->send), "clicked",
+					   G_CALLBACK(send_callback), c);
+			g_signal_connect(GTK_OBJECT(c->invite), "clicked",
+					   G_CALLBACK(invite_callback), c);
 
 			gtk_button_set_relief(GTK_BUTTON(c->send), GTK_RELIEF_NONE);
 			gtk_button_set_relief(GTK_BUTTON(c->invite), GTK_RELIEF_NONE);
@@ -1619,10 +1619,10 @@
 
 		update_buttons_by_protocol(c);
 
-		gtk_signal_connect(GTK_OBJECT(c->send), "clicked", GTK_SIGNAL_FUNC(send_callback), c);
-		gtk_signal_connect(GTK_OBJECT(c->info), "clicked", GTK_SIGNAL_FUNC(info_callback), c);
-		gtk_signal_connect(GTK_OBJECT(c->warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c);
-		gtk_signal_connect(GTK_OBJECT(c->block), "clicked", GTK_SIGNAL_FUNC(block_callback), c);
+		g_signal_connect(GTK_OBJECT(c->send), "clicked", G_CALLBACK(send_callback), c);
+		g_signal_connect(GTK_OBJECT(c->info), "clicked", G_CALLBACK(info_callback), c);
+		g_signal_connect(GTK_OBJECT(c->warn), "clicked", G_CALLBACK(warn_callback), c);
+		g_signal_connect(GTK_OBJECT(c->block), "clicked", G_CALLBACK(block_callback), c);
 		bcs = bcs->next;
 	}
 }
@@ -1650,7 +1650,7 @@
 			gtk_widget_reparent(imhtml, c->sw);
 			c->text = imhtml;
 			gtk_signal_disconnect_by_func(GTK_OBJECT(win),
-						      GTK_SIGNAL_FUNC(close_callback), c);
+						      G_CALLBACK(close_callback), c);
 			gtk_widget_destroy(win);
 
 			if (c->topic)

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -d -r1.455 -r1.456
--- conversation.c	31 Dec 2002 18:19:13 -0000	1.455
+++ conversation.c	31 Dec 2002 19:32:36 -0000	1.456
@@ -201,7 +201,7 @@
 	if (!(convo_options & OPT_CONVO_SHOW_SMILEY))
 		gtk_imhtml_show_smileys(GTK_IMHTML(imhtml), FALSE);
 
-	gtk_signal_connect(GTK_OBJECT(imhtml), "url_clicked", GTK_SIGNAL_FUNC(open_url), NULL);
+	g_signal_connect(GTK_OBJECT(imhtml), "url_clicked", G_CALLBACK(open_url), NULL);
 	gaim_setup_imhtml_smileys(imhtml);	
 }
 
@@ -512,10 +512,10 @@
 	g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S "%s.log", gaim_home_dir(), normalize(c->name));
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf);
 	gtk_object_set_user_data(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), c);
-	gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
-			   "clicked", GTK_SIGNAL_FUNC(do_save_convo), window);
-	gtk_signal_connect_object(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button),
-				  "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), (gpointer)window);
+	g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
+			   "clicked", G_CALLBACK(do_save_convo), window);
+	g_signal_connect_swapped(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button),
+				  "clicked", G_CALLBACK(gtk_widget_destroy), (gpointer)window);
 	gtk_widget_show(window);
 }
 
@@ -560,10 +560,10 @@
 	g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S, gaim_home_dir());
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf);
 	gtk_object_set_user_data(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), c);
-	gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
-			   "clicked", GTK_SIGNAL_FUNC(do_insert_image), window);
-	gtk_signal_connect_object(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button),
-				  "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), (gpointer)window);
+	g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
+			   "clicked", G_CALLBACK(do_insert_image), window);
+	g_signal_connect_swapped(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button),
+				  "clicked", G_CALLBACK(gtk_widget_destroy), (gpointer)window);
 	gtk_widget_show(window);
 }
 
@@ -2195,22 +2195,22 @@
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
 
-	gaim_new_item_from_stock(menu, _("_Save Conversation"), "gtk-save-as", GTK_SIGNAL_FUNC(save_convo), c, 0, 0, NULL); 
+	gaim_new_item_from_stock(menu, _("_Save Conversation"), "gtk-save-as", G_CALLBACK(save_convo), c, 0, 0, NULL); 
 
-	gaim_new_item_from_stock(menu, _("View _History"), NULL, GTK_SIGNAL_FUNC(conv_show_log), GINT_TO_POINTER(c->name), 0, 0, NULL); 
+	gaim_new_item_from_stock(menu, _("View _History"), NULL, G_CALLBACK(conv_show_log), GINT_TO_POINTER(c->name), 0, 0, NULL); 
 
 	menuitem = gtk_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 /*
 	c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL); */
 
-	gaim_new_item_from_pixbuf(menu, _("Insert _URL"), "insert-link-small.png", GTK_SIGNAL_FUNC(insert_link_cb), c, 0, 0, NULL); 
-	c->image_menubtn = gaim_new_item_from_pixbuf(menu, _("Insert _Image"), "insert-image-small.png", GTK_SIGNAL_FUNC(insert_image), c, 0, 0, NULL); 
+	gaim_new_item_from_pixbuf(menu, _("Insert _URL"), "insert-link-small.png", G_CALLBACK(insert_link_cb), c, 0, 0, NULL); 
+	c->image_menubtn = gaim_new_item_from_pixbuf(menu, _("Insert _Image"), "insert-image-small.png", G_CALLBACK(insert_image), c, 0, 0, NULL); 
 
 	menuitem = gtk_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-	gaim_new_item_from_stock(menu, _("_Close"), "gtk-close", GTK_SIGNAL_FUNC(close_callback), c, 0, 0, NULL); 
+	gaim_new_item_from_stock(menu, _("_Close"), "gtk-close", G_CALLBACK(close_callback), c, 0, 0, NULL); 
 
 	/* The Options  menu */
 	menu = gtk_menu_new();
@@ -2232,7 +2232,7 @@
 
 	state_lock = 0;
 
-	gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(toggle_loggle), c);
+	g_signal_connect(GTK_OBJECT(menuitem), "toggled", G_CALLBACK(toggle_loggle), c);
 
 	/* Sounds */
 
@@ -2240,7 +2240,7 @@
 
 	menuitem = gtk_check_menu_item_new_with_mnemonic(_("Enable _Sounds"));
 	c->makesound = 1;
-	gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(toggle_sound), c);
+	g_signal_connect(GTK_OBJECT(menuitem), "toggled", G_CALLBACK(toggle_sound), c);
 	state_lock = 1;
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 	state_lock = 0;
@@ -2294,21 +2294,21 @@
 		button = gaim_pixbuf_toolbar_button_from_stock("gtk-bold");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_bold), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_bold), c);
 		c->bold = button; /* We should remember this */
 
 		/* Italic */
 		button = gaim_pixbuf_toolbar_button_from_stock("gtk-italic");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_italic), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_italic), c);
 		c->italic = button; /* We should remember this */
 
 		/* Underline */
 		button = gaim_pixbuf_toolbar_button_from_stock("gtk-underline");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_underline), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_underline), c);
 		c->underline = button; /* We should remember this */
 
 		/* Sep */
@@ -2319,20 +2319,20 @@
 		button = gaim_pixbuf_toolbar_button_from_file("text_bigger.png");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_big), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_big), c);
 		
 		/* Normal Font Size */
 		button = gaim_pixbuf_toolbar_button_from_file("text_normal.png");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_normal), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_normal), c);
 		c->font = button; /* We should remember this */
 		
 		/* Decrease font size */
 		button = gaim_pixbuf_toolbar_button_from_file("text_smaller.png");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_small), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_small), c);
 
 		/* Sep */
 		sep = gtk_vseparator_new();
@@ -2342,14 +2342,14 @@
 		button = gaim_pixbuf_toolbar_button_from_file("change-fgcolor-small.png");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_fg_color), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_fg_color), c);
 		c->fgcolorbtn = button; /* We should remember this */
 
 		/* Font Color */
 		button = gaim_pixbuf_toolbar_button_from_file("change-bgcolor-small.png");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_bg_color), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_bg_color), c);
 		c->bgcolorbtn = button; /* We should remember this */
 
 
@@ -2359,21 +2359,21 @@
 
 		/* Insert IM Image  */
 		button = gaim_pixbuf_toolbar_button_from_file("insert-image-small.png");
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_image), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(insert_image), c);
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 		c->imagebtn = button;
 
 		/* Insert Link  */
 		button = gaim_pixbuf_toolbar_button_from_file("insert-link-small.png");
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_link), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_link), c);
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 		c->link = button;
 
 		/* Insert Smiley */
 		button = gaim_pixbuf_toolbar_button_from_file("insert-smiley-small.png");
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_smiley), c);
+		g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(insert_smiley), c);
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 		c->smiley = button;
@@ -2476,7 +2476,7 @@
 	}
 
 	if (rebuild) {
-		gtk_signal_connect(GTK_OBJECT(c->add), "clicked", GTK_SIGNAL_FUNC(add_callback), c);
+		g_signal_connect(GTK_OBJECT(c->add), "clicked", G_CALLBACK(add_callback), c);
 		gtk_box_pack_start(GTK_BOX(parent), c->add, FALSE, FALSE, 0);
 		gtk_box_reorder_child(GTK_BOX(parent), c->add, 3);
 		gtk_button_set_relief(GTK_BUTTON(c->add), GTK_RELIEF_NONE);
@@ -2502,8 +2502,8 @@
 			g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name);
 			opt = gtk_menu_item_new_with_label(buf);
 			gtk_object_set_user_data(GTK_OBJECT(opt), cnv);
-			gtk_signal_connect(GTK_OBJECT(opt), "activate",
-					   GTK_SIGNAL_FUNC(convo_sel_send), c);
+			g_signal_connect(GTK_OBJECT(opt), "activate",
+					   G_CALLBACK(convo_sel_send), c);
 			gtk_widget_show(opt);
 			gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
 			g = g->next;
@@ -2844,8 +2844,8 @@
 			gtk_container_border_width(GTK_CONTAINER(win), 0);
 			gtk_widget_realize(win);
 			gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Conversations"));
-			gtk_signal_connect(GTK_OBJECT(win), "delete_event",
-					   GTK_SIGNAL_FUNC(delete_all_convo), NULL);
+			g_signal_connect(GTK_OBJECT(win), "delete_event",
+					   G_CALLBACK(delete_all_convo), NULL);
 
 			convo_notebook = gtk_notebook_new();
 			if ((convo_options & OPT_CONVO_COMBINE) && (chat_options & OPT_CHAT_ONE_WINDOW))
@@ -2880,8 +2880,8 @@
 			convo_menubar = menubar;
 
 			gtk_container_add(GTK_CONTAINER(win), testidea);
-			gtk_signal_connect(GTK_OBJECT(convo_notebook), "switch-page",
-					   GTK_SIGNAL_FUNC(convo_switch), NULL);
+			g_signal_connect(GTK_OBJECT(convo_notebook), "switch-page",
+					   G_CALLBACK(convo_switch), NULL);
 		} else
 			win = c->window = all_convos;
 
@@ -2896,7 +2896,7 @@
 		gtk_button_set_relief(GTK_BUTTON(c->close), GTK_RELIEF_NONE);
 		c->tab_label = gtk_label_new(c->name);
 
-		gtk_signal_connect(GTK_OBJECT(c->close), "clicked", GTK_SIGNAL_FUNC(close_callback), c);
+		g_signal_connect(GTK_OBJECT(c->close), "clicked", G_CALLBACK(close_callback), c);
 
 		gtk_box_pack_start(GTK_BOX(tabby), c->tab_label, FALSE, FALSE, 0);
 		gtk_box_pack_start(GTK_BOX(tabby), c->close, FALSE, FALSE, 0);
@@ -2913,8 +2913,8 @@
 		gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
 		gtk_container_border_width(GTK_CONTAINER(win), 0);
 		gtk_widget_realize(win);
-		gtk_signal_connect(GTK_OBJECT(win), "delete_event",
-				   GTK_SIGNAL_FUNC(delete_event_convo), c);
+		g_signal_connect(GTK_OBJECT(win), "delete_event",
+				   G_CALLBACK(delete_event_convo), c);
 	}
 	set_convo_title(c);
 
@@ -3017,7 +3017,7 @@
 	close = picture_button2(win, _("Close"), cancel_xpm, dispstyle);
 	c->close = close;
 	gtk_object_set_user_data(GTK_OBJECT(close), c);
-	gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback), c);
+	g_signal_connect(GTK_OBJECT(close), "clicked", G_CALLBACK(close_callback), c);
 	gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0);
 	gtk_widget_show(close);
 	
@@ -3032,7 +3032,7 @@
 				(dispstyle == 1 ? NULL : "gtk-convert"),
 				GAIM_BUTTON_VERTICAL);
 	c->send = send;
-	gtk_signal_connect(GTK_OBJECT(send), "clicked", GTK_SIGNAL_FUNC(send_callback), c);
+	g_signal_connect(GTK_OBJECT(send), "clicked", G_CALLBACK(send_callback), c);
 	gtk_box_pack_end(GTK_BOX(bbox), send, FALSE, FALSE, 0);
 	gtk_widget_show(send);
 
@@ -3055,7 +3055,7 @@
 				GAIM_BUTTON_VERTICAL);
 
 	c->add = add;
-	gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(add_callback), c);
+	g_signal_connect(GTK_OBJECT(add), "clicked", G_CALLBACK(add_callback), c);
 	gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 0);
 	gtk_widget_show(add);
 
@@ -3064,7 +3064,7 @@
 				(dispstyle == 1 ? NULL : "gtk-dialog-warning"),
 				GAIM_BUTTON_VERTICAL);
 	c->warn = warn;
-	gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c);
+	g_signal_connect(GTK_OBJECT(warn), "clicked", G_CALLBACK(warn_callback), c);
 	gtk_box_pack_start(GTK_BOX(bbox), warn, FALSE, FALSE, 0);
 	gtk_widget_show(warn);
 
@@ -3073,7 +3073,7 @@
 				(dispstyle == 1 ? NULL : "gtk-find"),
 				GAIM_BUTTON_VERTICAL);
 	c->info = info;
-	gtk_signal_connect(GTK_OBJECT(info), "clicked", GTK_SIGNAL_FUNC(info_callback), c);
+	g_signal_connect(GTK_OBJECT(info), "clicked", G_CALLBACK(info_callback), c);
 	gtk_box_pack_start(GTK_BOX(bbox), info, FALSE, FALSE, 0);
 	gtk_widget_show(info);
 
@@ -3083,7 +3083,7 @@
 				(dispstyle == 1 ? NULL : "gtk-stop"),
 				GAIM_BUTTON_VERTICAL);
 	c->block = block;
-	gtk_signal_connect(GTK_OBJECT(block), "clicked", GTK_SIGNAL_FUNC(block_callback), c);
+	g_signal_connect(GTK_OBJECT(block), "clicked", G_CALLBACK(block_callback), c);
 	gtk_box_pack_start(GTK_BOX(bbox), block, FALSE, FALSE, 0);
 	gtk_widget_show(block);
 
@@ -3584,12 +3584,12 @@
 	gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(c->save_icon));
 	g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S "%s.icon", gaim_home_dir(), c->name);
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(c->save_icon), buf);
-	gtk_signal_connect(GTK_OBJECT(c->save_icon), "delete_event",
-			   GTK_SIGNAL_FUNC(des_save_icon), c);
-	gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->save_icon)->ok_button), "clicked",
-			   GTK_SIGNAL_FUNC(do_save_icon), c);
-	gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->save_icon)->cancel_button), "clicked",
-			   GTK_SIGNAL_FUNC(cancel_save_icon), c);
+	g_signal_connect(GTK_OBJECT(c->save_icon), "delete_event",
+			   G_CALLBACK(des_save_icon), c);
+	g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->save_icon)->ok_button), "clicked",
+			   G_CALLBACK(do_save_icon), c);
+	g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->save_icon)->cancel_button), "clicked",
+			   G_CALLBACK(cancel_save_icon), c);
 
 	gtk_widget_show(c->save_icon);
 }
@@ -3615,26 +3615,26 @@
 
 	if (c->icon_timer) {
 		button = gtk_menu_item_new_with_label(_("Disable Animation"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(stop_anim), c);
+		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(stop_anim), c);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
 		gtk_widget_show(button);
 	}
 	 else if (c->anim && !(gdk_pixbuf_animation_is_static_image(c->anim))) 
 	{
 		button = gtk_menu_item_new_with_label(_("Enable Animation"));
-		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(start_anim), c);
+		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(start_anim), c);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
 		gtk_widget_show(button);
 	}
 
 	button = gtk_menu_item_new_with_label(_("Hide Icon"));
-	gtk_signal_connect_object(GTK_OBJECT(button), "activate",
-				  GTK_SIGNAL_FUNC(remove_icon), (void *)c);
+	g_signal_connect_swapped(GTK_OBJECT(button), "activate",
+				  G_CALLBACK(remove_icon), (void *)c);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
 	gtk_widget_show(button);
 
 	button = gtk_menu_item_new_with_label(_("Save Icon As..."));
-	gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(save_icon), c);
+	g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(save_icon), c);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
 	gtk_widget_show(button);
 
@@ -3744,7 +3744,7 @@
 
 	event = gtk_event_box_new();
 	gtk_container_add(GTK_CONTAINER(frame), event);
-	gtk_signal_connect(GTK_OBJECT(event), "button-press-event", GTK_SIGNAL_FUNC(icon_menu), c);
+	g_signal_connect(GTK_OBJECT(event), "button-press-event", G_CALLBACK(icon_menu), c);
 	gtk_widget_show(event);
 
 	c->icon = gtk_pixmap_new(pm, bm);

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -d -r1.389 -r1.390
--- dialogs.c	26 Dec 2002 00:15:43 -0000	1.389
+++ dialogs.c	31 Dec 2002 19:32:36 -0000	1.390
@@ -753,8 +753,8 @@
 				opt = gtk_menu_item_new_with_label(buf);
 				gtk_object_set_user_data(GTK_OBJECT(opt), info);
 				
-				gtk_signal_connect(GTK_OBJECT(opt), "activate",
-						   GTK_SIGNAL_FUNC(show_info_select_account), c);
+				g_signal_connect(GTK_OBJECT(opt), "activate",
+						   G_CALLBACK(show_info_select_account), c);
 				
 				gtk_menu_append(GTK_MENU(menu), opt);
 				g = g->next;
@@ -847,8 +847,8 @@
 			opt = gtk_menu_item_new_with_label(buf);
 			gtk_object_set_user_data(GTK_OBJECT(opt), info);
 
-			gtk_signal_connect(GTK_OBJECT(opt), "activate",
-					   GTK_SIGNAL_FUNC(show_info_select_account), c);
+			g_signal_connect(GTK_OBJECT(opt), "activate",
+					   G_CALLBACK(show_info_select_account), c);
 
 			gtk_menu_append(GTK_MENU(menu), opt);
 			g = g->next;
@@ -1020,8 +1020,8 @@
 				c->username, c->prpl->name);
 		opt = gtk_menu_item_new_with_label(buf);
 		gtk_object_set_user_data(GTK_OBJECT(opt), b);
-		gtk_signal_connect(GTK_OBJECT(opt), "activate",
-				GTK_SIGNAL_FUNC(addbuddy_select_account),
+		g_signal_connect(GTK_OBJECT(opt), "activate",
+				G_CALLBACK(addbuddy_select_account),
 				c);
 		gtk_widget_show(opt);
 		gtk_menu_append(GTK_MENU(menu), opt);
@@ -1068,8 +1068,8 @@
 	gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy"));
 
 	gtk_widget_realize(a->window);
-	gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), a->window);
-	gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(free_dialog), a);
+	g_signal_connect(GTK_OBJECT(a->window), "destroy", G_CALLBACK(destroy_dialog), a->window);
+	g_signal_connect(GTK_OBJECT(a->window), "destroy", G_CALLBACK(free_dialog), a);
 	dialogwindows = g_list_prepend(dialogwindows, a->window);
 
 	mainbox = gtk_vbox_new(FALSE, 5);
@@ -1094,7 +1094,7 @@
 	gtk_widget_grab_focus(a->entry);
 	if (buddy != NULL)
 		gtk_entry_set_text(GTK_ENTRY(a->entry), buddy);
-	gtk_signal_connect(GTK_OBJECT(a->entry), "activate", GTK_SIGNAL_FUNC(do_add_buddy), a);
+	g_signal_connect(GTK_OBJECT(a->entry), "activate", G_CALLBACK(do_add_buddy), a);
 
 	label = gtk_label_new(_("Alias"));
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
@@ -1127,11 +1127,11 @@
 
 	add = picture_button(a->window, _("Add"), add_xpm);
 	gtk_box_pack_end(GTK_BOX(bbox), add, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_add_buddy), a);
+	g_signal_connect(GTK_OBJECT(add), "clicked", G_CALLBACK(do_add_buddy), a);
 
 	cancel = picture_button(a->window, _("Cancel"), cancel_xpm);
 	gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), a->window);
+	g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), a->window);
 
 	gtk_widget_show_all(a->window);
 	if (group != NULL) 
@@ -1171,7 +1171,7 @@
 		    gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)),
 						    label);
 	gtk_box_pack_start(GTK_BOX(box), opt, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(opt), "toggled", GTK_SIGNAL_FUNC(set_deny_mode), (void *)which);
+	g_signal_connect(GTK_OBJECT(opt), "toggled", G_CALLBACK(set_deny_mode), (void *)which);
 	gtk_widget_show(opt);
 	if (current_deny_gc->permdeny == which)
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE);
@@ -1298,7 +1298,7 @@
 			continue;
 		g_snprintf(buf, sizeof buf, "%s (%s)", gc->username, gc->prpl->name);
 		opt = gtk_menu_item_new_with_label(buf);
-		gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(deny_gc_opt), gc);
+		g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(deny_gc_opt), gc);
 		gtk_widget_show(opt);
 		gtk_menu_append(GTK_MENU(menu), opt);
 		if (gc == current_deny_gc)
@@ -1411,7 +1411,7 @@
 	gtk_window_set_policy(GTK_WINDOW(pwin), FALSE, TRUE, TRUE);
 	gtk_window_set_role(GTK_WINDOW(pwin), "privacy");
 	gtk_window_set_title(GTK_WINDOW(pwin), _("Gaim - Privacy"));
-	gtk_signal_connect(GTK_OBJECT(pwin), "destroy", GTK_SIGNAL_FUNC(destroy_privacy), NULL);
+	g_signal_connect(GTK_OBJECT(pwin), "destroy", G_CALLBACK(destroy_privacy), NULL);
 	gtk_widget_realize(pwin);
 
 	gtk_widget_set_usize(pwin, 0, 400);
@@ -1435,7 +1435,7 @@
 
 	deny_opt_menu = gtk_option_menu_new();
 	gtk_box_pack_start(GTK_BOX(deny_conn_hbox), deny_opt_menu, FALSE, FALSE, 5);
-	gtk_signal_connect(GTK_OBJECT(deny_opt_menu), "destroy", GTK_SIGNAL_FUNC(des_deny_opt), NULL);
+	g_signal_connect(GTK_OBJECT(deny_opt_menu), "destroy", G_CALLBACK(des_deny_opt), NULL);
 	gtk_widget_show(deny_opt_menu);
 
 	build_deny_menu();
@@ -1472,11 +1472,11 @@
 	gtk_widget_show(bbox);
 
 	button = picture_button(pwin, _("Add"), gnome_add_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pref_deny_add), (void *)TRUE);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_add), (void *)TRUE);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);
 
 	button = picture_button(pwin, _("Remove"), gnome_remove_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pref_deny_rem), (void *)TRUE);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_rem), (void *)TRUE);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);
 
 	vbox = gtk_vbox_new(FALSE, 5);
@@ -1506,11 +1506,11 @@
 	gtk_widget_show(bbox);
 
 	button = picture_button(pwin, _("Add"), gnome_add_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pref_deny_add), FALSE);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_add), FALSE);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);
 
 	button = picture_button(pwin, _("Remove"), gnome_remove_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pref_deny_rem), FALSE);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_rem), FALSE);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);
 
 	sep = gtk_hseparator_new();
@@ -1522,7 +1522,7 @@
 	gtk_widget_show(hbox);
 	close_button = picture_button(pwin, _("Close"), cancel_xpm);
 	gtk_box_pack_end(GTK_BOX(hbox), close_button, FALSE, FALSE, 5);
-	gtk_signal_connect_object(GTK_OBJECT(close_button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), pwin);
+	g_signal_connect_swapped(GTK_OBJECT(close_button), "clicked", G_CALLBACK(gtk_widget_destroy), pwin);
 
 	gtk_widget_show(pwin);
 }
@@ -1629,7 +1629,7 @@
 		g_snprintf(buf, sizeof buf, "%s (%s)", a->username, (p && p->name)?p->name:"Unknown");
 		opt = gtk_menu_item_new_with_label(buf);
 		gtk_object_set_user_data(GTK_OBJECT(opt), a);
-		gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(pounce_choose), b);
+		g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(pounce_choose), b);
 		gtk_menu_append(GTK_MENU(menu), opt);
 		gtk_widget_show(opt);
 
@@ -1679,7 +1679,7 @@
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_role(GTK_WINDOW(b->window), "new_bp");
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce"));
-	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
+	g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
 	gtk_widget_realize(b->window);
 
 	vbox = gtk_vbox_new(FALSE, 5);
@@ -1812,7 +1812,7 @@
 
 	b->messentry = gtk_entry_new();
 	gtk_table_attach(GTK_TABLE(table), b->messentry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
-	gtk_signal_connect(GTK_OBJECT(b->messentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b);
+	g_signal_connect(GTK_OBJECT(b->messentry), "activate", G_CALLBACK(do_new_bp), b);
 	if(edit_bp) {
 		gtk_widget_set_sensitive(GTK_WIDGET(b->messentry), 
 					(edit_bp->options & OPT_POUNCE_SEND_IM) ? TRUE : FALSE);
@@ -1820,7 +1820,7 @@
 	}
 	gtk_widget_show(b->messentry);
 
-	gtk_signal_connect(GTK_OBJECT(b->sendim), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive),	b->messentry);
+	g_signal_connect...
 
[truncated message content]