Commit 1ab16a8b authored by Anders Carlsson's avatar Anders Carlsson Committed by Anders Carlsson

Update for new bonobo property bag API.

2001-12-08  Anders Carlsson  <andersca@gnu.org>

	* components/throbber/nautilus-throbber.c:
	(nautilus_throbber_instance_init):
	* src/nautilus-window.c: (nautilus_window_allow_stop):
	Update for new bonobo property bag API.
parent 84204ad0
2001-12-08 Anders Carlsson <andersca@gnu.org>
* components/throbber/nautilus-throbber.c:
(nautilus_throbber_instance_init):
* src/nautilus-window.c: (nautilus_window_allow_stop):
Update for new bonobo property bag API.
2001-12-08 Michael Meeks <michael@ximian.com>
* components/tree/nautilus-tree-view.c
......@@ -37,6 +44,7 @@
* docs/use-cases.txt:
Tweak some documents, removing obsolete ones.
>>>>>>> 1.4866
2001-12-06 Darin Adler <darin@bentspoon.com>
* components/Makefile.am:
......
......@@ -268,10 +268,9 @@ nautilus_throbber_instance_init (NautilusThrobber *throbber)
/* attach a property bag with the configure property */
throbber->details->property_bag = bonobo_property_bag_new (get_bonobo_properties,
set_bonobo_properties, throbber);
#ifdef GNOME2_CONVERSION_COMPLETE
bonobo_control_set_properties (BONOBO_CONTROL (throbber->details->control),
throbber->details->property_bag);
#endif
BONOBO_OBJREF (throbber->details->property_bag), NULL);
bonobo_property_bag_add (throbber->details->property_bag, "throbbing", THROBBING, BONOBO_ARG_BOOLEAN, NULL,
"Throbber active", 0);
bonobo_property_bag_add (throbber->details->property_bag, "location", LOCATION, BONOBO_ARG_STRING, NULL,
......
......@@ -40,6 +40,7 @@
#include "nautilus-zoom-control.h"
#include <X11/Xatom.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-gdk-extensions.h>
......@@ -1719,10 +1720,9 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
if (window->throbber != CORBA_OBJECT_NIL) {
CORBA_exception_init (&ev);
property_bag = Bonobo_Control_getProperties (window->throbber, &ev);
if (!BONOBO_EX (&ev) && property_bag != CORBA_OBJECT_NIL) {
#if GNOME2_CONVERSION_COMPLETE
bonobo_property_bag_client_set_value_gboolean (property_bag, "throbbing", allow, &ev);
#endif
bonobo_pbclient_set_boolean (property_bag, "throbbing", allow, &ev);
bonobo_object_release_unref (property_bag, NULL);
}
CORBA_exception_free (&ev);
......
......@@ -40,6 +40,7 @@
#include "nautilus-zoom-control.h"
#include <X11/Xatom.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-gdk-extensions.h>
......@@ -1719,10 +1720,9 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
if (window->throbber != CORBA_OBJECT_NIL) {
CORBA_exception_init (&ev);
property_bag = Bonobo_Control_getProperties (window->throbber, &ev);
if (!BONOBO_EX (&ev) && property_bag != CORBA_OBJECT_NIL) {
#if GNOME2_CONVERSION_COMPLETE
bonobo_property_bag_client_set_value_gboolean (property_bag, "throbbing", allow, &ev);
#endif
bonobo_pbclient_set_boolean (property_bag, "throbbing", allow, &ev);
bonobo_object_release_unref (property_bag, NULL);
}
CORBA_exception_free (&ev);
......
......@@ -40,6 +40,7 @@
#include "nautilus-zoom-control.h"
#include <X11/Xatom.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-gdk-extensions.h>
......@@ -1719,10 +1720,9 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
if (window->throbber != CORBA_OBJECT_NIL) {
CORBA_exception_init (&ev);
property_bag = Bonobo_Control_getProperties (window->throbber, &ev);
if (!BONOBO_EX (&ev) && property_bag != CORBA_OBJECT_NIL) {
#if GNOME2_CONVERSION_COMPLETE
bonobo_property_bag_client_set_value_gboolean (property_bag, "throbbing", allow, &ev);
#endif
bonobo_pbclient_set_boolean (property_bag, "throbbing", allow, &ev);
bonobo_object_release_unref (property_bag, NULL);
}
CORBA_exception_free (&ev);
......
......@@ -40,6 +40,7 @@
#include "nautilus-zoom-control.h"
#include <X11/Xatom.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-gdk-extensions.h>
......@@ -1719,10 +1720,9 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
if (window->throbber != CORBA_OBJECT_NIL) {
CORBA_exception_init (&ev);
property_bag = Bonobo_Control_getProperties (window->throbber, &ev);
if (!BONOBO_EX (&ev) && property_bag != CORBA_OBJECT_NIL) {
#if GNOME2_CONVERSION_COMPLETE
bonobo_property_bag_client_set_value_gboolean (property_bag, "throbbing", allow, &ev);
#endif
bonobo_pbclient_set_boolean (property_bag, "throbbing", allow, &ev);
bonobo_object_release_unref (property_bag, NULL);
}
CORBA_exception_free (&ev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment