diff options
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | help/reference/shell/Makefile.am | 4 | ||||
| -rw-r--r-- | shell/Makefile.am | 4 | ||||
| -rw-r--r-- | shell/ev-window.c | 9 |
4 files changed, 3 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index b3b08531..655ff9c2 100644 --- a/configure.ac +++ b/configure.ac @@ -97,7 +97,6 @@ dnl Specify required versions of dependencies CAIRO_REQUIRED=1.9.10 GLIB_REQUIRED=2.36.0 LIBSECRET_REQUIRED=0.5 -MATEDESKTOP_REQUIRED=1.9.0 case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 @@ -648,26 +647,6 @@ AC_SUBST(ATRIL_MIME_TYPES) AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system])) -# ********************* -# Mate-desktop support -# ********************* - -AC_ARG_WITH(matedesktop, - [AS_HELP_STRING([--without-matedesktop], - [Disable the use of matedesktop])], - [], - [with_matedesktop=yes]) - -AM_CONDITIONAL([WITH_MATEDESKTOP],[test "$with_matedesktop" = "yes"]) - -if test "$with_matedesktop" = "yes"; then - PKG_CHECK_MODULES([MATE_DESKTOP], mate-desktop-2.0 >= $MATEDESKTOP_REQUIRED) - AC_DEFINE([WITH_MATEDESKTOP],[1],[Define if mate-desktop support is enabled]) -fi - -AC_SUBST([MATE_DESKTOP_CFLAGS]) -AC_SUBST([MATE_DESKTOP_LIBS]) - # ***************** # Help files # ***************** @@ -787,7 +766,6 @@ Configure summary: GTK+ version........: $with_gtk GTK+ Unix Print.....: $with_gtk_unix_print - MATE desktop Support: $with_matedesktop Keyring Support.....: $with_keyring DBUS Support........: $enable_dbus Caja Plugin.........: $enable_caja diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am index 7b5466eb..a78201d7 100644 --- a/help/reference/shell/Makefile.am +++ b/help/reference/shell/Makefile.am @@ -107,8 +107,7 @@ GTKDOC_CFLAGS = \ $(SHELL_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) \ - $(GTK_PRINT_CFLAGS) \ - $(MATE_DESKTOP_CFLAGS) + $(GTK_PRINT_CFLAGS) FILTER_OUT = \ $(top_builddir)/shell/main.o \ @@ -127,7 +126,6 @@ GTKDOC_LIBS = \ $(top_builddir)/libmisc/libevmisc.la \ $(SHELL_LIBS) \ $(GTK_PRINT_LIBS) \ - $(MATE_DESKTOP_LIBS) \ $(filter-out $(FILTER_OUT),$(wildcard $(top_builddir)/shell/*.o)) # This includes the standard gtk-doc make rules, copied by gtkdocize. 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, |