diff options
| author | Michael Fleming <mfleming@src.gnome.org> | 2000-10-30 04:24:18 +0000 |
|---|---|---|
| committer | Michael Fleming <mfleming@src.gnome.org> | 2000-10-30 04:24:18 +0000 |
| commit | c31424cb65f8d0a7a6af9f267a564cfac29af26e (patch) | |
| tree | ab69c8df2d89ff826d313b61e7b9c1885699b804 /src | |
| parent | b61ce8edd55e0114cfdd186bb72838b2dd9a158d (diff) | |
| download | nautilus-c31424cb65f8d0a7a6af9f267a564cfac29af26e.tar.gz | |
switch authority-less eazel-services URL's from "eazel-services:/" to
* components/services/summary/nautilus-view/nautilus-summary-view.c
: switch authority-less eazel-services URL's
from "eazel-services:/" to "eazel-services:///"
* src/nautilus-window-service-ui.c: (goto_online_storage),
(goto_software_catalog), (detach_service_ui),
(nautilus_window_install_service_ui):
Go back to initing ammonite each time these menus are called.
I didn't want to bother with trying to make it work.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-window-service-ui.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/nautilus-window-service-ui.c b/src/nautilus-window-service-ui.c index 414ac0566..0e65651cb 100644 --- a/src/nautilus-window-service-ui.c +++ b/src/nautilus-window-service-ui.c @@ -32,8 +32,6 @@ #include <libtrilobite/libammonite.h> #include <bonobo/bonobo-main.h> -static EazelProxy_UserControl gl_user_control = CORBA_OBJECT_NIL; - static void goto_services_summary (BonoboUIComponent *component, gpointer callback_data, @@ -51,8 +49,10 @@ goto_online_storage (BonoboUIComponent *component, char *url; char *user_name; - if ( gl_user_control != CORBA_OBJECT_NIL ) { - user_name = ammonite_get_default_user_username (gl_user_control); + /* FIXME ideally, the ammonite_init should happen once per process */ + if ( ammonite_init (bonobo_poa())) { + user_name = ammonite_get_default_user_username (ammonite_get_user_control()); + ammonite_shutdown(); } else { user_name = NULL; } @@ -81,14 +81,14 @@ goto_software_catalog (BonoboUIComponent *component, gboolean logged_in; char *user_name; - if (gl_user_control != CORBA_OBJECT_NIL) { - user_name = ammonite_get_default_user_username (gl_user_control); + /* FIXME ideally, the ammonite_init should happen once per process */ + if (ammonite_init (bonobo_poa())) { + user_name = ammonite_get_default_user_username (ammonite_get_user_control()); logged_in = (NULL != user_name); g_free (user_name); - user_name = NULL; - ammonite_shutdown (); + ammonite_shutdown(); } else { logged_in = FALSE; } @@ -129,8 +129,6 @@ detach_service_ui (GtkObject *object, service_ui = BONOBO_UI_COMPONENT (callback_data); bonobo_ui_component_unset_container (service_ui); bonobo_object_unref (BONOBO_OBJECT (service_ui)); - - ammonite_shutdown(); } void @@ -146,10 +144,6 @@ nautilus_window_install_service_ui (NautilusWindow *window) BONOBO_UI_VERB_END }; - if ( ammonite_init (bonobo_poa()) ) { - gl_user_control = ammonite_get_user_control(); - } - /* Load UI from the XML file. */ service_ui = bonobo_ui_component_new ("Eazel Services"); bonobo_ui_component_add_verb_list_with_data (service_ui, verbs, window); |