diff options
author | Wouter Bolsterlee <wbolster@cvs.gnome.org> | 2006-11-21 23:54:14 (GMT) |
---|---|---|
committer | Wouter Bolsterlee <wbolster@src.gnome.org> | 2006-11-21 23:54:14 (GMT) |
commit | 949bd66322de613217672824798fbc7973c8b314 (patch) | |
tree | a7f347ce58f77cd93be83e7e4cd3fa70932b2c2d /shell/Makefile.am | |
parent | 3f6b889102d20dba9778902f42741b2fdcb47f9b (diff) |
cut-n-paste/totem-screensaver/.cvsignore
2006-11-22 Wouter Bolsterlee <wbolster@cvs.gnome.org>
* configure.ac:
* cut-n-paste/Makefile.am:
* cut-n-paste/totem-screensaver/.cvsignore
* cut-n-paste/totem-screensaver/Makefile.am:
* cut-n-paste/totem-screensaver/README:
* cut-n-paste/totem-screensaver/totem-scrsaver.c:
* cut-n-paste/totem-screensaver/totem-scrsaver.h:
* shell/Makefile.am:
* shell/ev-window.c: (ev_window_run_presentation),
(ev_window_stop_presentation), (ev_window_cmd_help_about),
(ev_window_init):
Implemented screensaver enabling/disabling for
presentation mode (not fullscreen mode). Code stolen
from Totem (with some minor tweaks). Fixes bug #338889.
Diffstat (limited to 'shell/Makefile.am')
-rw-r--r-- | shell/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 30dde9e..3033504 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -4,6 +4,7 @@ INCLUDES= \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/cut-n-paste/zoom-control/ \ -I$(top_srcdir)/cut-n-paste/toolbar-editor/ \ + -I$(top_srcdir)/cut-n-paste/totem-screensaver/ \ -I$(top_srcdir)/backend \ -I$(top_srcdir)/properties \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ @@ -82,6 +83,7 @@ evince_SOURCES= \ ev-stock-icons.h \ main.c + if WITH_GNOME_PRINT evince_SOURCES+= \ ev-print-job.c \ @@ -92,6 +94,7 @@ endif evince_LDADD= \ $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ + $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ $(top_builddir)/properties/libevproperties.la \ $(top_builddir)/lib/libev.la \ $(SHELL_LIBS) \ |