summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorrootavish <[email protected]>2014-08-11 06:45:41 +0530
committerrootavish <[email protected]>2014-08-11 06:45:41 +0530
commit020b11e5f204453614c7c45287d9b39c376d1e4a (patch)
tree0a44a205457fd0ca509a285344726b2e2378aed4 /shell
parent1548bcb4629a6a41641a0188003215b3098aa5fc (diff)
parent1bdae54253b68f2042f1d7f43ac0f36654c9b432 (diff)
downloadatril-020b11e5f204453614c7c45287d9b39c376d1e4a.tar.bz2
atril-020b11e5f204453614c7c45287d9b39c376d1e4a.tar.xz
Merge remote-tracking branch 'upstream/master' into epub
Diffstat (limited to 'shell')
-rw-r--r--shell/ev-window.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c
index fda6f68b..c1e389b3 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -42,6 +42,7 @@
#include <gtk/gtk.h>
#include <libmate-desktop/mate-aboutdialog.h>
+#include <libmate-desktop/mate-gsettings.h>
#include "egg-editable-toolbar.h"
#include "egg-toolbar-editor.h"
@@ -429,12 +430,12 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
if (has_document && !ev_print_operation_exists_for_document(document))
ok_to_print = FALSE;
- if (has_document &&
+ if (has_document && ev_window->priv->lockdown_settings &&
g_settings_get_boolean (ev_window->priv->lockdown_settings, MATE_LOCKDOWN_SAVE)) {
ok_to_copy = FALSE;
}
- if (has_document &&
+ if (has_document && ev_window->priv->lockdown_settings &&
g_settings_get_boolean (ev_window->priv->lockdown_settings, MATE_LOCKDOWN_PRINT)) {
ok_to_print = FALSE;
}
@@ -1438,12 +1439,14 @@ ev_window_setup_document (EvWindow *ev_window)
ev_window);
}
- 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,
- "changed",
- G_CALLBACK (lockdown_changed),
- ev_window);
+ if (mate_gsettings_schema_exists (MATE_LOCKDOWN_SCHEMA)) {
+ 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,
+ "changed",
+ G_CALLBACK (lockdown_changed),
+ ev_window);
+ }
ev_window_setup_action_sensitivity (ev_window);
@@ -3417,8 +3420,11 @@ ev_window_print_range (EvWindow *ev_window,
ev_print_operation_set_print_settings (op, print_settings);
ev_print_operation_set_default_page_setup (op, print_page_setup);
- ev_print_operation_set_embed_page_setup (op, !g_settings_get_boolean (ev_window->priv->lockdown_settings,
- MATE_LOCKDOWN_PRINT_SETUP));
+ if (ev_window->priv->lockdown_settings)
+ ev_print_operation_set_embed_page_setup (op, !g_settings_get_boolean (ev_window->priv->lockdown_settings,
+ MATE_LOCKDOWN_PRINT_SETUP));
+ else
+ ev_print_operation_set_embed_page_setup (op, TRUE);
g_object_unref (print_settings);
g_object_unref (print_page_setup);