gailbooleancell.c gailimagecell.c gailtextcell.c gailwidget.c

2008-08-15  Michael Natterer  <mitch@imendio.com>

	* gailbooleancell.c
	* gailimagecell.c
	* gailtextcell.c
	* gailwidget.c
	* tests/Makefile.am
	* tests/testbutton.c
	* tests/testimage.c
	* tests/testlib.c
	* tests/testmenuitem.c
	* tests/testnotebook.c
	* tests/testoptionmenu.c
	* tests/testpaned.c
	* tests/testselection.c
	* tests/testtable.c: some undeprecation.

	* libgail-util/Makefile.am. build with GDK_DISABLE_DEPRECATED
	and GTK_DISABLE_DEPRECATED.


svn path=/trunk/; revision=21127

16 files changed, 76 insertions, 59 deletions

diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog
index 5eec32b46..08f97adb4 100644
--- a/modules/other/gail/ChangeLog
+++ b/modules/other/gail/ChangeLog
@@ -1,3 +1,23 @@
+2008-08-15  Michael Natterer  <mitch@imendio.com>
+
+	* gailbooleancell.c
+	* gailimagecell.c
+	* gailtextcell.c
+	* gailwidget.c
+	* tests/Makefile.am
+	* tests/testbutton.c
+	* tests/testimage.c
+	* tests/testlib.c
+	* tests/testmenuitem.c
+	* tests/testnotebook.c
+	* tests/testoptionmenu.c
+	* tests/testpaned.c
+	* tests/testselection.c
+	* tests/testtable.c: some undeprecation.
+
+	* libgail-util/Makefile.am. build with GDK_DISABLE_DEPRECATED
+	and GTK_DISABLE_DEPRECATED.
+
 2008-08-11  Michael Natterer  <mitch@imendio.com>
 
 	* tests/ferret.c
diff --git a/modules/other/gail/gailbooleancell.c b/modules/other/gail/gailbooleancell.c
index 19d34c504..3e9f83413 100644
--- a/modules/other/gail/gailbooleancell.c
+++ b/modules/other/gail/gailbooleancell.c
@@ -71,8 +71,7 @@ gail_boolean_cell_new (void)
   boolean_cell = GAIL_BOOLEAN_CELL(object);
 
   cell->renderer = gtk_cell_renderer_toggle_new ();
-  g_object_ref (cell->renderer);
-  gtk_object_sink (GTK_OBJECT (cell->renderer));
+  g_object_ref_sink (cell->renderer);
   boolean_cell->cell_value = FALSE;
   return atk_object;
 }
diff --git a/modules/other/gail/gailimagecell.c b/modules/other/gail/gailimagecell.c
index fa822f804..6e08150d3 100644
--- a/modules/other/gail/gailimagecell.c
+++ b/modules/other/gail/gailimagecell.c
@@ -84,8 +84,7 @@ gail_image_cell_new (void)
   cell = GAIL_RENDERER_CELL(object);
 
   cell->renderer = gtk_cell_renderer_pixbuf_new ();
-  g_object_ref (cell->renderer);
-  gtk_object_sink (GTK_OBJECT (cell->renderer));
+  g_object_ref_sink (cell->renderer);
   return atk_object;
 }
 
diff --git a/modules/other/gail/gailtextcell.c b/modules/other/gail/gailtextcell.c
index 30f20f741..d264b10e8 100644
--- a/modules/other/gail/gailtextcell.c
+++ b/modules/other/gail/gailtextcell.c
@@ -175,8 +175,7 @@ gail_text_cell_new (void)
   cell = GAIL_RENDERER_CELL(object);
 
   cell->renderer = gtk_cell_renderer_text_new ();
-  g_object_ref (cell->renderer);
-  gtk_object_sink (GTK_OBJECT (cell->renderer));
+  g_object_ref_sink (cell->renderer);
   return atk_object;
 }
 
diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c
index 9b371927c..0469b9311 100644
--- a/modules/other/gail/gailwidget.c
+++ b/modules/other/gail/gailwidget.c
@@ -793,14 +793,14 @@ gail_widget_set_extents (AtkComponent   *component,
           else
             {
               gtk_widget_set_uposition (widget, x_current, y_current);
-              gtk_widget_set_usize (widget, width, height);
+              gtk_widget_set_size_request (widget, width, height);
               return TRUE;
             }
         }
       else if (coord_type == ATK_XY_SCREEN)
         {  
           gtk_widget_set_uposition (widget, x, y);
-          gtk_widget_set_usize (widget, width, height);
+          gtk_widget_set_size_request (widget, width, height);
           return TRUE;
         }
     }
@@ -865,7 +865,7 @@ gail_widget_set_size (AtkComponent   *component,
 
   if (GTK_WIDGET_TOPLEVEL (widget))
     {
-      gtk_widget_set_usize (widget, width, height);
+      gtk_widget_set_size_request (widget, width, height);
       return TRUE;
     }
   else
diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am
index 2805c234d..05957dfdb 100644
--- a/modules/other/gail/libgail-util/Makefile.am
+++ b/modules/other/gail/libgail-util/Makefile.am
@@ -52,7 +52,9 @@ libgailutil_la_CPPFLAGS = \
 	-I$(top_builddir)/gdk	\
 	-I$(top_srcdir)/gtk	\
 	-I$(top_builddir)/gtk	\
-	$(AM_CPPFLAGS)
+	$(AM_CPPFLAGS) 		\
+	-DGDK_DISABLE_DEPRECATED\
+	-DGTK_DISABLE_DEPRECATED
 
 libgailutil_la_CFLAGS = \
 	$(GTK_DEP_CFLAGS)	\
diff --git a/modules/other/gail/tests/Makefile.am b/modules/other/gail/tests/Makefile.am
index c62fa07a8..51f537376 100644
--- a/modules/other/gail/tests/Makefile.am
+++ b/modules/other/gail/tests/Makefile.am
@@ -37,7 +37,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/gdk	\
 	-I$(top_builddir)/gdk	\
 	-I$(top_srcdir)/gtk	\
-	-I$(top_builddir)/gtk
+	-I$(top_builddir)/gtk	\
+	-DGDK_DISABLE_DEPRECATED
 
 AM_CFLAGS = \
 	$(GTK_DEP_CFLAGS)	\
diff --git a/modules/other/gail/tests/testbutton.c b/modules/other/gail/tests/testbutton.c
index 8f8ae4742..1b8e16fdf 100644
--- a/modules/other/gail/tests/testbutton.c
+++ b/modules/other/gail/tests/testbutton.c
@@ -66,9 +66,9 @@ _check_object (AtkObject *obj)
     widget = GTK_ACCESSIBLE (atk_button)->widget;
     g_assert (GTK_IS_BUTTON (widget));
     g_signal_connect (GTK_OBJECT (widget),
-                                    "pressed",
-                           GTK_SIGNAL_FUNC (button_pressed_handler),
-                                    NULL);
+                      "pressed",
+                      G_CALLBACK (button_pressed_handler),
+                      NULL);
     if (GTK_IS_TOGGLE_BUTTON (widget))
     {
       _toggle_inconsistent (GTK_TOGGLE_BUTTON (widget));
@@ -79,9 +79,9 @@ _check_object (AtkObject *obj)
       return;
 
     if (g_getenv ("TEST_ACCESSIBLE_AUTO"))
-    {
-      gtk_idle_add (_do_button_action, atk_button);
-    }
+      {
+        g_idle_add (_do_button_action, atk_button);
+      }
   }
 }
 
@@ -106,7 +106,7 @@ static gint _do_button_action (gpointer data)
 
   atk_action_do_action (ATK_ACTION (obj), 2);
 
-  gtk_timeout_add (5000, _finish_button_action, obj);
+  g_timeout_add (5000, _finish_button_action, obj);
   return FALSE;
 }
 
@@ -129,11 +129,11 @@ button_pressed_handler (GtkButton *button)
   obj = gtk_widget_get_accessible (GTK_WIDGET (button));
   _print_states (obj);
   _print_button_image_info (obj);
-    
+
   if (GTK_IS_TOGGLE_BUTTON (button))
-  {
-    gtk_idle_add (_toggle_inconsistent, GTK_TOGGLE_BUTTON (button));
-  }
+    {
+      g_idle_add (_toggle_inconsistent, GTK_TOGGLE_BUTTON (button));
+    }
 }
 
 static void 
diff --git a/modules/other/gail/tests/testimage.c b/modules/other/gail/tests/testimage.c
index f8da1a8c1..b0c2243b0 100644
--- a/modules/other/gail/tests/testimage.c
+++ b/modules/other/gail/tests/testimage.c
@@ -44,33 +44,30 @@ static void _check_arrows (AtkObject *obj)
 		md->arrow4 = gtk_arrow_new(GTK_ARROW_RIGHT,GTK_SHADOW_OUT);
 		md->dialog = gtk_dialog_new();
 		gtk_window_set_modal(GTK_WINDOW(md->dialog), TRUE);
-        gtk_box_pack_start(GTK_BOX (GTK_DIALOG (md->dialog)->vbox),
-							 md->arrow1, TRUE,TRUE, 0);
+                gtk_box_pack_start(GTK_BOX (GTK_DIALOG (md->dialog)->vbox),
+                                   md->arrow1, TRUE,TRUE, 0);
 		gtk_box_pack_start(GTK_BOX (GTK_DIALOG (md->dialog)->vbox),
-							 md->arrow2, TRUE,TRUE, 0);
+                                   md->arrow2, TRUE,TRUE, 0);
 		gtk_box_pack_start(GTK_BOX (GTK_DIALOG (md->dialog)->vbox),
-							 md->arrow3, TRUE,TRUE, 0);
+                                   md->arrow3, TRUE,TRUE, 0);
 		gtk_box_pack_start(GTK_BOX (GTK_DIALOG (md->dialog)->vbox),
-							 md->arrow4, TRUE,TRUE, 0);
+                                   md->arrow4, TRUE,TRUE, 0);
 		g_signal_connect(GTK_OBJECT(md->dialog), "destroy",
-							 GTK_SIGNAL_FUNC(destroy), md->dialog);
+                                 G_CALLBACK (destroy), md->dialog);
 
-	    md->image = GTK_IMAGE(gtk_image_new_from_file("circles.xbm"));
+	        md->image = GTK_IMAGE(gtk_image_new_from_file("circles.xbm"));
 		gtk_box_pack_start(GTK_BOX (GTK_DIALOG (md->dialog)->vbox),
-							 GTK_WIDGET(md->image), TRUE,TRUE, 0);
+                                   GTK_WIDGET(md->image), TRUE,TRUE, 0);
 		md->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
 		g_signal_connect(GTK_OBJECT(md->close_button), "clicked",
-							 GTK_SIGNAL_FUNC(destroy), md->dialog);
+                                 G_CALLBACK (destroy), md->dialog);
 
 		gtk_box_pack_start(GTK_BOX (GTK_DIALOG (md->dialog)->action_area),
-							md->close_button, TRUE,TRUE, 0);
-
+                                   md->close_button, TRUE,TRUE, 0);
 
 		gtk_widget_show_all(md->dialog);
 		visibleDialog = 1;
-
-	
-	}	
+    }
  }
 }
 
diff --git a/modules/other/gail/tests/testlib.c b/modules/other/gail/tests/testlib.c
index f1b7dcd0b..06b879d2c 100644
--- a/modules/other/gail/tests/testlib.c
+++ b/modules/other/gail/tests/testlib.c
@@ -511,7 +511,7 @@ _create_output_window (OutputWindow **outwin)
    
       localow->outputBuffer = gtk_text_buffer_new(NULL);
       view = gtk_text_view_new_with_buffer(GTK_TEXT_BUFFER(localow->outputBuffer));
-      gtk_widget_set_usize(view, 700, 500);
+      gtk_widget_set_size_request (view, 700, 500);
       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
       gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);	
 
@@ -573,15 +573,15 @@ _create_select_tests_window (AtkObject    *obj,
       gtk_window_set_position (GTK_WINDOW(md[window_no]->selecttestsWindow),
                                GTK_WIN_POS_CENTER); 
       g_signal_connect (GTK_OBJECT(md[window_no]->selecttestsWindow), 
-                          "destroy",
-                          GTK_SIGNAL_FUNC(_destroy), 
-                          &md[window_no]->selecttestsWindow);
+                        "destroy",
+                        G_CALLBACK (_destroy),
+                        &md[window_no]->selecttestsWindow);
      
       /* Setup Scrolling */
       scrolledWindow = gtk_scrolled_window_new(NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow),
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); 
-      gtk_widget_set_usize (scrolledWindow, 500, 600);
+      gtk_widget_set_size_request (scrolledWindow, 500, 600);
       gtk_container_add (GTK_CONTAINER (md[window_no]->selecttestsWindow), 
                          scrolledWindow);
       
@@ -602,9 +602,9 @@ _create_select_tests_window (AtkObject    *obj,
       testcb[window_no].obj = obj;
       testcb[window_no].win_num = window_no; 
       g_signal_connect (GTK_OBJECT (md[window_no]->button), 
-                          "clicked",
-                          GTK_SIGNAL_FUNC (_testselectioncb),  
-                          (gpointer)&testcb[window_no]);
+                        "clicked",
+                        G_CALLBACK (_testselectioncb),
+                        (gpointer)&testcb[window_no]);
      
       /* Show all */
       gtk_widget_grab_focus (md[window_no]->button);
@@ -664,7 +664,7 @@ add_test (gint   window,
 	  listoftests[window][testcount[window]].parameterInput[i] = gtk_entry_new();
           gtk_entry_set_text (GTK_ENTRY (listoftests[window][testcount[window]].parameterInput[i]),
             default_names[i]);
-          gtk_widget_set_usize (listoftests[window][testcount[window]].parameterInput[i], 50, 22);
+          gtk_widget_set_size_request (listoftests[window][testcount[window]].parameterInput[i], 50, 22);
 	  gtk_box_pack_start (GTK_BOX (md[window]->hbox),
             listoftests[window][testcount[window]].parameterInput[i], FALSE, FALSE, 0);
           gtk_widget_set_sensitive (
@@ -675,9 +675,9 @@ add_test (gint   window,
 	  gtk_widget_show (listoftests[window][testcount[window]].parameterInput[i]);
         }
       g_signal_connect (GTK_OBJECT (listoftests[window][testcount[window]].toggleButton),
-                          "toggled", 
-                          GTK_SIGNAL_FUNC(_toggle_selectedcb),
-                          (gpointer)&(listoftests[window][testcount[window]]));
+                        "toggled",
+                        G_CALLBACK (_toggle_selectedcb),
+                        (gpointer)&(listoftests[window][testcount[window]]));
       gtk_widget_show (listoftests[window][testcount[window]].toggleButton);
       gtk_widget_show (md[window]->hbox);
       gtk_widget_show (md[window]->vbox);
diff --git a/modules/other/gail/tests/testmenuitem.c b/modules/other/gail/tests/testmenuitem.c
index 129bde578..e7c56ed4e 100644
--- a/modules/other/gail/tests/testmenuitem.c
+++ b/modules/other/gail/tests/testmenuitem.c
@@ -92,9 +92,9 @@ _check_object (AtkObject *obj)
       else
         return;
       if (g_getenv ("TEST_ACCESSIBLE_AUTO"))
-      {
-        gtk_idle_add (_do_menu_item_action, obj);
-      }
+        {
+          g_idle_add (_do_menu_item_action, obj);
+        }
     }
   }
   else
diff --git a/modules/other/gail/tests/testnotebook.c b/modules/other/gail/tests/testnotebook.c
index 5cd716173..9ba4154a6 100644
--- a/modules/other/gail/tests/testnotebook.c
+++ b/modules/other/gail/tests/testnotebook.c
@@ -154,7 +154,7 @@ _do_selection (AtkObject *obj)
     }
   }
   g_print ("*** End _do_selection ***\n");
-  gtk_timeout_add (5000, _remove_page, selection_obj);
+  g_timeout_add (5000, _remove_page, selection_obj);
 } 
 
 static gint _remove_page (gpointer data)
diff --git a/modules/other/gail/tests/testoptionmenu.c b/modules/other/gail/tests/testoptionmenu.c
index 3e9e74c63..feb644490 100644
--- a/modules/other/gail/tests/testoptionmenu.c
+++ b/modules/other/gail/tests/testoptionmenu.c
@@ -89,7 +89,7 @@ _check_object (AtkObject *obj)
     
       child = atk_object_ref_accessible_child (parent, 1);
       doing_action = TRUE;
-      gtk_timeout_add (5000, _do_menu_item_action, child);
+      g_timeout_add (5000, _do_menu_item_action, child);
     }
   else
     {
diff --git a/modules/other/gail/tests/testpaned.c b/modules/other/gail/tests/testpaned.c
index ae39364c1..6935f41af 100644
--- a/modules/other/gail/tests/testpaned.c
+++ b/modules/other/gail/tests/testpaned.c
@@ -107,7 +107,7 @@ static void _check_paned (AtkObject *obj)
       }
       atk_object_connect_property_change_handler (paned_obj,
                    (AtkPropertyChangeHandler*) _property_change_handler);
-      gtk_timeout_add (2000, _test_paned, paned_obj);
+      g_timeout_add (2000, _test_paned, paned_obj);
     }
 
     return;
diff --git a/modules/other/gail/tests/testselection.c b/modules/other/gail/tests/testselection.c
index 0311663d9..539dc755b 100644
--- a/modules/other/gail/tests/testselection.c
+++ b/modules/other/gail/tests/testselection.c
@@ -138,7 +138,7 @@ _do_selection (AtkObject *obj)
     g_print ("Unexpected selection: %d, expected 0\n", i);
   }
   atk_selection_add_selection (ATK_SELECTION (selection_obj), 1);
-  gtk_timeout_add (2000, _finish_selection, selection_obj);
+  g_timeout_add (2000, _finish_selection, selection_obj);
   g_print ("*** End _do_selection ***\n");
 } 
 
diff --git a/modules/other/gail/tests/testtable.c b/modules/other/gail/tests/testtable.c
index 5df584e0b..e2a939e45 100644
--- a/modules/other/gail/tests/testtable.c
+++ b/modules/other/gail/tests/testtable.c
@@ -760,9 +760,9 @@ void test_choice_gui(AtkObject **obj)
   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title(GTK_WINDOW(window), "Test to run");
 
-  g_signal_connect(GTK_OBJECT(window), "destroy",
-  GTK_SIGNAL_FUNC(destroy), &window);
- 
+  g_signal_connect(GTK_OBJECT (window), "destroy",
+                   G_CALLBACK (destroy), &window);
+
   vbox = gtk_vbox_new(TRUE, 0);
   gtk_box_set_spacing(GTK_BOX(vbox), 10);
 
@@ -818,7 +818,7 @@ void test_choice_gui(AtkObject **obj)
     GTK_BUTTONBOX_SPREAD);
   gtk_box_pack_end (GTK_BOX (hbuttonbox), GTK_WIDGET (button), TRUE, TRUE, 0);
   gtk_box_pack_end (GTK_BOX (vbox), hbuttonbox, TRUE, TRUE, 0);
-  g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(choicecb), obj);
+  g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK (choicecb), obj);
 
   gtk_container_add(GTK_CONTAINER(window), vbox);
   gtk_widget_show(vbox);