Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/main.c
diff options
context:
space:
mode:
authorChristian 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)
commitdf2a098c49bdaf1e2e0ef7483074b00376e5495e (patch)
tree3c076defc84f7fa6cd308e6894735331e411c2a6 /shell/main.c
parentf4f0da024897ef5e9481ee693b8a5f284f29fe7c (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/main.c')
-rw-r--r--shell/main.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/shell/main.c b/shell/main.c
index 60f92c7..0ddf56f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -34,7 +34,6 @@
#include "ev-backends-manager.h"
#include "ev-debug.h"
#include "ev-file-helpers.h"
-#include "ev-metadata-manager.h"
#include "ev-stock-icons.h"
#include "eggsmclient.h"
#include "eggdesktopfile.h"
@@ -316,7 +315,6 @@ main (int argc, char *argv[])
{
GOptionContext *context;
GHashTable *args;
- gboolean enable_metadata = FALSE;
GError *error = NULL;
/* Init glib threads asap */
@@ -355,18 +353,12 @@ main (int argc, char *argv[])
return 0;
}
- } else {
- enable_metadata = TRUE;
}
#endif /* ENABLE_DBUS */
ev_debug_init ();
ev_backends_manager_init ();
- if (enable_metadata) {
- ev_metadata_manager_init ();
- }
-
ev_file_helpers_init ();
ev_stock_icons_init ();
@@ -380,10 +372,6 @@ main (int argc, char *argv[])
ev_file_helpers_shutdown ();
- if (enable_metadata) {
- ev_metadata_manager_shutdown ();
- }
-
ev_backends_manager_shutdown ();
ev_debug_shutdown ();