diff options
| author | Christian Persch <chpe@src.gnome.org> | 2009-01-26 20:30:48 (GMT) |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2009-01-26 20:30:48 (GMT) |
| commit | df2a098c49bdaf1e2e0ef7483074b00376e5495e (patch) | |
| tree | 3c076defc84f7fa6cd308e6894735331e411c2a6 /shell/ev-application.c | |
| parent | f4f0da024897ef5e9481ee693b8a5f284f29fe7c (diff) | |
Move metadata manager initialisation and shutdown into EvApplication.
* shell/ev-application.c: (ev_application_register_service),
(ev_application_shutdown):
* shell/main.c: (main): Move metadata manager initialisation and
shutdown into EvApplication. Follow-up from bug #569120.
svn path=/trunk/; revision=3386
Diffstat (limited to 'shell/ev-application.c')
| -rw-r--r-- | shell/ev-application.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/shell/ev-application.c b/shell/ev-application.c index 4164d0b..3a099f3 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -36,6 +36,7 @@ #include "ev-application.h" #include "ev-document-factory.h" #include "ev-file-helpers.h" +#include "ev-metadata-manager.h" #include "ev-utils.h" #ifdef ENABLE_DBUS @@ -78,6 +79,8 @@ struct _EvApplicationClass { GObjectClass base_class; }; +static EvApplication *instance; + G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT); #define APPLICATION_SERVICE_NAME "org.gnome.evince.ApplicationService" @@ -134,7 +137,9 @@ ev_application_register_service (EvApplication *application) G_OBJECT (application)); application->scr_saver = totem_scrsaver_new (connection); - + + ev_metadata_manager_init (); + return TRUE; } #endif /* ENABLE_DBUS */ @@ -149,8 +154,6 @@ ev_application_register_service (EvApplication *application) EvApplication * ev_application_get_instance (void) { - static EvApplication *instance; - if (!instance) { instance = EV_APPLICATION (g_object_new (EV_TYPE_APPLICATION, NULL)); } @@ -732,12 +735,15 @@ ev_application_shutdown (EvApplication *application) } #endif /* ENABLE_DBUS */ + ev_metadata_manager_shutdown (); + g_free (application->dot_dir); application->dot_dir = NULL; g_free (application->last_chooser_uri); application->last_chooser_uri = NULL; g_object_unref (application); + instance = NULL; gtk_main_quit (); } |