# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1041391148 0
# Node ID 07a3d1fae88f05f10a870260817681642071f7d5
# Parent  a55c2a0ddcd41c27befd20f0bfb54e8a2d3110fe
[gaim-migrate @ 4394]
gtk_signal_connect() -> g_signal_connect().

committer: Tailor Script <tailor@pidgin.im>

diff -r a55c2a0ddcd4 -r 07a3d1fae88f plugins/chatlist.c
--- a/plugins/chatlist.c	Wed Jan 01 03:03:25 2003 +0000
+++ b/plugins/chatlist.c	Wed Jan 01 03:19:08 2003 +0000
@@ -66,7 +66,7 @@
 		return;
 
 	item = gtk_tree_item_new_with_label(_("Buddy Chat"));
-	gtk_signal_connect(GTK_OBJECT(item), "destroy", GTK_SIGNAL_FUNC(des_item), NULL);
+	g_signal_connect(GTK_OBJECT(item), "destroy", G_CALLBACK(des_item), NULL);
 	gtk_tree_append(GTK_TREE(buddies), item);
 	gtk_tree_item_expand(GTK_TREE_ITEM(item));
 	gtk_widget_show(item);
@@ -81,8 +81,8 @@
 		gtk_object_set_user_data(GTK_OBJECT(titem), cr);
 		gtk_tree_append(GTK_TREE(tree), titem);
 		gtk_widget_show(titem);
-		gtk_signal_connect(GTK_OBJECT(titem), "button_press_event",
-				   GTK_SIGNAL_FUNC(handle_click_chat), cr);
+		g_signal_connect(GTK_OBJECT(titem), "button_press_event",
+				   G_CALLBACK(handle_click_chat), cr);
 		crs = crs->next;
 	}
 
@@ -325,9 +325,9 @@
 	cp->list1 = list1;
 	cp->list2 = list2;
 
-	gtk_signal_connect(GTK_OBJECT(ref_button), "clicked", GTK_SIGNAL_FUNC(refresh_list), cp);
-	gtk_signal_connect(GTK_OBJECT(rem_button), "clicked", GTK_SIGNAL_FUNC(remove_chat), cp);
-	gtk_signal_connect(GTK_OBJECT(add_button), "clicked", GTK_SIGNAL_FUNC(add_chat), cp);
+	g_signal_connect(GTK_OBJECT(ref_button), "clicked", G_CALLBACK(refresh_list), cp);
+	g_signal_connect(GTK_OBJECT(rem_button), "clicked", G_CALLBACK(remove_chat), cp);
+	g_signal_connect(GTK_OBJECT(add_button), "clicked", G_CALLBACK(add_chat), cp);
 
 	label = gtk_label_new(_("List of available chats"));
 	gtk_widget_show(label);
diff -r a55c2a0ddcd4 -r 07a3d1fae88f plugins/gtik.c
--- a/plugins/gtik.c	Wed Jan 01 03:03:25 2003 +0000
+++ b/plugins/gtik.c	Wed Jan 01 03:19:08 2003 +0000
@@ -735,12 +735,12 @@
 		gtk_box_pack_start_defaults( GTK_BOX(panel2), timeout_label );
 		gtk_box_pack_start_defaults( GTK_BOX(panel2), timeout_c );
 	
-		gtk_signal_connect_object(GTK_OBJECT(timeout_c), "changed",GTK_SIGNAL_FUNC(changed_cb),GTK_OBJECT(pb));
+		g_signal_connect_swapped(GTK_OBJECT(timeout_c), "changed",G_CALLBACK(changed_cb),GTK_OBJECT(pb));
 
-		gtk_signal_connect( GTK_OBJECT(timeout_a),"value_changed",
-		GTK_SIGNAL_FUNC(timeout_cb), timeout_c );
-		gtk_signal_connect( GTK_OBJECT(timeout_c),"changed",
-		GTK_SIGNAL_FUNC(timeout_cb), timeout_c );
+		g_signal_connect( GTK_OBJECT(timeout_a),"value_changed",
+		G_CALLBACK(timeout_cb), timeout_c );
+		g_signal_connect( GTK_OBJECT(timeout_c),"changed",
+		G_CALLBACK(timeout_cb), timeout_c );
 		gtk_spin_button_set_update_policy( GTK_SPIN_BUTTON(timeout_c),
 		GTK_UPDATE_ALWAYS );
 
@@ -750,7 +750,7 @@
 
 		/* tik_syms var is her if want a default value */
 		gtk_entry_set_text(GTK_ENTRY(tik_syms_entry), props.tik_syms ? props.tik_syms : tik_syms);
-		gtk_signal_connect_object(GTK_OBJECT(tik_syms_entry), "changed",GTK_SIGNAL_FUNC(changed_cb),GTK_OBJECT(pb));
+		g_signal_connect_swapped(GTK_OBJECT(tik_syms_entry), "changed",G_CALLBACK(changed_cb),GTK_OBJECT(pb));
 
 		/* OUTPUT FORMAT and SCROLL DIRECTION */
 
@@ -767,19 +767,19 @@
 		if (strcmp(props.output,"default")!=0)
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check),
 							TRUE);
-		gtk_signal_connect_object(GTK_OBJECT(check),"toggled",
-				GTK_SIGNAL_FUNC(changed_cb),GTK_OBJECT(pb));
-		gtk_signal_connect(GTK_OBJECT(check),"toggled",
-				GTK_SIGNAL_FUNC(toggle_output_cb),NULL);
+		g_signal_connect_swapped(GTK_OBJECT(check),"toggled",
+				G_CALLBACK(changed_cb),GTK_OBJECT(pb));
+		g_signal_connect(GTK_OBJECT(check),"toggled",
+				G_CALLBACK(toggle_output_cb),NULL);
 
 		/* Set the checkbox according to current prefs */
 		if (strcmp(props.scroll,"right2left")!=0)
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check2),
 							TRUE);
-		gtk_signal_connect_object(GTK_OBJECT(check2),"toggled",
-				GTK_SIGNAL_FUNC(changed_cb),GTK_OBJECT(pb));
-		gtk_signal_connect(GTK_OBJECT(check2),"toggled",
-				GTK_SIGNAL_FUNC(toggle_scroll_cb),NULL);
+		g_signal_connect_swapped(GTK_OBJECT(check2),"toggled",
+				G_CALLBACK(changed_cb),GTK_OBJECT(pb));
+		g_signal_connect(GTK_OBJECT(check2),"toggled",
+				G_CALLBACK(toggle_scroll_cb),NULL);
 
 		/* COLOR */
 /*		upLabel = gtk_label_new(_("+ Color"));
@@ -790,8 +790,8 @@
 		gnome_color_picker_set_i8(GNOME_COLOR_PICKER (upColor), 
 					  ur, ug, ub, 255);
 		
-		gtk_signal_connect(GTK_OBJECT(upColor), "color_set",
-				GTK_SIGNAL_FUNC(ucolor_set_cb), NULL);
+		g_signal_connect(GTK_OBJECT(upColor), "color_set",
+				G_CALLBACK(ucolor_set_cb), NULL);
 
 		gtk_box_pack_start_defaults( GTK_BOX(panela), upLabel );
 		gtk_box_pack_start_defaults( GTK_BOX(panela), upColor );
@@ -804,8 +804,8 @@
 		gnome_color_picker_set_i8(GNOME_COLOR_PICKER (downColor), 
 					  dr, dg, db, 255);
 
-		gtk_signal_connect(GTK_OBJECT(downColor), "color_set",
-				GTK_SIGNAL_FUNC(dcolor_set_cb), NULL);
+		g_signal_connect(GTK_OBJECT(downColor), "color_set",
+				G_CALLBACK(dcolor_set_cb), NULL);
 
 		gtk_box_pack_start_defaults( GTK_BOX(panela), downLabel );
 		gtk_box_pack_start_defaults( GTK_BOX(panela), downColor );
@@ -830,12 +830,12 @@
 
 		gtk_container_add(GTK_CONTAINER(pb), vbox);
 
-		gtk_signal_connect_object(GTK_OBJECT(tik_syms_entry), 
-				   "changed",GTK_SIGNAL_FUNC(changed_cb),
+		g_signal_connect_swapped(GTK_OBJECT(tik_syms_entry), 
+				   "changed",G_CALLBACK(changed_cb),
 				   GTK_OBJECT(pb));
 
-		gtk_signal_connect(GTK_OBJECT(pb), "apply",
-				    GTK_SIGNAL_FUNC(apply_cb), NULL);
+		g_signal_connect(GTK_OBJECT(pb), "apply",
+				    G_CALLBACK(apply_cb), NULL);
 
 		gtk_widget_show_all(pb);
 	}
@@ -869,15 +869,15 @@
 		/* applet_widget_add (APPLET_WIDGET (applet), vbox); */
 		gtk_container_add(GTK_CONTAINER(applet), vbox);
 
-		gtk_signal_connect(GTK_OBJECT(drawing_area),"expose_event",
+		g_signal_connect(GTK_OBJECT(drawing_area),"expose_event",
 		(GtkSignalFunc) expose_event, NULL);
 
-		gtk_signal_connect(GTK_OBJECT(drawing_area),"configure_event",
+		g_signal_connect(GTK_OBJECT(drawing_area),"configure_event",
 		(GtkSignalFunc) configure_event, NULL);
 
 
-		destroycb = gtk_signal_connect(GTK_OBJECT(applet), "destroy",
-			GTK_SIGNAL_FUNC(remove_self), handle);
+		destroycb = g_signal_connect(GTK_OBJECT(applet), "destroy",
+			G_CALLBACK(remove_self), handle);
 
 
 
diff -r a55c2a0ddcd4 -r 07a3d1fae88f plugins/idle.c
--- a/plugins/idle.c	Wed Jan 01 03:03:25 2003 +0000
+++ b/plugins/idle.c	Wed Jan 01 03:19:08 2003 +0000
@@ -54,8 +54,8 @@
 	while (c) {
 		g = (struct gaim_connection *)c->data;
 		opt = gtk_menu_item_new_with_label(g->username);
-		gtk_signal_connect(GTK_OBJECT(opt), "activate",
-				   GTK_SIGNAL_FUNC(sel_gc), g);
+		g_signal_connect(GTK_OBJECT(opt), "activate",
+				   G_CALLBACK(sel_gc), g);
 		gtk_menu_append(GTK_MENU(menu), opt);
 		gtk_widget_show(opt);
 		c = g_slist_next(c);
@@ -120,7 +120,7 @@
 
 	button = gtk_button_new_with_mnemonic(_("_Set"));
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_idle), spinner);
+	g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(set_idle), spinner);
 
 	gtk_widget_show_all(ret);
 
diff -r a55c2a0ddcd4 -r 07a3d1fae88f plugins/mailchk.c
--- a/plugins/mailchk.c	Wed Jan 01 03:03:25 2003 +0000
+++ b/plugins/mailchk.c	Wed Jan 01 03:19:08 2003 +0000
@@ -64,7 +64,7 @@
 		mail = gtk_label_new("No mail messages.");
 		gtk_box_pack_start(GTK_BOX(vbox2), mail, FALSE, FALSE, 0);
 		gtk_box_reorder_child(GTK_BOX(vbox2), mail, 1);
-		gtk_signal_connect(GTK_OBJECT(mail), "destroy", GTK_SIGNAL_FUNC(maildes), NULL);
+		g_signal_connect(GTK_OBJECT(mail), "destroy", G_CALLBACK(maildes), NULL);
 		gtk_widget_show(mail);
 	}
 
diff -r a55c2a0ddcd4 -r 07a3d1fae88f plugins/notify.c
--- a/plugins/notify.c	Wed Jan 01 03:03:25 2003 +0000
+++ b/plugins/notify.c	Wed Jan 01 03:19:08 2003 +0000
@@ -508,12 +508,12 @@
 	toggle = gtk_check_button_new_with_mnemonic(_("_IM windows"));
 	gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), type & TYPE_IM);
-	gtk_signal_connect(GTK_OBJECT(toggle), "toggled", GTK_SIGNAL_FUNC(options), GINT_TO_POINTER(7));
+	g_signal_connect(GTK_OBJECT(toggle), "toggled", G_CALLBACK(options), GINT_TO_POINTER(7));
 
 	toggle = gtk_check_button_new_with_mnemonic(_("_Chat windows"));
 	gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), type & TYPE_CHAT);
-	gtk_signal_connect(GTK_OBJECT(toggle), "toggled", GTK_SIGNAL_FUNC(options), GINT_TO_POINTER(8));
+	g_signal_connect(GTK_OBJECT(toggle), "toggled", G_CALLBACK(options), GINT_TO_POINTER(8));
 
 	/*--------------*/
 	vbox = make_frame(ret, _("Notification Methods"));
diff -r a55c2a0ddcd4 -r 07a3d1fae88f plugins/raw.c
--- a/plugins/raw.c	Wed Jan 01 03:03:25 2003 +0000
+++ b/plugins/raw.c	Wed Jan 01 03:19:08 2003 +0000
@@ -110,7 +110,7 @@
 			gc = c;
 		g_snprintf(buf, sizeof buf, "%s (%s)", c->username, (*c->prpl->name)());
 		opt = gtk_menu_item_new_with_label(buf);
-		gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_gc), c);
+		g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(set_gc), c);
 		gtk_widget_show(opt);
 		gtk_menu_append(GTK_MENU(menu), opt);
 	}
@@ -131,7 +131,7 @@
 	gaim_signal_connect(h, event_signoff, redo_optmenu, me);
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(goodbye), NULL);
+	g_signal_connect(GTK_OBJECT(window), "delete_event", G_CALLBACK(goodbye), NULL);
 
 	hbox = gtk_hbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(window), hbox);
@@ -143,7 +143,7 @@
 
 	entry = gtk_entry_new();
 	gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
-	gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_it), NULL);
+	g_signal_connect(GTK_OBJECT(entry), "activate", G_CALLBACK(send_it), NULL);
 
 	gtk_widget_show_all(window);
 
diff -r a55c2a0ddcd4 -r 07a3d1fae88f plugins/spellchk.c
--- a/plugins/spellchk.c	Wed Jan 01 03:03:25 2003 +0000
+++ b/plugins/spellchk.c	Wed Jan 01 03:19:08 2003 +0000
@@ -394,10 +394,10 @@
 	gtk_clist_set_selection_mode(GTK_CLIST(list), GTK_SELECTION_BROWSE);
 	gtk_clist_column_titles_passive(GTK_CLIST(list));
 	gtk_container_add(GTK_CONTAINER(win), list);
-	gtk_signal_connect(GTK_OBJECT(list), "select_row",
-			   GTK_SIGNAL_FUNC(row_select), NULL);
-	gtk_signal_connect(GTK_OBJECT(list), "unselect_row",
-			   GTK_SIGNAL_FUNC(row_unselect), NULL);
+	g_signal_connect(GTK_OBJECT(list), "select_row",
+			   G_CALLBACK(row_select), NULL);
+	g_signal_connect(GTK_OBJECT(list), "unselect_row",
+			   G_CALLBACK(row_unselect), NULL);
 	gtk_widget_show(list);
 
 	hbox = gtk_hbox_new(FALSE, 2);
@@ -405,29 +405,29 @@
 	gtk_widget_show(hbox);
 
 	button = gtk_button_new_with_label("Add New");
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(list_add_new), NULL);
+	g_signal_connect(GTK_OBJECT(button), "clicked",
+			   G_CALLBACK(list_add_new), NULL);
 	gtk_box_pack_start(GTK_BOX(hbox), button, 0, 0, 0);
 	gtk_widget_set_usize(button, 100, 0);
 	gtk_widget_show(button);
 
 	button = gtk_button_new_with_label("Delete");
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(list_delete), NULL);
+	g_signal_connect(GTK_OBJECT(button), "clicked",
+			   G_CALLBACK(list_delete), NULL);
 	gtk_box_pack_start(GTK_BOX(hbox), button, 0, 0, 0);
 	gtk_widget_set_usize(button, 100, 0);
 	gtk_widget_show(button);
 
 	button = gtk_button_new_with_label("Cancel");
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(close_config), NULL);
+	g_signal_connect(GTK_OBJECT(button), "clicked",
+			   G_CALLBACK(close_config), NULL);
 	gtk_box_pack_start(GTK_BOX(hbox), button, 0, 0, 0);
 	gtk_widget_set_usize(button, 100, 0);
 	gtk_widget_show(button);
 
 	button = gtk_button_new_with_label("Save");
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(save_list), NULL);
+	g_signal_connect(GTK_OBJECT(button), "clicked",
+			   G_CALLBACK(save_list), NULL);
 	gtk_box_pack_start(GTK_BOX(hbox), button, 0, 0, 0);
 	gtk_widget_set_usize(button, 100, 0);
 	gtk_widget_show(button);
@@ -438,14 +438,14 @@
 
 	bad_entry = gtk_entry_new_with_max_length(40);
 	gtk_widget_set_usize(bad_entry, 96, 0);
-	gtk_signal_connect(GTK_OBJECT(bad_entry), "changed",
-			   GTK_SIGNAL_FUNC(bad_changed), NULL);
+	g_signal_connect(GTK_OBJECT(bad_entry), "changed",
+			   G_CALLBACK(bad_changed), NULL);
 	gtk_box_pack_start(GTK_BOX(hbox), bad_entry, 0, 0, 0);
 	gtk_widget_show(bad_entry);
 
 	good_entry = gtk_entry_new_with_max_length(255);
-	gtk_signal_connect(GTK_OBJECT(good_entry), "changed",
-			   GTK_SIGNAL_FUNC(good_changed), NULL);
+	g_signal_connect(GTK_OBJECT(good_entry), "changed",
+			   G_CALLBACK(good_changed), NULL);
 	gtk_container_add(GTK_CONTAINER(hbox), good_entry);
 	gtk_widget_show(good_entry);
 
diff -r a55c2a0ddcd4 -r 07a3d1fae88f plugins/ticker/ticker.c
--- a/plugins/ticker/ticker.c	Wed Jan 01 03:03:25 2003 +0000
+++ b/plugins/ticker/ticker.c	Wed Jan 01 03:19:08 2003 +0000
@@ -91,8 +91,8 @@
 		return;
 	debug_printf("Making ticker\n");
         tickerwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-        gtk_signal_connect (GTK_OBJECT(tickerwindow), "destroy",
-                GTK_SIGNAL_FUNC (BuddyTickerDestroyWindow), "WM destroy");
+        g_signal_connect (GTK_OBJECT(tickerwindow), "destroy",
+                G_CALLBACK (BuddyTickerDestroyWindow), "WM destroy");
         gtk_window_set_title (GTK_WINDOW(tickerwindow), "Gaim - Buddy Ticker");
         gtk_window_set_role (GTK_WINDOW(tickerwindow), "ticker");
 	gtk_widget_realize(tickerwindow);
@@ -164,8 +164,8 @@
 	/* click detection */
 
         gtk_widget_set_events (p->ebox, GDK_BUTTON_PRESS_MASK);
-        gtk_signal_connect (GTK_OBJECT (p->ebox), "button_press_event",
-                GTK_SIGNAL_FUNC(ButtonPressCallback), (gpointer) p);
+        g_signal_connect (GTK_OBJECT (p->ebox), "button_press_event",
+                G_CALLBACK(ButtonPressCallback), (gpointer) p);
 
 	gtk_box_pack_start_defaults( GTK_BOX( p->hbox ), p->ebox );
 	gtk_widget_show( p->ebox );