GNOME.org
 

libbonoboui r2679 - in trunk: . bonobo glade po samples/bonoboui samples/canvdemo samples/compound-doc/bonobo-hello samples/compound-doc/container samples/container samples/controls tests tests/control tools/browser

Author: kmaraas
Date: Fri Mar  6 10:16:07 2009
New Revision: 2679
URL: http://svn.gnome.org/viewvc/libbonoboui?rev=2679&view=rev

Log:
2009-03-06  Kjartan Maraas  <kmaraas gnome org>

	* NEWS: Updated for release.
	* bonobo/Makefile.am:
	* bonobo/bonobo-canvas-component.c:
	(impl_Bonobo_Canvas_Component_update):
	* bonobo/bonobo-control-frame.c:
	* bonobo/bonobo-control.c:
	* bonobo/bonobo-dock-layout.c: (remove_item):
	* bonobo/bonobo-dock.c: (drag_floating),
	(bonobo_dock_add_floating_item), (bonobo_dock_set_client_area):
	* bonobo/bonobo-plug.c:
	* bonobo/bonobo-selector-widget.c:
	* bonobo/bonobo-socket.c:
	* bonobo/bonobo-ui-config-widget.c:
	* bonobo/bonobo-ui-engine-config.c:
	(bonobo_ui_engine_config_configure):
	* bonobo/bonobo-ui-engine.c: (widget_unref), (state_update_new),
	(state_update_destroy), (bonobo_ui_engine_construct),
	(bonobo_ui_engine_sync), (bonobo_ui_engine_stamp_root):
	* bonobo/bonobo-ui-internal-toolbar.c:
	* bonobo/bonobo-ui-main.c:
	* bonobo/bonobo-ui-preferences.c:
	* bonobo/bonobo-ui-sync-keys.c:
	* bonobo/bonobo-ui-sync-menu.c: (bonobo_ui_sync_menu_add_popup),
	(impl_bonobo_ui_sync_menu_build):
	* bonobo/bonobo-ui-sync-status.c:
	* bonobo/bonobo-ui-sync-toolbar.c:
	* bonobo/bonobo-ui-toolbar-button-item.c: (unparent_items):
	* bonobo/bonobo-ui-toolbar-control-item.c:
	* bonobo/bonobo-ui-toolbar-item.c:
	* bonobo/bonobo-ui-toolbar-item.h:
	* bonobo/bonobo-ui-toolbar-popup-item.c:
	* bonobo/bonobo-ui-toolbar-toggle-button-item.c:
	* bonobo/bonobo-ui-toolbar.c: (bonobo_ui_toolbar_construct):
	* bonobo/bonobo-ui-util.c:
	* bonobo/bonobo-window.c:
	* glade/glade-bonobo.c:
	* samples/bonoboui/hello.c:
	* samples/canvdemo/circle.c:
	* samples/canvdemo/main.c:
	* samples/canvdemo/square.c:
	* samples/container/bonobo-sample-container.c:
	* samples/controls/bonobo-sample-controls.c:
	* tests/control/test-control.c:
	* tests/test-events.c:
	* tests/test-focus.c:
	* tests/test-moniker.c:
	* tests/test-reparent.c: (main):
	* tests/test-selector.c:
	* tests/test-sensitivity.c: (main):
	* tests/test-toolbar.c:
	* tests/test-ui-auto.c:
	* tests/test-ui.c:
	* tools/browser/window.c: (bonobo_browser_create_window):
	Make everything build with deprecations enabled in glib/gtk+.

Modified:
   trunk/ChangeLog
   trunk/bonobo/Makefile.am
   trunk/bonobo/bonobo-canvas-component.c
   trunk/bonobo/bonobo-control-frame.c
   trunk/bonobo/bonobo-control.c
   trunk/bonobo/bonobo-dock-layout.c
   trunk/bonobo/bonobo-dock.c
   trunk/bonobo/bonobo-plug.c
   trunk/bonobo/bonobo-selector-widget.c
   trunk/bonobo/bonobo-socket.c
   trunk/bonobo/bonobo-ui-config-widget.c
   trunk/bonobo/bonobo-ui-engine-config.c
   trunk/bonobo/bonobo-ui-engine.c
   trunk/bonobo/bonobo-ui-internal-toolbar.c
   trunk/bonobo/bonobo-ui-main.c
   trunk/bonobo/bonobo-ui-preferences.c
   trunk/bonobo/bonobo-ui-sync-keys.c
   trunk/bonobo/bonobo-ui-sync-menu.c
   trunk/bonobo/bonobo-ui-sync-status.c
   trunk/bonobo/bonobo-ui-sync-toolbar.c
   trunk/bonobo/bonobo-ui-toolbar-button-item.c
   trunk/bonobo/bonobo-ui-toolbar-control-item.c
   trunk/bonobo/bonobo-ui-toolbar-item.c
   trunk/bonobo/bonobo-ui-toolbar-item.h
   trunk/bonobo/bonobo-ui-toolbar-popup-item.c
   trunk/bonobo/bonobo-ui-toolbar-toggle-button-item.c
   trunk/bonobo/bonobo-ui-toolbar.c
   trunk/bonobo/bonobo-ui-util.c
   trunk/bonobo/bonobo-window.c
   trunk/glade/glade-bonobo.c
   trunk/po/ChangeLog
   trunk/samples/bonoboui/hello.c
   trunk/samples/canvdemo/circle.c
   trunk/samples/canvdemo/main.c
   trunk/samples/canvdemo/square.c
   trunk/samples/compound-doc/bonobo-hello/ChangeLog
   trunk/samples/compound-doc/container/ChangeLog
   trunk/samples/compound-doc/container/container.c
   trunk/samples/container/bonobo-sample-container.c
   trunk/samples/controls/bonobo-sample-controls.c
   trunk/tests/control/test-control.c
   trunk/tests/test-events.c
   trunk/tests/test-focus.c
   trunk/tests/test-moniker.c
   trunk/tests/test-reparent.c
   trunk/tests/test-selector.c
   trunk/tests/test-sensitivity.c
   trunk/tests/test-toolbar.c
   trunk/tests/test-ui-auto.c
   trunk/tests/test-ui.c
   trunk/tools/browser/window.c

Modified: trunk/bonobo/Makefile.am
==============================================================================
--- trunk/bonobo/Makefile.am	(original)
+++ trunk/bonobo/Makefile.am	Fri Mar  6 10:16:07 2009
@@ -162,7 +162,8 @@
 	$(GLIB_GENMARSHAL) $< --body --prefix=bonobo_ui_marshal > $@
 
 bonobo-ui-type-builtins.c: Makefile $(libbonoboui_h_sources)
-	$(GLIB_MKENUMS) --fhead "#include \"config.h\"\n\n" \
+	$(GLIB_MKENUMS) --fhead "#undef GTK_DISABLE_DEPRECATED\n\n" \
+			--fhead "#include \"config.h\"\n\n" \
 			--fhead "#include \"libbonoboui.h\"\n\n" \
 			--fhead "#include \"bonobo-ui-type-builtins.h\"\n\n" \
 			--fprod "\n/* enumerations from \"@filename \" */" \

Modified: trunk/bonobo/bonobo-canvas-component.c
==============================================================================
--- trunk/bonobo/bonobo-canvas-component.c	(original)
+++ trunk/bonobo/bonobo-canvas-component.c	Fri Mar  6 10:16:07 2009
@@ -210,7 +210,7 @@
 	ArtSVP *svp = NULL;
 	Bonobo_Canvas_ArtUTA *cuta;
 
-	GnomeCanvasItemClass *gci_class = gtk_type_class (
+	GnomeCanvasItemClass *gci_class = g_type_class_ref (
 					gnome_canvas_item_get_type ());
 
 	restore_state (item, state);

Modified: trunk/bonobo/bonobo-control-frame.c
==============================================================================
--- trunk/bonobo/bonobo-control-frame.c	(original)
+++ trunk/bonobo/bonobo-control-frame.c	Fri Mar  6 10:16:07 2009
@@ -13,6 +13,9 @@
  * Copyright 1999, 2001 Ximian, Inc.
  *                 2000 Eazel, Inc.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-control.h>

Modified: trunk/bonobo/bonobo-control.c
==============================================================================
--- trunk/bonobo/bonobo-control.c	(original)
+++ trunk/bonobo/bonobo-control.c	Fri Mar  6 10:16:07 2009
@@ -11,6 +11,9 @@
  * Copyright 1999, 2001 Ximian, Inc.
  *                 2000 Eazel, Inc.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/bonobo/bonobo-dock-layout.c
==============================================================================
--- trunk/bonobo/bonobo-dock-layout.c	(original)
+++ trunk/bonobo/bonobo-dock-layout.c	Fri Mar  6 10:16:07 2009
@@ -177,7 +177,7 @@
 
   item = ((BonoboDockLayoutItem *) list->data)->item;
 
-  gtk_widget_unref (GTK_WIDGET (item));
+  g_object_unref (GTK_WIDGET (item));
 
   layout->items = g_list_remove_link (layout->items, list);
 

Modified: trunk/bonobo/bonobo-dock.c
==============================================================================
--- trunk/bonobo/bonobo-dock.c	(original)
+++ trunk/bonobo/bonobo-dock.c	Fri Mar  6 10:16:07 2009
@@ -825,7 +825,7 @@
               && rel_y >= client_allocation->y
               && rel_y < client_allocation->y + client_allocation->height))
         {
-          gtk_widget_ref (item_widget);
+          g_object_ref (item_widget);
 
           gtk_container_remove (GTK_CONTAINER (item_widget->parent),
                                 item_widget);
@@ -842,7 +842,7 @@
           if (item->in_drag)
             bonobo_dock_item_grab_pointer (item);
 
-          gtk_widget_unref (item_widget);
+          g_object_unref (item_widget);
         }
     }
   else
@@ -1352,7 +1352,7 @@
   bonobo_dock_item_set_orientation (item, orientation);
 
   widget = GTK_WIDGET(item);
-  gtk_widget_ref (widget);
+  g_object_ref (widget);
 
 #if 0
   if (widget->parent != NULL)
@@ -1377,7 +1377,7 @@
 
   connect_drag_signals (dock, widget);
 
-  gtk_widget_unref (widget);
+  g_object_unref (widget);
 
   g_signal_emit (dock, dock_signals[LAYOUT_CHANGED], 0);
 }
@@ -1395,7 +1395,7 @@
   g_return_if_fail (dock != NULL);
 
   if (widget != NULL)
-    gtk_widget_ref (widget);
+    g_object_ref (widget);
 
   if (dock->client_area != NULL)
     gtk_widget_unparent (dock->client_area);
@@ -1424,7 +1424,7 @@
     }
 
   if (widget != NULL)
-    gtk_widget_unref (widget);
+    g_object_unref (widget);
 }
 
 /**

Modified: trunk/bonobo/bonobo-plug.c
==============================================================================
--- trunk/bonobo/bonobo-plug.c	(original)
+++ trunk/bonobo/bonobo-plug.c	Fri Mar  6 10:16:07 2009
@@ -10,6 +10,8 @@
  *                 Martin Baulig.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n-lib.h>

Modified: trunk/bonobo/bonobo-selector-widget.c
==============================================================================
--- trunk/bonobo/bonobo-selector-widget.c	(original)
+++ trunk/bonobo/bonobo-selector-widget.c	Fri Mar  6 10:16:07 2009
@@ -15,6 +15,9 @@
  *                      Martin Baulig, Anders Carlsson,
  *                      Havoc Pennigton, Dietmar Maurer
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h> /* strcmp */
 #include <glib.h>

Modified: trunk/bonobo/bonobo-socket.c
==============================================================================
--- trunk/bonobo/bonobo-socket.c	(original)
+++ trunk/bonobo/bonobo-socket.c	Fri Mar  6 10:16:07 2009
@@ -9,6 +9,9 @@
  * Copyright 2001, Ximian, Inc.
  *                 Martin Baulig.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>

Modified: trunk/bonobo/bonobo-ui-config-widget.c
==============================================================================
--- trunk/bonobo/bonobo-ui-config-widget.c	(original)
+++ trunk/bonobo/bonobo-ui-config-widget.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright 2001 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <stdlib.h>
 #include <gtk/gtk.h>

Modified: trunk/bonobo/bonobo-ui-engine-config.c
==============================================================================
--- trunk/bonobo/bonobo-ui-engine-config.c	(original)
+++ trunk/bonobo/bonobo-ui-engine-config.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright 2001 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <stdlib.h>
 #include <string.h>
@@ -561,8 +563,8 @@
 	gtk_window_set_default_size (
 		GTK_WINDOW (config->priv->dialog), 300, 300);
 	gtk_widget_show (config->priv->dialog);
-	g_signal_connect (GTK_OBJECT (config->priv->dialog),
-			    "destroy", (GtkSignalFunc) null_dialog, config);
+	g_signal_connect (config->priv->dialog,
+			  "destroy", G_CALLBACK (null_dialog), config);
 }
 
 BonoboUIEngine *

Modified: trunk/bonobo/bonobo-ui-engine.c
==============================================================================
--- trunk/bonobo/bonobo-ui-engine.c	(original)
+++ trunk/bonobo/bonobo-ui-engine.c	Fri Mar  6 10:16:07 2009
@@ -13,6 +13,8 @@
  * looking for cleanliness & then re-building
  * from there on down */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -353,7 +355,7 @@
 	
 	if ((w = *ref)) {
 		*ref = NULL;
-		gtk_widget_unref (w);
+		g_object_unref (w);
 	}
 }
 
@@ -996,7 +998,7 @@
 		
 		su->sync   = sync;
 		su->widget = widget;
-		gtk_widget_ref (su->widget);
+		g_object_ref (su->widget);
 		su->state  = state;
 	} else
 		su = NULL;
@@ -1008,7 +1010,7 @@
 state_update_destroy (StateUpdate *su)
 {
 	if (su) {
-		gtk_widget_unref (su->widget);
+		g_object_unref (su->widget);
 		bonobo_ui_node_free_string (su->state);
 
 		g_free (su);
@@ -2072,19 +2074,19 @@
 		add_debug_menu (engine);
 
 	g_signal_connect (priv->tree, "override",
-			  (GtkSignalFunc) override_fn, engine);
+			  G_CALLBACK (override_fn), engine);
 
 	g_signal_connect (priv->tree, "replace_override",
-			  (GtkSignalFunc) replace_override_fn, engine);
+			  G_CALLBACK (replace_override_fn), engine);
 
 	g_signal_connect (priv->tree, "reinstate",
-			  (GtkSignalFunc) reinstate_fn, engine);
+			  G_CALLBACK (reinstate_fn), engine);
 
 	g_signal_connect (priv->tree, "rename",
-			  (GtkSignalFunc) rename_fn, engine);
+			  G_CALLBACK (rename_fn), engine);
 
 	g_signal_connect (priv->tree, "remove",
-			  (GtkSignalFunc) remove_fn, engine);
+			  G_CALLBACK (remove_fn), engine);
 
 	/* Add the engine to the configuration notify list */
 	bonobo_ui_preferences_add_engine (engine);
@@ -2283,7 +2285,7 @@
 					widget, bonobo_ui_node_get_name (a), *pos);
 #endif
 
-				info->widget = widget ? gtk_widget_ref (widget) : NULL;
+				info->widget = widget ? g_object_ref (widget) : NULL;
 				if (widget) {
 					bonobo_ui_engine_widget_set_node (
 						sync->engine, widget, a);
@@ -3085,9 +3087,9 @@
 
 	info = bonobo_ui_xml_get_data (engine->priv->tree, node);
 
-	new_root = widget ? gtk_widget_ref (widget) : NULL;
+	new_root = widget ? g_object_ref (widget) : NULL;
 	if (info->widget)
-		gtk_widget_unref (info->widget);
+		g_object_unref (info->widget);
 	info->widget = new_root;
 	info->type |= ROOT_WIDGET;
 

Modified: trunk/bonobo/bonobo-ui-internal-toolbar.c
==============================================================================
--- trunk/bonobo/bonobo-ui-internal-toolbar.c	(original)
+++ trunk/bonobo/bonobo-ui-internal-toolbar.c	Fri Mar  6 10:16:07 2009
@@ -1,3 +1,5 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <gtk/gtk.h>
 #include <bonobo/bonobo-ui-private.h>

Modified: trunk/bonobo/bonobo-ui-main.c
==============================================================================
--- trunk/bonobo/bonobo-ui-main.c	(original)
+++ trunk/bonobo/bonobo-ui-main.c	Fri Mar  6 10:16:07 2009
@@ -9,6 +9,9 @@
  *
  * Copyright 1999, 2001 Ximian, Inc.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 
 #include <glib/gi18n-lib.h>

Modified: trunk/bonobo/bonobo-ui-preferences.c
==============================================================================
--- trunk/bonobo/bonobo-ui-preferences.c	(original)
+++ trunk/bonobo/bonobo-ui-preferences.c	Fri Mar  6 10:16:07 2009
@@ -9,6 +9,8 @@
  * Copyright 2001 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 #include <gconf/gconf.h>

Modified: trunk/bonobo/bonobo-ui-sync-keys.c
==============================================================================
--- trunk/bonobo/bonobo-ui-sync-keys.c	(original)
+++ trunk/bonobo/bonobo-ui-sync-keys.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <stdlib.h>
 

Modified: trunk/bonobo/bonobo-ui-sync-menu.c
==============================================================================
--- trunk/bonobo/bonobo-ui-sync-menu.c	(original)
+++ trunk/bonobo/bonobo-ui-sync-menu.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
@@ -179,8 +181,8 @@
 
 	g_object_set_data (G_OBJECT (menu), UI_SYNC_MENU_KEY, smenu);
 
-	g_signal_connect (GTK_OBJECT (menu), "destroy",
-			    (GtkSignalFunc) popup_destroy, popup);
+	g_signal_connect (G_OBJECT (menu), "destroy",
+			  G_CALLBACK (popup_destroy), popup);
 
 	node = bonobo_ui_engine_get_path (smenu->parent.engine, path);
 
@@ -624,12 +626,12 @@
 		if (!menu_widget)
 			return NULL;
 			
-		g_signal_connect (GTK_OBJECT (menu_widget),
+		g_signal_connect (G_OBJECT (menu_widget),
 				    "select",
 				    G_CALLBACK (put_hint_in_statusbar),
 				    engine);
 
-		g_signal_connect (GTK_OBJECT (menu_widget),
+		g_signal_connect (G_OBJECT (menu_widget),
 				    "deselect",
 				    G_CALLBACK (remove_hint_from_statusbar),
 				    engine);
@@ -643,14 +645,14 @@
 		GtkMenu      *menu;
 		
 		shell = GTK_MENU_SHELL (parent);
-		g_signal_connect (GTK_OBJECT (shell), "key_press_event",
-				  (GtkSignalFunc) sucking_gtk_keybindings_cb, NULL);
+		g_signal_connect (G_OBJECT (shell), "key_press_event",
+				  G_CALLBACK (sucking_gtk_keybindings_cb), NULL);
 
 
 		/* Create the menu shell. */
 		menu = GTK_MENU (gtk_menu_new ());
-		g_signal_connect (GTK_OBJECT (menu), "key_press_event",
-				  (GtkSignalFunc) sucking_gtk_keybindings_cb, NULL);
+		g_signal_connect (G_OBJECT (menu), "key_press_event",
+				  G_CALLBACK (sucking_gtk_keybindings_cb), NULL);
 
 		gtk_menu_set_accel_group (menu, menu_sync->accel_group);
 
@@ -673,11 +675,11 @@
 		ret_widget = menu_widget;
 
 	if (!GTK_IS_CHECK_MENU_ITEM (menu_widget))
-		g_signal_connect (GTK_OBJECT (menu_widget), "activate",
-				    (GtkSignalFunc) exec_verb_cb, engine);
+		g_signal_connect (G_OBJECT (menu_widget), "activate",
+				  G_CALLBACK (exec_verb_cb), engine);
 
-	g_signal_connect (GTK_OBJECT (menu_widget), "key_press_event",
-			  (GtkSignalFunc) sucking_gtk_keybindings_cb, NULL);
+	g_signal_connect (G_OBJECT (menu_widget), "key_press_event",
+			  G_CALLBACK (sucking_gtk_keybindings_cb), NULL);
 
 	gtk_widget_show (menu_widget);
 			    

Modified: trunk/bonobo/bonobo-ui-sync-status.c
==============================================================================
--- trunk/bonobo/bonobo-ui-sync-status.c	(original)
+++ trunk/bonobo/bonobo-ui-sync-status.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/bonobo/bonobo-ui-sync-toolbar.c
==============================================================================
--- trunk/bonobo/bonobo-ui-sync-toolbar.c	(original)
+++ trunk/bonobo/bonobo-ui-sync-toolbar.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/bonobo/bonobo-ui-toolbar-button-item.c
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-button-item.c	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-button-item.c	Fri Mar  6 10:16:07 2009
@@ -7,6 +7,8 @@
  * Copyright (C) 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -117,7 +119,7 @@
 
 	if (priv->icon != NULL) {
 		if (priv->icon->parent != NULL) {
-			gtk_widget_ref (priv->icon);
+			g_object_ref (priv->icon);
 			gtk_container_remove (GTK_CONTAINER (priv->icon->parent),
 					      priv->icon);
 		}
@@ -125,7 +127,7 @@
 
 	if (priv->label != NULL) {
 		if (priv->label->parent != NULL) {
-			gtk_widget_ref (priv->label);
+			g_object_ref (priv->label);
 			gtk_container_remove (GTK_CONTAINER (priv->label->parent),
 					      priv->label);
 		}

Modified: trunk/bonobo/bonobo-ui-toolbar-control-item.c
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-control-item.c	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-control-item.c	Fri Mar  6 10:16:07 2009
@@ -9,6 +9,8 @@
  * Copyright (C) 2001 Eazel, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 #include <bonobo/bonobo-ui-private.h>

Modified: trunk/bonobo/bonobo-ui-toolbar-item.c
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-item.c	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-item.c	Fri Mar  6 10:16:07 2009
@@ -7,6 +7,8 @@
  * Copyright (C) 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <bonobo/bonobo-ui-private.h>
 #include <bonobo-ui-toolbar-item.h>

Modified: trunk/bonobo/bonobo-ui-toolbar-item.h
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-item.h	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-item.h	Fri Mar  6 10:16:07 2009
@@ -13,6 +13,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#undef GTK_DISABLE_DEPRECATED
 #ifndef BONOBO_UI_DISABLE_DEPRECATED
 
 G_BEGIN_DECLS

Modified: trunk/bonobo/bonobo-ui-toolbar-popup-item.c
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-popup-item.c	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-popup-item.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright (C) 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <bonobo/bonobo-ui-toolbar-popup-item.h>
 #include <gtk/gtk.h>

Modified: trunk/bonobo/bonobo-ui-toolbar-toggle-button-item.c
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-toggle-button-item.c	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-toggle-button-item.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright (C) 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <stdlib.h>
 #include <bonobo/bonobo-ui-toolbar-toggle-button-item.h>

Modified: trunk/bonobo/bonobo-ui-toolbar.c
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar.c	(original)
+++ trunk/bonobo/bonobo-ui-toolbar.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright (C) 2000 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <glib/gi18n-lib.h>
 #include <bonobo/bonobo-ui-private.h>
@@ -1217,12 +1219,12 @@
 	bonobo_ui_toolbar_item_set_orientation (priv->popup_item, priv->orientation);
 	parentize_widget (toolbar, GTK_WIDGET (priv->popup_item));
 
-	g_signal_connect (GTK_OBJECT (priv->popup_item), "toggled",
-			    G_CALLBACK (popup_item_toggled_cb), toolbar);
+	g_signal_connect (G_OBJECT (priv->popup_item), "toggled",
+			  G_CALLBACK (popup_item_toggled_cb), toolbar);
 
 	priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-	g_signal_connect (GTK_OBJECT (priv->popup_window), "button_release_event",
-			    G_CALLBACK (popup_window_button_release_cb), toolbar);
+	g_signal_connect (G_OBJECT (priv->popup_window), "button_release_event",
+			  G_CALLBACK (popup_window_button_release_cb), toolbar);
 
 	frame = gtk_frame_new (NULL);
 	gtk_widget_show (frame);

Modified: trunk/bonobo/bonobo-ui-util.c
==============================================================================
--- trunk/bonobo/bonobo-ui-util.c	(original)
+++ trunk/bonobo/bonobo-ui-util.c	Fri Mar  6 10:16:07 2009
@@ -6,6 +6,9 @@
  *
  * Copyright 2000, 2001 Ximian, Inc.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 

Modified: trunk/bonobo/bonobo-window.c
==============================================================================
--- trunk/bonobo/bonobo-window.c	(original)
+++ trunk/bonobo/bonobo-window.c	Fri Mar  6 10:16:07 2009
@@ -7,6 +7,9 @@
  *
  * Copyright 2000 Ximian, Inc.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 #include <gdk/gdkkeysyms.h>

Modified: trunk/glade/glade-bonobo.c
==============================================================================
--- trunk/glade/glade-bonobo.c	(original)
+++ trunk/glade/glade-bonobo.c	Fri Mar  6 10:16:07 2009
@@ -7,6 +7,9 @@
  *
  * Copyright (C) 2000,2001 Ximian, Inc., 2001,2002 James Henstridge.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/samples/bonoboui/hello.c
==============================================================================
--- trunk/samples/bonoboui/hello.c	(original)
+++ trunk/samples/bonoboui/hello.c	Fri Mar  6 10:16:07 2009
@@ -28,6 +28,8 @@
  * USA
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 #include <stdlib.h>

Modified: trunk/samples/canvdemo/circle.c
==============================================================================
--- trunk/samples/canvdemo/circle.c	(original)
+++ trunk/samples/canvdemo/circle.c	Fri Mar  6 10:16:07 2009
@@ -1,4 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <gdk/gdkkeysyms.h>
 #include <string.h>

Modified: trunk/samples/canvdemo/main.c
==============================================================================
--- trunk/samples/canvdemo/main.c	(original)
+++ trunk/samples/canvdemo/main.c	Fri Mar  6 10:16:07 2009
@@ -1,3 +1,5 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <libgnome/gnome-init.h>
 #include <bonobo.h>

Modified: trunk/samples/canvdemo/square.c
==============================================================================
--- trunk/samples/canvdemo/square.c	(original)
+++ trunk/samples/canvdemo/square.c	Fri Mar  6 10:16:07 2009
@@ -1,4 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 
 /* Comment the below line out and rebuild to see the difference with and 

Modified: trunk/samples/compound-doc/container/container.c
==============================================================================
--- trunk/samples/compound-doc/container/container.c	(original)
+++ trunk/samples/compound-doc/container/container.c	Fri Mar  6 10:16:07 2009
@@ -1,3 +1,5 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <stdlib.h>
 #include <libbonoboui.h>

Modified: trunk/samples/container/bonobo-sample-container.c
==============================================================================
--- trunk/samples/container/bonobo-sample-container.c	(original)
+++ trunk/samples/container/bonobo-sample-container.c	Fri Mar  6 10:16:07 2009
@@ -1,3 +1,5 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <unistd.h>
 #include <bonobo.h>
 #include <glib.h>

Modified: trunk/samples/controls/bonobo-sample-controls.c
==============================================================================
--- trunk/samples/controls/bonobo-sample-controls.c	(original)
+++ trunk/samples/controls/bonobo-sample-controls.c	Fri Mar  6 10:16:07 2009
@@ -7,6 +7,8 @@
  * Copyright 2001, Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 #include <libbonoboui.h>

Modified: trunk/tests/control/test-control.c
==============================================================================
--- trunk/tests/control/test-control.c	(original)
+++ trunk/tests/control/test-control.c	Fri Mar  6 10:16:07 2009
@@ -7,6 +7,8 @@
  * Copyright 2001 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 
 #include <stdlib.h>

Modified: trunk/tests/test-events.c
==============================================================================
--- trunk/tests/test-events.c	(original)
+++ trunk/tests/test-events.c	Fri Mar  6 10:16:07 2009
@@ -7,6 +7,8 @@
  * Copyright 2001 Sun Microsytems, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <string.h>
 

Modified: trunk/tests/test-focus.c
==============================================================================
--- trunk/tests/test-focus.c	(original)
+++ trunk/tests/test-focus.c	Fri Mar  6 10:16:07 2009
@@ -7,6 +7,8 @@
  * Copyright 2001 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 
 #include <stdlib.h>

Modified: trunk/tests/test-moniker.c
==============================================================================
--- trunk/tests/test-moniker.c	(original)
+++ trunk/tests/test-moniker.c	Fri Mar  6 10:16:07 2009
@@ -10,6 +10,8 @@
  * Copyright (C) 2001, Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

Modified: trunk/tests/test-reparent.c
==============================================================================
--- trunk/tests/test-reparent.c	(original)
+++ trunk/tests/test-reparent.c	Fri Mar  6 10:16:07 2009
@@ -8,6 +8,8 @@
  * Copyright (C) 2001 Ximian, Inc.
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <bonobo.h>
 
 static gboolean do_remote = TRUE;
@@ -123,8 +125,8 @@
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (window), vbox);
 
-	g_signal_connect (GTK_OBJECT (window), "delete_event",
-			    (GtkSignalFunc) quit_cb, NULL);
+	g_signal_connect (G_OBJECT (window), "delete_event",
+			  G_CALLBACK (quit_cb), NULL);
 
 	placeholder1 = gtk_frame_new ("Out of proc");
 	gtk_box_pack_start (GTK_BOX (vbox), placeholder1, TRUE, TRUE, 0);
@@ -134,8 +136,8 @@
 
 	button = gtk_button_new_with_label ("Remove and add");
 	gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
-	g_signal_connect (GTK_OBJECT (button), "clicked",
-			    G_CALLBACK (remove_and_add), NULL);
+	g_signal_connect (G_OBJECT (button), "clicked",
+			  G_CALLBACK (remove_and_add), NULL);
   
 	gtk_widget_show_all (window);
 	g_timeout_add (0, idle_init, NULL);

Modified: trunk/tests/test-selector.c
==============================================================================
--- trunk/tests/test-selector.c	(original)
+++ trunk/tests/test-selector.c	Fri Mar  6 10:16:07 2009
@@ -1,4 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <libbonoboui.h>
 

Modified: trunk/tests/test-sensitivity.c
==============================================================================
--- trunk/tests/test-sensitivity.c	(original)
+++ trunk/tests/test-sensitivity.c	Fri Mar  6 10:16:07 2009
@@ -12,6 +12,9 @@
  *
  * Copyright 1999, 2001 Ximian, Inc.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <stdlib.h>
 
 #include <glib/gi18n.h>
@@ -202,7 +205,7 @@
 	 * We can't make any CORBA calls unless we're in the main
 	 * loop.  So we delay creating the container here.
 	 */
-	gtk_idle_add ((GtkFunction) container_create, NULL);
+	g_idle_add ((GSourceFunc) container_create, NULL);
 
 	bonobo_main ();
 

Modified: trunk/tests/test-toolbar.c
==============================================================================
--- trunk/tests/test-toolbar.c	(original)
+++ trunk/tests/test-toolbar.c	Fri Mar  6 10:16:07 2009
@@ -1,3 +1,5 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <stdlib.h>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>

Modified: trunk/tests/test-ui-auto.c
==============================================================================
--- trunk/tests/test-ui-auto.c	(original)
+++ trunk/tests/test-ui-auto.c	Fri Mar  6 10:16:07 2009
@@ -6,6 +6,9 @@
  *
  * Copyright 2002 Ximian, Inc.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 

Modified: trunk/tests/test-ui.c
==============================================================================
--- trunk/tests/test-ui.c	(original)
+++ trunk/tests/test-ui.c	Fri Mar  6 10:16:07 2009
@@ -6,6 +6,9 @@
  *
  * Copyright 2000, 2001 Ximian, Inc.
  */
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 #include <stdlib.h>

Modified: trunk/tools/browser/window.c
==============================================================================
--- trunk/tools/browser/window.c	(original)
+++ trunk/tools/browser/window.c	Fri Mar  6 10:16:07 2009
@@ -313,6 +313,6 @@
 	/* add this window to our list of open windows */
 	open_windows = g_list_append (open_windows, window);
 
-	gtk_widget_set_usize (window, 600, 500);
+	gtk_widget_set_size_request (window, 600, 500);
 	gtk_widget_show_all (window);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]