--- ../../teoeyes-3.0.1/src/player.c	2003-09-12 14:21:55.000000000 +0900
+++ player.c	2003-12-30 07:22:35.000000000 +0900
@@ -91,7 +91,7 @@
 						 FontData	*font);
 static void	update_font			(GtkWidget	*window);
 static void	set_font_text 			(GtkWidget	*window,
-						 gchar		*text);
+						 const gchar	*text);
 static void	draw_digit			(GtkWidget	*window,
 						 NumberData	*digit,
 						 int		data);
@@ -393,11 +393,15 @@
   GtkAdjustment	*spinbutton_adj;
   char		buf[64];
 
+#if 0
   spinbutton = (GtkWidget *)
     gtk_object_get_data (GTK_OBJECT (player), "spinbutton");
   spinbutton_adj = (GtkAdjustment *)
     gtk_object_get_data (GTK_OBJECT (player), "spinbutton_adj");
-
+#else
+  spinbutton     = G_GET_WIDGET (player, "spinbutton");
+  spinbutton_adj = (GtkAdjustment *) G_GET_PARAMETER (player,"spinbutton_adj");
+#endif
   spinbutton_adj->value = adj->value;
   sprintf (buf, "%d", (int) adj->value);
   gtk_entry_set_text (GTK_ENTRY (spinbutton), buf);
@@ -414,10 +418,15 @@
   GtkWidget	*scrollbar;
   GtkAdjustment	*scrollbar_adj;
 
+#if 0
   scrollbar = (GtkWidget *)
     gtk_object_get_data (GTK_OBJECT (player), "scrollbar");
   scrollbar_adj = (GtkAdjustment *)
     gtk_object_get_data (GTK_OBJECT (player), "scrollbar_adj");
+#else
+  scrollbar     = G_GET_PARAMETER (player, "scrollbar");
+  scrollbar_adj = (GtkAdjustment *) G_GET_PARAMETER (player, "scrollbar_adj");
+#endif
 #if 0
   scrollbar_adj->value = adj->value;
   gtk_range_default_hslider_update (GTK_RANGE (scrollbar));
@@ -441,9 +450,11 @@
 				gint		x,
 				gint		y) {
   SkinData	*skin;
-
+#if 0
   skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (widget), "skin");
-
+#else
+  skin = (SkinData *) G_GET_PARAMETER (widget, "skin");
+#endif
   if (x >= skin->cx && x < skin->cx + skin->cw &&
       y >= skin->cy && y < skin->cy + skin->ch) {
     return TRUE;
@@ -520,10 +531,16 @@
     } else {
       set_play_speed (pos / (slider->w - slider->handle_width));
     }
+#if 0
     draw_digit (window,
 		((SkinData *)
 		 gtk_object_get_data (GTK_OBJECT (window), "skin"))->digit,
 		play_speed);
+#else
+    draw_digit (window,
+		((SkinData *) G_GET_PARAMETER (window, "skin"))->digit,
+		play_speed);
+#endif
     return TRUE;
   }
   return FALSE;
@@ -567,13 +584,19 @@
   gint			xmove, ymove;
   gint			x = (gint) ev->x;
   gint			y = (gint) ev->y;
-
+#if 0
   skin  = (SkinData *)  gtk_object_get_data (GTK_OBJECT (widget), "skin");
   move_flg   = (int) gtk_object_get_data (GTK_OBJECT (widget), "move_flg");
   slider_flg = (int) gtk_object_get_data (GTK_OBJECT (widget), "slider_flg");  
   xmove = (int) gtk_object_get_data (GTK_OBJECT (widget), "move_x_pos");
   ymove = (int) gtk_object_get_data (GTK_OBJECT (widget), "move_y_pos");
-
+#else
+  skin  = (SkinData *) G_GET_PARAMETER (widget, "skin");
+  move_flg   = (int) G_GET_PARAMETER (widget, "move_flg");
+  slider_flg = (int) G_GET_PARAMETER (widget, "slider_flg");  
+  xmove      = (int) G_GET_PARAMETER (widget, "move_x_pos");
+  ymove      = (int) G_GET_PARAMETER (widget, "move_y_pos");
+#endif
   if (check_control_widget_proximity (widget, x, y)) return TRUE;
 
   if (move_flg) {
@@ -634,12 +657,16 @@
   int			rept_flg;
   int			x = (gint) ev->x;
   int			y = (gint) ev->y;
-
+#if 0
   skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (widget), "skin");
 
   gtk_object_set_data (GTK_OBJECT (widget), "move_x_pos", (gpointer) x);
   gtk_object_set_data (GTK_OBJECT (widget), "move_y_pos", (gpointer) y);
-
+#else
+  skin = (SkinData *) G_GET_PARAMETER (widget, "skin");
+  G_SET_PARAMETER (widget, "move_x_pos", x);
+  G_SET_PARAMETER (widget, "move_y_pos", y);
+#endif
   if ((id = check_button_proximity (widget, x, y)) != 0) {
     switch (id) {
     case 1:
@@ -658,9 +685,14 @@
       draw_button (widget, skin->stop_button, 1);
       break;
     case 6:
+#if 0
       rept_flg = (int) gtk_object_get_data (GTK_OBJECT (widget), "rept_flg");
       gtk_object_set_data (GTK_OBJECT (widget),
 			   "rept_flg", (gpointer) !rept_flg);
+#else
+      rept_flg = (int) G_GET_PARAMETER (widget, "rept_flg");
+      G_SET_PARAMETER (widget, "rept_flg", !rept_flg);
+#endif
       repeat_flg = !rept_flg;
       draw_button (widget, skin->rept_button, 1);
       draw_item   (widget, skin->rept_item, !rept_flg);
@@ -670,11 +702,19 @@
       break;
     }
   } else if (check_slider_press_proximity (widget, skin->slider, x, y)) {
+#if 0
     gtk_object_set_data (GTK_OBJECT (widget), "slider_flg", (gpointer) 1);
+#else
+    G_SET_PARAMETER (widget, "slider_flg", 1);
+#endif
   } else {
     gdk_window_get_pointer (widget->window, &x, &y, &mod);
     if (!check_control_widget_proximity (widget, x, y)) {
+#if 0
       gtk_object_set_data (GTK_OBJECT (widget), "move_flg", (gpointer) 1);
+#else
+      G_SET_PARAMETER (widget, "move_flg", 1);
+#endif
     }
   }
   return FALSE;
@@ -689,13 +729,20 @@
   int		id;
   int		xpos, ypos;
 
+#if 0
   skin = (SkinData *)  gtk_object_get_data (GTK_OBJECT (widget), "skin");
   xpos = (int) gtk_object_get_data (GTK_OBJECT (widget), "move_x_pos");
   ypos = (int) gtk_object_get_data (GTK_OBJECT (widget), "move_y_pos");
 
   gtk_object_set_data (GTK_OBJECT (widget), "move_flg",   (gpointer) 0);
   gtk_object_set_data (GTK_OBJECT (widget), "slider_flg", (gpointer) 0);
-  
+#else
+  skin = (SkinData *) G_GET_PARAMETER (widget, "skin");  
+  xpos = (int) G_GET_PARAMETER (widget, "move_x_pos");
+  ypos = (int) G_GET_PARAMETER (widget, "move_y_pos");
+  G_SET_PARAMETER (widget, "move_flg",   0);
+  G_SET_PARAMETER (widget, "slider_flg", 0);
+#endif
   id = check_button_proximity (widget, xpos, ypos);
 
   switch (id) {
@@ -741,8 +788,7 @@
 			 gpointer		data) {
   SkinData	*skin;
 
-  skin   = (SkinData *)  gtk_object_get_data (GTK_OBJECT (widget), "skin");
-
+  skin = (SkinData *) G_GET_PARAMETER (widget, "skin");
   draw_button (widget, skin->play_button, 0);
   draw_button (widget, skin->back_button, 0);
   draw_button (widget, skin->next_button, 0);
@@ -750,6 +796,8 @@
   draw_button (widget, skin->stop_button, 0);
   draw_button (widget, skin->rept_button, 0);
   draw_button (widget, skin->exit_button, 0);
+
+  return TRUE;
 }
 
 /* ************************************************************************* *
@@ -762,8 +810,11 @@
   SkinData	*skin;
   int		w, h;
 
-  skin = (SkinData *)
-    gtk_object_get_data (GTK_OBJECT (window), "skin");
+#if 0
+  skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (window), "skin");
+#else
+  skin = (SkinData *) G_GET_PARAMETER (window, "skin");
+#endif
   gdk_window_get_size (skin->mask[4], &w, &h);
   gtk_widget_set_usize (window, w, h);
   gtk_widget_shape_combine_mask (window, skin->mask[4], 0, 0);
@@ -778,12 +829,17 @@
   GtkWidget	*canvas;
   SkinData	*skin;
   char		name[64];
-
+#if 0
   skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (window), "skin");
-  
+#else
+  skin = (SkinData *) G_GET_PARAMETER (window, "skin");
+#endif
   sprintf (name, "canvas%d", button->area);
+#if 0
   canvas = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (window), name);
-
+#else
+  canvas = G_GET_WIDGET (window, name);
+#endif
   gdk_draw_pixmap (skin->background[button->area], 
 		   canvas->style->fg_gc[GTK_WIDGET_STATE (canvas)],
 		   button->pixmap, button->w * type, 0, 
@@ -799,12 +855,17 @@
   GtkWidget	*canvas;
   SkinData	*skin;
   char		name[64];
-
+#if 0
   skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (window), "skin");
-
+#else
+  skin = (SkinData *) G_GET_PARAMETER (window, "skin");
+#endif
   sprintf (name, "canvas%d", item->area);
+#if 0
   canvas = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (window), name);
-
+#else
+  canvas = G_GET_WIDGET (window, name);
+#endif
   gdk_draw_pixmap (skin->background[item->area], 
 		   canvas->style->fg_gc[GTK_WIDGET_STATE (canvas)],
 		   item->pixmap, 0, item->h * type,
@@ -913,12 +974,17 @@
     start = NULL;
   }
   l -= font->offset;
-
+#if 0
   skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (window), "skin");
-
+#else
+  skin = (SkinData *) G_GET_PARAMETER (window, "skin");
+#endif
   sprintf (name, "canvas%d", font->area);
+#if 0
   canvas = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (window), name);
-
+#else
+  canvas = G_GET_WIDGET (window, name);
+#endif
   for (n = 0; n < font->length; n++) {
     if (n < l) {
       c = start[n];
@@ -930,7 +996,6 @@
       } else {
 	c = 0;
       }
-
       py = c / 32;
       px = c - (py * 32);
       px = px * font->char_width;
@@ -958,8 +1023,12 @@
 update_font (GtkWidget	*window) {
   FontData	*font;
 
+#if 0
   font =
     ((SkinData *) gtk_object_get_data (GTK_OBJECT (window), "skin"))->font;
+#else
+  font = ((SkinData *) G_GET_PARAMETER (window, "skin"))->font;
+#endif
   if (!font || !font->text) return;
   if (font->scroll > 0) {
     gint l = strlen (font->text);
@@ -978,11 +1047,14 @@
 /* ȥեȤ ************************************************** */
 static void
 set_font_text (GtkWidget	*window,
-	       gchar		*text) {
+	       const gchar	*text) {
   SkinData	*skin;
   FontData	*font;
-
+#if 0
   skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (window), "skin");
+#else
+  skin = (SkinData *) G_GET_PARAMETER (window, "skin");
+#endif
   font = skin->font;
   
   if (!font) return;
@@ -1009,12 +1081,17 @@
   int		base = 1000;
   char		name[64];
 
-
+#if 0
   skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (window), "skin");
-  
+#else
+  skin = (SkinData *) G_GET_PARAMETER (window, "skin");
+#endif
   sprintf (name, "canvas%d", digit->area);
+#if 0
   canvas = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (window), name);
-
+#else
+  canvas = G_GET_WIDGET (window, name);
+#endif
   for (num = data, n = 0; n < 4; n++) {
     /*  */
     pos = (int) (num / base);
@@ -1418,42 +1495,33 @@
 
   /* ơ֥ */
   table = gtk_table_new (3, 3, FALSE);
-  gtk_widget_ref  (table);
   gtk_widget_show (table);
   gtk_container_add (GTK_CONTAINER (window), table);
+  G_SET_WIDGET (window, "table", table);
 
   /* ʿBOX */
   hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref  (hbox);
   gtk_widget_show (hbox);
   gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
+  G_SET_WIDGET (window, "hbox", hbox);
   {
     /* С */
     length = g_list_length (g_list_first (image_list));
     hscrollbar_adj = gtk_adjustment_new (0, 0, length, 1,
 					 (length > 10) ? 10 : 1, 1);
-    gtk_object_set_data (GTK_OBJECT (window),
-			 "scrollbar_adj", (gpointer) hscrollbar_adj);
     hscrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (hscrollbar_adj));
-    gtk_widget_ref  (hscrollbar);
     gtk_widget_show (hscrollbar);
     gtk_box_pack_start (GTK_BOX (hbox), hscrollbar, TRUE, TRUE, 0);
-    gtk_object_set_data (GTK_OBJECT (window),
-			 "scrollbar", (gpointer) hscrollbar);
+    G_SET_OBJECT (window, "scrollbar_adj", hscrollbar_adj);
+    G_SET_WIDGET (window, "scrollbar",     hscrollbar);
 
     /* ԥܥ */
     spinbutton_adj = gtk_adjustment_new (0, 0, length-1, 1, 10, 0);
-    gtk_object_set_data (GTK_OBJECT (window),
-			 "spinbutton_adj", (gpointer) spinbutton_adj);
     spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-    gtk_widget_ref  (spinbutton);
     gtk_widget_show (spinbutton);
     gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
-    gtk_object_set_data (GTK_OBJECT (window),
-			 "spinbutton", (gpointer) spinbutton);
-
     gtk_signal_connect (GTK_OBJECT (hscrollbar_adj), "value_changed",
 			GTK_SIGNAL_FUNC (player_scrollbar_changed),
 			(gpointer) hscrollbar_adj);
@@ -1461,52 +1529,45 @@
     gtk_signal_connect (GTK_OBJECT (spinbutton_adj), "value_changed",
 			GTK_SIGNAL_FUNC (player_spinbutton_changed),
 			(gpointer) spinbutton_adj);
+    G_SET_OBJECT (window, "spinbutton_adj", spinbutton_adj);
+    G_SET_WIDGET (window, "spinbutton",     spinbutton);
   }
   /* ǡѥåȤ */
   canvas = gtk_drawing_area_new ();
-  gtk_widget_ref  (canvas);
   gtk_widget_show (canvas);
-  gtk_object_set_data (GTK_OBJECT (window), "canvas0", (gpointer) canvas);
-  
   gtk_table_attach (GTK_TABLE (table), canvas, 0, 1, 0, 3,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-  
+  G_SET_WIDGET (window, "canvas0", canvas);
 
   canvas = gtk_drawing_area_new ();
-  gtk_widget_ref  (canvas);
   gtk_widget_show (canvas);
-  gtk_object_set_data (GTK_OBJECT (window), "canvas1", (gpointer) canvas);
-  
   gtk_table_attach (GTK_TABLE (table), canvas, 2, 3, 0, 3,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
+  G_SET_WIDGET (window, "canvas1", canvas);
 
   canvas = gtk_drawing_area_new ();
-  gtk_widget_ref  (canvas);
   gtk_widget_show (canvas);
-  gtk_object_set_data (GTK_OBJECT (window), "canvas2", (gpointer) canvas);
-
   gtk_table_attach (GTK_TABLE (table), canvas, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
+  G_SET_WIDGET (window, "canvas2", canvas);
 
   canvas = gtk_drawing_area_new ();
-  gtk_widget_ref  (canvas);
   gtk_widget_show (canvas);
-  gtk_object_set_data (GTK_OBJECT (window), "canvas3", (gpointer) canvas);
-  
   gtk_table_attach (GTK_TABLE (table), canvas, 1, 2, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
+  G_SET_WIDGET (window, "canvas3", canvas);
 
-  gtk_object_set_data (GTK_OBJECT (window), "skin",       (gpointer) skin);
-  gtk_object_set_data (GTK_OBJECT (window), "move_flg",   (gpointer) 0);
-  gtk_object_set_data (GTK_OBJECT (window), "rept_flg",	  (gpointer) 0);
-  gtk_object_set_data (GTK_OBJECT (window), "move_x_pos", (gpointer) 0);
-  gtk_object_set_data (GTK_OBJECT (window), "move_y_pos", (gpointer) 0);
-  gtk_object_set_data (GTK_OBJECT (window), "pos_x",	  (gpointer) 0);
-  gtk_object_set_data (GTK_OBJECT (window), "pos_y",	  (gpointer) 0);
+  G_SET_PARAMETER (window, "skin",       skin);
+  G_SET_PARAMETER (window, "move_flg",   0);
+  G_SET_PARAMETER (window, "rept_flg",	 0);
+  G_SET_PARAMETER (window, "move_x_pos", 0);
+  G_SET_PARAMETER (window, "move_y_pos", 0);
+  G_SET_PARAMETER (window, "pos_x",	 0);
+  G_SET_PARAMETER (window, "pos_y",	 0);
 
   return window;
 }
@@ -1519,7 +1580,7 @@
   char		name[64];
   int		w, h, n;
 
-  skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (window), "skin");
+  skin = (SkinData *) G_GET_PARAMETER (window, "skin");
 
   /* ΤΥޥǡΥå */
   gdk_window_get_size (skin->mask[4], &w, &h);
@@ -1529,7 +1590,11 @@
   /* ǡ */
   for (n = 0; n < 4; n++) {
     sprintf (name, "canvas%d", n);
+#if 0
     widget = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (window), name);
+#else
+    widget = G_GET_WIDGET (window, name);
+#endif
     gdk_window_get_size (skin->background[n], &w, &h);
     gtk_widget_set_size_request (widget, w, h);
     gtk_drawing_area_size (GTK_DRAWING_AREA (widget), w, h);
@@ -1545,11 +1610,14 @@
 player_update_window (void) {
   SkinData	*skin = NULL;
 
-  skin = (SkinData *) gtk_object_get_data (GTK_OBJECT (player), "skin");
-  if (!skin) return;
-  if (!skin->font->text)  set_font_text (player, ti_get_filename (image_list));
-  update_font (player);
-  draw_digit (player, skin->digit, play_speed);
+  skin = (SkinData *) G_GET_PARAMETER (player, "skin");
+  if (skin) {
+    if (!skin->font->text) {
+      set_font_text (player, ti_get_filename (image_list));
+    }
+    update_font (player);
+    draw_digit (player, skin->digit, play_speed);
+  }
 }
 
 /* ***************************************************** End of player.c *** */
