hi these are he first patches with changelog entry, as nothing has changed from yesterdays ones, except for the Changelog entry and requiring the newest libbonobo, i will commit them to cvs. Diego
Index: ChangeLog =================================================================== RCS file: /cvs/gnome/nautilus/ChangeLog,v retrieving revision 1.5578 diff -u -r1.5578 ChangeLog --- ChangeLog 4 Nov 2002 14:59:48 -0000 1.5578 +++ ChangeLog 5 Nov 2002 08:23:49 -0000 @@ -1,3 +1,11 @@ +2002-11-04 Diego González <diego pemas net> + + * src/nautilus-window-toolbars.c: (throbber_set_throbbing): + Use bonobo_pbclient_set_value_async instead of + eel_bonobo_pbclient_set_value_async. + + * configure.in: require latest libbonobo + 2002-11-04 Alexander Larsson <alexl redhat com> * components/throbber/nautilus-throbber.c: (get_bonobo_properties), Index: configure.in =================================================================== RCS file: /cvs/gnome/nautilus/configure.in,v retrieving revision 1.480 diff -u -r1.480 configure.in --- configure.in 1 Nov 2002 01:09:17 -0000 1.480 +++ configure.in 5 Nov 2002 08:23:49 -0000 @@ -4,7 +4,7 @@ ART_REQUIRED=2.3.10 BONOBO_ACTIVATION_REQUIRED=1.0.0 -BONOBO_REQUIRED=2.0.0 +BONOBO_REQUIRED=2.1.0 BONOBO_UI_REQUIRED=2.0.0 EEL_REQUIRED=2.1.2 ESOUND_REQUIRED=0.2.27 Index: src/nautilus-window-toolbars.c =================================================================== RCS file: /cvs/gnome/nautilus/src/nautilus-window-toolbars.c,v retrieving revision 1.105 diff -u -r1.105 nautilus-window-toolbars.c --- src/nautilus-window-toolbars.c 4 Nov 2002 14:59:53 -0000 1.105 +++ src/nautilus-window-toolbars.c 5 Nov 2002 08:23:49 -0000 @@ -300,7 +300,7 @@ val._value = &b; b = throbbing; - eel_bonobo_pbclient_set_value_async ( + bonobo_pbclient_set_value_async ( window->details->throbber_property_bag, "throbbing", &val, NULL); }
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/eel/ChangeLog,v
retrieving revision 1.471
diff -u -r1.471 ChangeLog
--- ChangeLog 4 Nov 2002 15:45:55 -0000 1.471
+++ ChangeLog 5 Nov 2002 08:20:43 -0000
@@ -1,3 +1,10 @@
+2002-11-04 Diego González <diego pemas net>
+
+ * eel/eel-gnome-extensions.h:
+ * eel/eel-gnome-extensions.c: (get_set_value_imethod),
+ (do_nothing_cb), (eel_bonobo_pbclient_set_value_async):
+ remove these functions since they are now in libbonobo
+
2002-11-04 Alexander Larsson <alexl redhat com>
* eel/eel-gdk-pixbuf-extensions.c: (file_read_callback):
Index: eel/eel-gnome-extensions.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-gnome-extensions.c,v
retrieving revision 1.41
diff -u -r1.41 eel-gnome-extensions.c
--- eel/eel-gnome-extensions.c 2 Oct 2002 05:17:57 -0000 1.41
+++ eel/eel-gnome-extensions.c 5 Nov 2002 08:20:43 -0000
@@ -460,85 +460,6 @@
iid, DisplayString (gdk_display));
}
-static ORBit_IMethod *
-get_set_value_imethod (void)
-{
- static ORBit_IMethod *imethod = NULL;
-
- if (!imethod) {
- guint i;
- ORBit_IMethods *methods;
-
- methods = &Bonobo_PropertyBag__iinterface.methods;
-
- for (i = 0; i < methods->_length; i++) {
- if (!strcmp (methods->_buffer [i].name,
- "setValue"))
- imethod = &methods->_buffer [i];
- }
- g_assert (imethod != NULL);
- }
-
- return imethod;
-}
-
-static void
-do_nothing_cb (CORBA_Object object,
- ORBit_IMethod *m_data,
- ORBitAsyncQueueEntry *aqe,
- gpointer user_data,
- CORBA_Environment *ev)
-{
- /* FIXME: we can remove this when people
- have the fixed ORB more prevelantly */
-}
-
-/**
- * eel_bonobo_pbclient_set_value_async:
- * @bag: a reference to the PropertyBag
- * @key: key of the value to set
- * @value: the new value
- * @opt_ev: an optional CORBA_Environment to return failure codes
- *
- * Set a value on the PropertyBag asynchronously, discarding any
- * possible roundtrip exceptions.
- */
-void
-eel_bonobo_pbclient_set_value_async (Bonobo_PropertyBag bag,
- const char *key,
- CORBA_any *value,
- CORBA_Environment *opt_ev)
-{
- gpointer args [2];
- CORBA_Environment ev, *my_ev;
-
- g_return_if_fail (key != NULL);
- g_return_if_fail (value != NULL);
- g_return_if_fail (bag != CORBA_OBJECT_NIL);
-
- if (!opt_ev) {
- CORBA_exception_init (&ev);
- my_ev = &ev;
- } else
- my_ev = opt_ev;
-
- if (BONOBO_EX (my_ev) || bag == CORBA_OBJECT_NIL) {
- if (!opt_ev)
- CORBA_exception_free (&ev);
- return;
- }
-
- args [0] = (gpointer) &key;
- args [1] = (gpointer) value;
-
- ORBit_small_invoke_async
- (bag, get_set_value_imethod (),
- do_nothing_cb, NULL, args, NULL, my_ev);
-
- if (!opt_ev)
- CORBA_exception_free (&ev);
-}
-
/**
* eel_glade_get_file:
* @filename: the XML file name.
Index: eel/eel-gnome-extensions.h
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-gnome-extensions.h,v
retrieving revision 1.22
diff -u -r1.22 eel-gnome-extensions.h
--- eel/eel-gnome-extensions.h 2 Oct 2002 05:17:57 -0000 1.22
+++ eel/eel-gnome-extensions.h 5 Nov 2002 08:20:43 -0000
@@ -59,11 +59,6 @@
char *eel_bonobo_make_registration_id (const char *iid);
-void eel_bonobo_pbclient_set_value_async (Bonobo_PropertyBag bag,
- const char *key,
- CORBA_any *value,
- CORBA_Environment *opt_ev);
-
GladeXML *eel_glade_get_file (const char *filename,
const char *root,
const char *domain,
Attachment:
signature.asc
Description: This is a digitally signed message part