diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2005-07-07 15:35:16 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2005-07-07 15:35:16 (GMT) |
| commit | 28df8004a43a579e93ea905a2426fe42e1e6dfa7 (patch) | |
| tree | 7cad44effd0fc19908b46514eb21d508aabda382 | |
| parent | 54bf2ac0ed59a10a51405ee9f14de5eb9d503148 (diff) | |
Ever build metadata manager since it's just disabled at runtime now.
2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
* configure.ac:
* shell/Makefile.am:
Ever build metadata manager since it's just
disabled at runtime now.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | shell/Makefile.am | 8 | ||||
| -rw-r--r-- | shell/main.c | 7 |
4 files changed, 11 insertions, 14 deletions
@@ -1,5 +1,13 @@ 2005-07-07 Marco Pesenti Gritti <mpg@redhat.com> + * configure.ac: + * shell/Makefile.am: + + Ever build metadata manager since it's just + disabled at runtime now. + +2005-07-07 Marco Pesenti Gritti <mpg@redhat.com> + * shell/ev-metadata-manager.c: (ev_metadata_manager_init), (ev_metadata_manager_get), (ev_metadata_manager_set): * shell/ev-metadata-manager.h: diff --git a/configure.ac b/configure.ac index a0459df..4b91c1a 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,6 @@ if test "x$enable_dbus" = "xyes" ; then fi AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled]) - AC_DEFINE([ENABLE_METADATA],[1],[Define if metadata support is enabled]) DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0.\([[0-9]]*\)/\1/'` AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.]) @@ -90,7 +89,6 @@ AC_SUBST(FRONTEND_CFLAGS) AC_SUBST(FRONTEND_LIBS) AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"]) -AM_CONDITIONAL([ENABLE_METADATA], [test "x$enable_dbus" = "xyes"]) AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"]) dnl Check for Nautilus property page build diff --git a/shell/Makefile.am b/shell/Makefile.am index 8b6cd7d..dffbb75 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -30,6 +30,8 @@ evince_SOURCES= \ ev-job-xfer.h \ ev-marshal.c \ ev-marshal.h \ + ev-metadata-manager.c \ + ev-metadata-manager.h \ ev-page-action.c \ ev-page-action.h \ ev-page-cache.h \ @@ -66,12 +68,6 @@ evince_SOURCES= \ ev-stock-icons.h \ main.c -if ENABLE_METADATA -evince_SOURCES += \ - ev-metadata-manager.h \ - ev-metadata-manager.c -endif - evince_LDADD= \ $(SHELL_LIBS) \ $(top_builddir)/cut-n-paste/recent-files/librecent.la \ diff --git a/shell/main.c b/shell/main.c index 7a07091..f6600f0 100644 --- a/shell/main.c +++ b/shell/main.c @@ -149,9 +149,7 @@ load_files_remote (const char **files) int main (int argc, char *argv[]) { -#ifdef ENABLE_METADATA gboolean enable_metadata = FALSE; -#endif poptContext context; GValue context_as_value = { 0 }; GnomeProgram *program; @@ -189,11 +187,10 @@ main (int argc, char *argv[]) gnome_authentication_manager_init (); -#if ENABLE_METADATA + if (enable_metadata) { ev_metadata_manager_init (); } -#endif ev_job_queue_init (); g_set_application_name (_("Evince Document Viewer")); @@ -211,11 +208,9 @@ main (int argc, char *argv[]) poptFreeContext (context); ev_file_helpers_shutdown (); -#if ENABLE_METADATA if (enable_metadata) { ev_metadata_manager_shutdown (); } -#endif return 0; } |