[poppler] 2 commits - glib/demo glib/test-poppler-glib.cc

[Pino Toscano]

 glib/demo/page.c          |    2 +-
 glib/test-poppler-glib.cc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2255c85e4939a0752083dca21984ff4398baf8d2
Merge: 5ba9287... 56c9246...
Author: Pino Toscano <pino at kde.org>
Date:   Sat Feb 9 12:49:45 2008 +0100

    Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler

commit 5ba928762471e1ea8b81acd4644dfd3f58d18f77
Author: Pino Toscano <pino at kde.org>
Date:   Sat Feb 9 12:48:04 2008 +0100

    Fix placeholders in printf-like functions.

diff --git a/glib/demo/page.c b/glib/demo/page.c
index 8d98ff8..10445fd 100644
--- a/glib/demo/page.c
+++ b/glib/demo/page.c
@@ -78,7 +78,7 @@ pgd_page_set_page (PgdPageDemo *demo,
 		gtk_label_set_text (GTK_LABEL (demo->size), NULL);
 	}
 
-	str = page ? g_strdup_printf ("%d seconds", poppler_page_get_duration (page)) : NULL;
+	str = page ? g_strdup_printf ("%.2f seconds", poppler_page_get_duration (page)) : NULL;
 	gtk_label_set_text (GTK_LABEL (demo->duration), str);
 	g_free (str);
 
diff --git a/glib/test-poppler-glib.cc b/glib/test-poppler-glib.cc
index 108110f..2c3eded 100644
--- a/glib/test-poppler-glib.cc
+++ b/glib/test-poppler-glib.cc
@@ -506,7 +506,7 @@ int main (int argc, char *argv[])
 	  attachment = (PopplerAttachment *)l->data;
 	  g_print ("\tname: %s\n", attachment->name);
 	  g_print ("\tdescription: %s\n", attachment->description);
-	  g_print ("\tsize: %d\n", attachment->size);
+	  g_print ("\tsize: %lu\n", attachment->size);
 	  strdate = poppler_format_date (attachment->ctime);
 	  if (strdate)
 	    {