summaryrefslogtreecommitdiff
path: root/libnautilus-private/nautilus-bonobo-extensions.c
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2001-10-28 20:21:52 +0000
committerDarin Adler <darin@src.gnome.org>2001-10-28 20:21:52 +0000
commit5abcc1995419a91bebe2e42a5218a374e36533c3 (patch)
tree2f6c9699dc992039a973b0bd058aebfa2d820669 /libnautilus-private/nautilus-bonobo-extensions.c
parentb36a91ca55636af4137615a88c6e70a6dffe7802 (diff)
downloadnautilus-5abcc1995419a91bebe2e42a5218a374e36533c3.tar.gz
More GNOME 2 work. We now compile up to libnautilus-private and I'm
* Lots of files: More GNOME 2 work. We now compile up to libnautilus-private and I'm working my way through the files in there. Also changed all the initialize_class and initialize to class_init and init.
Diffstat (limited to 'libnautilus-private/nautilus-bonobo-extensions.c')
-rw-r--r--libnautilus-private/nautilus-bonobo-extensions.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index f4cc80391..1c38ff29a 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -32,7 +32,6 @@
#include <bonobo/bonobo-ui-util.h>
#include <gtk/gtkmain.h>
#include <libgnomevfs/gnome-vfs-utils.h>
-#include <liboaf/oaf-async.h>
struct NautilusBonoboActivationHandle {
NautilusBonoboActivationHandle **early_completion_hook;
@@ -548,7 +547,7 @@ activation_cancel (NautilusBonoboActivationHandle *handle)
}
static void
-oaf_activation_callback (Bonobo_Unknown activated_object,
+bonobo_activation_activation_callback (Bonobo_Unknown activated_object,
const char *error_reason,
gpointer callback_data)
{
@@ -591,8 +590,8 @@ nautilus_bonobo_activate_from_id (const char *iid,
handle->callback = callback;
handle->callback_data = callback_data;
- oaf_activate_from_id_async ((char *) iid, 0,
- oaf_activation_callback,
+ bonobo_activation_activate_from_id_async ((char *) iid, 0,
+ bonobo_activation_activation_callback,
handle, NULL);
if (handle != NULL) {