Hi these patches remove some of the properties support that is not used by nautilus due to the recent integration of the new preferences dialog. the second patch remove eel_bonobo_pbclient_set_value_async that is now in libbonobo. Diego PD: if the patches are approved i will write the Changelog entry before uploading them to cvs.
Index: Makefile.am =================================================================== RCS file: /cvs/gnome/eel/eel/Makefile.am,v retrieving revision 1.68 diff -u -r1.68 Makefile.am --- Makefile.am 31 Oct 2002 19:00:46 -0000 1.68 +++ Makefile.am 3 Nov 2002 16:02:35 -0000 @@ -50,7 +50,6 @@ eel-ellipsizing-label.c \ eel-enumeration.c \ eel-features.c \ - eel-font-picker.c \ eel-gconf-extensions.c \ eel-gdk-extensions.c \ eel-gdk-pixbuf-extensions.c \ @@ -67,11 +66,7 @@ eel-lib-self-check-functions.c \ eel-pango-extensions.c \ eel-password-dialog.c \ - eel-preferences-box.c \ eel-preferences-glade.c \ - eel-preferences-group.c \ - eel-preferences-item.c \ - eel-preferences-pane.c \ eel-preferences.c \ eel-radio-button-group.c \ eel-self-checks.c \ @@ -79,7 +74,6 @@ eel-string-list.c \ eel-string-picker.c \ eel-string.c \ - eel-text-caption.c \ eel-types.c \ eel-vfs-extensions.c \ eel-wrap-table.c \ @@ -109,7 +103,6 @@ eel-ellipsizing-label.h \ eel-enumeration.h \ eel-features.h \ - eel-font-picker.h \ eel-gconf-extensions.h \ eel-gdk-extensions.h \ eel-gdk-pixbuf-extensions.h \ @@ -126,11 +119,7 @@ eel-labeled-image.h \ eel-pango-extensions.h \ eel-password-dialog.h \ - eel-preferences-box.h \ eel-preferences-glade.h \ - eel-preferences-group.h \ - eel-preferences-item.h \ - eel-preferences-pane.h \ eel-preferences.h \ eel-radio-button-group.h \ eel-self-checks.h \ @@ -138,7 +127,6 @@ eel-string-list.h \ eel-string-picker.h \ eel-string.h \ - eel-text-caption.h \ eel-types.h \ eel-vfs-extensions.h \ eel-wrap-table.h \ Index: eel.h =================================================================== RCS file: /cvs/gnome/eel/eel/eel.h,v retrieving revision 1.16 diff -u -r1.16 eel.h --- eel.h 23 Feb 2002 01:06:29 -0000 1.16 +++ eel.h 3 Nov 2002 16:02:35 -0000 @@ -34,7 +34,6 @@ #include <eel/eel-ellipsizing-label.h> #include <eel/eel-enumeration.h> #include <eel/eel-features.h> -#include <eel/eel-font-picker.h> #include <eel/eel-gconf-extensions.h> #include <eel/eel-gdk-extensions.h> #include <eel/eel-gdk-pixbuf-extensions.h> @@ -50,10 +49,6 @@ #include <eel/eel-labeled-image.h> #include <eel/eel-pango-extensions.h> #include <eel/eel-password-dialog.h> -#include <eel/eel-preferences-box.h> -#include <eel/eel-preferences-group.h> -#include <eel/eel-preferences-item.h> -#include <eel/eel-preferences-pane.h> #include <eel/eel-preferences.h> #include <eel/eel-radio-button-group.h> #include <eel/eel-self-checks.h> @@ -61,7 +56,6 @@ #include <eel/eel-string-list.h> #include <eel/eel-string-picker.h> #include <eel/eel-string.h> -#include <eel/eel-text-caption.h> #include <eel/eel-types.h> #include <eel/eel-vfs-extensions.h> #include <eel/eel-wrap-table.h>
Index: 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-gnome-extensions.c 2 Oct 2002 05:17:57 -0000 1.41
+++ eel-gnome-extensions.c 3 Nov 2002 16:08:50 -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-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-gnome-extensions.h 2 Oct 2002 05:17:57 -0000 1.22
+++ eel-gnome-extensions.h 3 Nov 2002 16:08:50 -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