diff options
| -rw-r--r-- | my-evolution/ChangeLog | 6 | ||||
| -rw-r--r-- | my-evolution/component-factory.c | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 9396182ee3..c49ab24b94 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,5 +1,11 @@ 2002-11-20 Ettore Perazzoli <ettore@ximian.com> + * component-factory.c (owner_unset_cb): bonobo_main_quit() instead + of gtk_main_quit(). + (component_destroy): Likewise. + +2002-11-20 Ettore Perazzoli <ettore@ximian.com> + * component-factory.c: Removed unused #define COMPONENT_FACTORY_ID. (component_factory_init): Removed unused variable. diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c index a60bd2374a..e04e8ca3f7 100644 --- a/my-evolution/component-factory.c +++ b/my-evolution/component-factory.c @@ -28,14 +28,13 @@ #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-context.h> #include <bonobo/bonobo-shlib-factory.h> +#include <bonobo/bonobo-main.h> #include <shell/evolution-shell-component.h> #include <shell/Evolution.h> #include <gal/widgets/e-gui-utils.h> -#include <gtk/gtkmain.h> - #include "e-summary-factory.h" #include "e-summary-offline-handler.h" #include "e-summary.h" @@ -109,20 +108,17 @@ static void owner_unset_cb (EvolutionShellComponent *shell_component, gpointer user_data) { - gtk_main_quit (); + bonobo_main_quit (); } static void component_destroy (BonoboObject *factory, - gpointer user_data) + gpointer user_data) { running_objects--; - if (running_objects > 0) { + if (running_objects > 0) return; - } - - gtk_main_quit (); } static BonoboObject * |