diff plugins/gtik.c @ 5314:1f901484599d

[gaim-migrate @ 5686] GTK_OBJECT -> G_OBJECT Also fixed a few compiler warnings. committer: Tailor Script <[e-mail]>

--- a/plugins/gtik.c	Tue May 06 05:28:41 2003 +0000
+++ b/plugins/gtik.c	Tue May 06 05:48:03 2003 +0000
@@ -135,7 +135,7 @@
 	/*-----------------------------------------------------------------*/
 	void remove_self(GtkWidget *w, void *handle)
 	{
-		gtk_signal_disconnect(GTK_OBJECT(applet), destroycb);
+		gtk_signal_disconnect(G_OBJECT(applet), destroycb);
 		if (drawTimeID > 0) { g_source_remove(drawTimeID); }
 		if (updateTimeID >0) { g_source_remove(updateTimeID); }
 		gtk_widget_destroy(applet);
@@ -735,11 +735,11 @@
 		gtk_box_pack_start_defaults( GTK_BOX(panel2), timeout_label );
 		gtk_box_pack_start_defaults( GTK_BOX(panel2), timeout_c );
 	
-		g_signal_connect_swapped(GTK_OBJECT(timeout_c), "changed",G_CALLBACK(changed_cb),GTK_OBJECT(pb));
+		g_signal_connect_swapped(G_OBJECT(timeout_c), "changed",G_CALLBACK(changed_cb),G_OBJECT(pb));
 
-		g_signal_connect( GTK_OBJECT(timeout_a),"value_changed",
+		g_signal_connect( G_OBJECT(timeout_a),"value_changed",
 		G_CALLBACK(timeout_cb), timeout_c );
-		g_signal_connect( GTK_OBJECT(timeout_c),"changed",
+		g_signal_connect( G_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);
-		g_signal_connect_swapped(GTK_OBJECT(tik_syms_entry), "changed",G_CALLBACK(changed_cb),GTK_OBJECT(pb));
+		g_signal_connect_swapped(G_OBJECT(tik_syms_entry), "changed",G_CALLBACK(changed_cb),G_OBJECT(pb));
 
 		/* OUTPUT FORMAT and SCROLL DIRECTION */
 
@@ -767,18 +767,18 @@
 		if (strcmp(props.output,"default")!=0)
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check),
 							TRUE);
-		g_signal_connect_swapped(GTK_OBJECT(check),"toggled",
-				G_CALLBACK(changed_cb),GTK_OBJECT(pb));
-		g_signal_connect(GTK_OBJECT(check),"toggled",
+		g_signal_connect_swapped(G_OBJECT(check),"toggled",
+				G_CALLBACK(changed_cb),G_OBJECT(pb));
+		g_signal_connect(G_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);
-		g_signal_connect_swapped(GTK_OBJECT(check2),"toggled",
-				G_CALLBACK(changed_cb),GTK_OBJECT(pb));
-		g_signal_connect(GTK_OBJECT(check2),"toggled",
+		g_signal_connect_swapped(G_OBJECT(check2),"toggled",
+				G_CALLBACK(changed_cb),G_OBJECT(pb));
+		g_signal_connect(G_OBJECT(check2),"toggled",
 				G_CALLBACK(toggle_scroll_cb),NULL);
 
 		/* COLOR */
@@ -790,7 +790,7 @@
 		gnome_color_picker_set_i8(GNOME_COLOR_PICKER (upColor), 
 					  ur, ug, ub, 255);
 		
-		g_signal_connect(GTK_OBJECT(upColor), "color_set",
+		g_signal_connect(G_OBJECT(upColor), "color_set",
 				G_CALLBACK(ucolor_set_cb), NULL);
 
 		gtk_box_pack_start_defaults( GTK_BOX(panela), upLabel );
@@ -804,7 +804,7 @@
 		gnome_color_picker_set_i8(GNOME_COLOR_PICKER (downColor), 
 					  dr, dg, db, 255);
 
-		g_signal_connect(GTK_OBJECT(downColor), "color_set",
+		g_signal_connect(G_OBJECT(downColor), "color_set",
 				G_CALLBACK(dcolor_set_cb), NULL);
 
 		gtk_box_pack_start_defaults( GTK_BOX(panela), downLabel );
@@ -830,11 +830,11 @@
 
 		gtk_container_add(GTK_CONTAINER(pb), vbox);
 
-		g_signal_connect_swapped(GTK_OBJECT(tik_syms_entry), 
+		g_signal_connect_swapped(G_OBJECT(tik_syms_entry), 
 				   "changed",G_CALLBACK(changed_cb),
-				   GTK_OBJECT(pb));
+				   G_OBJECT(pb));
 
-		g_signal_connect(GTK_OBJECT(pb), "apply",
+		g_signal_connect(G_OBJECT(pb), "apply",
 				    G_CALLBACK(apply_cb), NULL);
 
 		gtk_widget_show_all(pb);
@@ -869,14 +869,14 @@
 		/* applet_widget_add (APPLET_WIDGET (applet), vbox); */
 		gtk_container_add(GTK_CONTAINER(applet), vbox);
 
-		g_signal_connect(GTK_OBJECT(drawing_area),"expose_event",
+		g_signal_connect(G_OBJECT(drawing_area),"expose_event",
 		(GtkSignalFunc) expose_event, NULL);
 
-		g_signal_connect(GTK_OBJECT(drawing_area),"configure_event",
+		g_signal_connect(G_OBJECT(drawing_area),"configure_event",
 		(GtkSignalFunc) configure_event, NULL);
 
 
-		destroycb = g_signal_connect(GTK_OBJECT(applet), "destroy",
+		destroycb = g_signal_connect(G_OBJECT(applet), "destroy",
 			G_CALLBACK(remove_self), handle);
 
 
@@ -917,7 +917,7 @@
 /* JHACK */
 	/*-----------------------------------------------------------------*/
 	void gaim_plugin_remove() {
-		gtk_signal_disconnect(GTK_OBJECT(applet), destroycb);
+		gtk_signal_disconnect(G_OBJECT(applet), destroycb);
 		if (drawTimeID > 0) { g_source_remove(drawTimeID); }
 		if (updateTimeID >0) { g_source_remove(updateTimeID); }
 		gtk_widget_destroy(applet);