summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2008-10-28 10:01:00 +0100
committerCarlos Garcia Campos <carlosgc@gnome.org>2008-10-28 10:01:00 +0100
commita84d272ffd2b593ac98148e71b83fba299c60fea (patch)
treeaffd471144ba219c74371b79bc0115074543908e /glib
parent43f2b84a81625abee84c93cdced7fb92c99cd944 (diff)
[glib] Add disable deprecated compile flags and fix compile warnings
Diffstat (limited to 'glib')
-rw-r--r--glib/Makefile.am3
-rw-r--r--glib/demo/Makefile.am4
-rw-r--r--glib/demo/attachments.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 885e7db9..299ff007 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -19,7 +19,8 @@ INCLUDES = \
$(GDK_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
- $(cairo_includes)
+ $(cairo_includes) \
+ $(POPPLER_GLIB_DISABLE_DEPRECATED)
stamp_files = stamp-poppler-enums.h
diff --git a/glib/demo/Makefile.am b/glib/demo/Makefile.am
index 0eb6455e..41e071d2 100644
--- a/glib/demo/Makefile.am
+++ b/glib/demo/Makefile.am
@@ -1,7 +1,9 @@
INCLUDES = \
-I$(top_srcdir)/glib \
-I$(top_builddir)/glib \
- $(GTK_TEST_CFLAGS)
+ $(GTK_TEST_CFLAGS) \
+ $(POPPLER_GLIB_DISABLE_DEPRECATED) \
+ -DGTK_DISABLE_DEPRECATED
if BUILD_GTK_TEST
noinst_PROGRAMS = poppler-glib-demo
diff --git a/glib/demo/attachments.c b/glib/demo/attachments.c
index 72754b2c..d17835fd 100644
--- a/glib/demo/attachments.c
+++ b/glib/demo/attachments.c
@@ -136,7 +136,7 @@ pgd_attachments_save_dialog_response (GtkFileChooser *file_chooser,
filename = gtk_file_chooser_get_filename (file_chooser);
if (!poppler_attachment_save (attachment, filename, &error)) {
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
}
g_free (filename);
@@ -201,7 +201,7 @@ message_dialog_run (GtkWindow *parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
- message);
+ "%s", message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}