[evince] shell: fix compile warnings
- From: Jan-Joost Spanjers <jspanjers src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] shell: fix compile warnings
- Date: Mon, 20 Feb 2012 12:27:05 +0000 (UTC)
commit f94f56e809ca43432f5e0a3a2c04bd0b08bc1c81
Author: Hib Eris <hib hiberis nl>
Date: Sun Feb 19 13:33:21 2012 +0100
shell: fix compile warnings
shell/Makefile.am | 2 +-
shell/ev-application.c | 6 +++++-
shell/ev-window.c | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index c1da143..2d5d3fd 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -120,7 +120,7 @@ if PLATFORM_WIN32
evince_LDADD += evince-icon.o
evince-icon.o: $(srcdir)/evince-icon.rc $(top_srcdir)/data/evince.ico
- $(WINDRES) $(srcdir)/evince-icon.rc -I $(top_srcdir)/data evince-icon.o
+ $(AM_V_GEN)$(WINDRES) $(srcdir)/evince-icon.rc -I $(top_srcdir)/data evince-icon.o
endif
BUILT_SOURCES = ev-marshal.h ev-marshal.c
diff --git a/shell/ev-application.c b/shell/ev-application.c
index d40675c..fc7a0e9 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -186,6 +186,7 @@ ev_application_init_session (EvApplication *application)
#endif
}
+#ifdef ENABLE_DBUS
/**
* ev_display_open_if_needed:
* @name: the name of the display to be open if it's needed.
@@ -217,6 +218,7 @@ ev_display_open_if_needed (const gchar *name)
return display != NULL ? display : gdk_display_open (name);
}
+#endif
static void
ev_spawn (const char *uri,
@@ -229,7 +231,6 @@ ev_spawn (const char *uri,
GString *cmd;
gchar *path, *cmdline;
GAppInfo *app;
- GdkAppLaunchContext *ctx;
GError *error = NULL;
cmd = g_string_new (NULL);
@@ -292,6 +293,7 @@ ev_spawn (const char *uri,
if (app != NULL) {
GList uri_list;
+ GdkAppLaunchContext *ctx;
ctx = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
gdk_app_launch_context_set_screen (ctx, screen);
@@ -1076,7 +1078,9 @@ ev_application_class_init (EvApplicationClass *ev_application_class)
static void
ev_application_init (EvApplication *ev_application)
{
+#ifdef ENABLE_DBUS
GError *error = NULL;
+#endif
ev_application->dot_dir = g_build_filename (g_get_user_config_dir (),
"evince", NULL);
diff --git a/shell/ev-window.c b/shell/ev-window.c
index acb531a..ae9a9cc 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1426,6 +1426,7 @@ override_restrictions_changed (GSettings *settings,
ev_window_setup_action_sensitivity (ev_window);
}
+#ifdef HAVE_DESKTOP_SCHEMAS
static void
lockdown_changed (GSettings *lockdown,
const gchar *key,
@@ -1433,6 +1434,7 @@ lockdown_changed (GSettings *lockdown,
{
ev_window_setup_action_sensitivity (ev_window);
}
+#endif
static gboolean
ev_window_setup_document (EvWindow *ev_window)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]