diff options
author | Christian Persch <chpe@src.gnome.org> | 2009-01-30 18:40:17 (GMT) |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2009-01-30 18:40:17 (GMT) |
commit | 2d8aad40e1916911b773f1cfdd93c961feabf807 (patch) | |
tree | f87dabab6d4ba15446fd5cbe2625e0f18357cf3d /shell/main.c | |
parent | 1f9a1db557a629d68bba06d7b4b4379127c34f4d (diff) |
A libdocument/ev-init.[ch]: Add single init/shutdown method. Bug #569117.
* evince-document.h:
* libdocument/Makefile.am:
A libdocument/ev-init.[ch]: Add single init/shutdown method. Bug
#569117.
* libdocument/ev-backends-manager.c: (_ev_backends_manager_init):
* libdocument/ev-backends-manager.h:
* libdocument/ev-debug.c: (_ev_debug_init), (_ev_debug_shutdown):
* libdocument/ev-debug.h:
* libdocument/ev-file-helpers.c: (_ev_file_helpers_init),
(_ev_file_helpers_shutdown):
* libdocument/ev-file-helpers.h: Make these init/shutdown methods
private.
* properties/ev-properties-main.c: (nautilus_module_initialize),
(nautilus_module_shutdown):
* shell/main.c: (main):
* thumbnailer/evince-thumbnailer.c: (main): Use the new single
init/shutdown method.
svn path=/trunk/; revision=3391
Diffstat (limited to 'shell/main.c')
-rw-r--r-- | shell/main.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/shell/main.c b/shell/main.c index c10ac85..5348469 100644 --- a/shell/main.c +++ b/shell/main.c @@ -33,6 +33,7 @@ #include "ev-application.h" #include "ev-backends-manager.h" #include "ev-debug.h" +#include "ev-init.h" #include "ev-file-helpers.h" #include "ev-stock-icons.h" #include "eggsmclient.h" @@ -369,10 +370,9 @@ main (int argc, char *argv[]) } #endif /* ENABLE_DBUS */ - ev_debug_init (); - ev_backends_manager_init (); - - ev_file_helpers_init (); + if (!ev_init ()) + return 1; + ev_stock_icons_init (); egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop"); @@ -383,11 +383,7 @@ main (int argc, char *argv[]) gtk_main (); - ev_file_helpers_shutdown (); - - ev_backends_manager_shutdown (); - - ev_debug_shutdown (); + ev_shutdown (); return 0; } |