diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 4 | ||||
| -rw-r--r-- | shell/ev-window.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 81782a62..f161315a 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS= \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DATRIL_COMPILATION \ $(SHELL_CFLAGS) \ - $(MATE_DESKTOP_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) @@ -112,8 +111,7 @@ atril_LDADD= \ $(top_builddir)/libdocument/libatrildocument.la \ $(top_builddir)/libview/libatrilview.la \ $(top_builddir)/libmisc/libevmisc.la \ - $(SHELL_LIBS) \ - $(MATE_DESKTOP_LIBS) + $(SHELL_LIBS) BUILT_SOURCES = ev-marshal.h ev-marshal.c diff --git a/shell/ev-window.c b/shell/ev-window.c index 9ffcc872..20effead 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -41,10 +41,6 @@ #include <gio/gio.h> #include <gtk/gtk.h> -#ifdef WITH_MATEDESKTOP -#include <libmate-desktop/mate-gsettings.h> -#endif - #include "egg-editable-toolbar.h" #include "egg-toolbar-editor.h" #include "egg-toolbars-model.h" @@ -1549,13 +1545,10 @@ ev_window_setup_document (EvWindow *ev_window) ev_window_ensure_settings (ev_window); -#ifdef WITH_MATEDESKTOP - if (mate_gsettings_schema_exists (MATE_LOCKDOWN_SCHEMA)) { -#else GSettingsSchema *schema_mate_lockdown_schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default(), MATE_LOCKDOWN_SCHEMA, FALSE); if (schema_mate_lockdown_schema != NULL) { g_settings_schema_unref (schema_mate_lockdown_schema); -#endif + if (!ev_window->priv->lockdown_settings) ev_window->priv->lockdown_settings = g_settings_new (MATE_LOCKDOWN_SCHEMA); g_signal_connect (ev_window->priv->lockdown_settings, |