[poppler] Branch 'poppler-0.6' - 2 commits - glib/demo test/Makefile.am

[Albert Astals Cid]

 glib/demo/info.cc |    3 ++-
 test/Makefile.am  |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 81c8fac48640e01eb045a9d92a24094375b6878a
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
Date:   Mon Jan 21 21:28:02 2008 +0100

    compile

diff --git a/glib/demo/info.cc b/glib/demo/info.cc
index b0b121c..e055560 100644
--- a/glib/demo/info.cc
+++ b/glib/demo/info.cc
@@ -117,7 +117,8 @@ pgd_info_add_metadata (GtkTable    *table,
 	gtk_widget_show (textview);
 	
 	gtk_table_attach (GTK_TABLE (table), swindow, 1, 2, *row, *row + 1,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+			  GtkAttachOptions(GTK_EXPAND | GTK_FILL),
+			  GtkAttachOptions(GTK_EXPAND | GTK_FILL), 0, 0);
 	gtk_widget_show (swindow); 
 	
 	*row += 1;
commit a4742bf970830c2313f6f1e0740c6fdf883bf06b
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
Date:   Mon Jan 21 21:27:49 2008 +0100

    The glade file needs to be distributed

diff --git a/test/Makefile.am b/test/Makefile.am
index 614fe38..7f122a2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -66,4 +66,5 @@ pdf_inspector_LDADD =					\
 	$(GTK_TEST_LIBS)
 
 EXTRA_DIST =					\
-	pdf-operators.c
+	pdf-operators.c				\
+	pdf-inspector.glade