aboutsummaryrefslogtreecommitdiffstats
path: root/my-evolution
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-21 06:52:35 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-21 06:52:35 +0800
commitd28115c20074ccef49fcdfe8142153c6ae96cc05 (patch)
tree42f1d92720fcc1a45e4c023efdbe4b546bda9f68 /my-evolution
parent6a9d2e6b0d1db2dd9f1bc76413bd06e130f48fb8 (diff)
downloadgsoc2013-evolution-d28115c20074ccef49fcdfe8142153c6ae96cc05.tar
gsoc2013-evolution-d28115c20074ccef49fcdfe8142153c6ae96cc05.tar.gz
gsoc2013-evolution-d28115c20074ccef49fcdfe8142153c6ae96cc05.tar.bz2
gsoc2013-evolution-d28115c20074ccef49fcdfe8142153c6ae96cc05.tar.lz
gsoc2013-evolution-d28115c20074ccef49fcdfe8142153c6ae96cc05.tar.xz
gsoc2013-evolution-d28115c20074ccef49fcdfe8142153c6ae96cc05.tar.zst
gsoc2013-evolution-d28115c20074ccef49fcdfe8142153c6ae96cc05.zip
(owner_unset_cb): bonobo_main_quit() instead
of gtk_main_quit(). (component_destroy): Likewise. svn path=/trunk/; revision=18868
Diffstat (limited to 'my-evolution')
-rw-r--r--my-evolution/ChangeLog6
-rw-r--r--my-evolution/component-factory.c12
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 *