port this to gnome2/gnomeprint2.

2002-11-06  Chris Toshok  <toshok@ximian.com>

	* printing/e-contact-print-envelope.c: port this to
	gnome2/gnomeprint2.

	* printing/e-contact-print-style-editor.c: same.

	* printing/e-contact-print.c: same.

	* printing/test-contact-print-style-editor.c: same.

	* printing/test-print.c: same.

	* printing/e-contact-print.glade: libglade-convert to libglade-2.

	* printing/Makefile.am (contact_print_test_LDADD)
	(contact_print_style_editor_test_LDADD): remove libcamel.la from
	these for the time being to get things linking.

svn path=/trunk/; revision=18628

1 files changed, 7 insertions, 6 deletions

diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index fc868318d8..b9d0592474 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -23,10 +23,8 @@
 
 #include <stdlib.h>
 #include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-init.h>
+#include <libgnomeui/gnome-ui-init.h>
 #include <glade/glade.h>
 #include "e-contact-print.h"
 
@@ -66,7 +64,10 @@ int main( int argc, char *argv[] )
   /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
       textdomain (PACKAGE);*/
 
-  gnome_init( "Contact Print Test", VERSION, argc, argv);
+  gnome_program_init ("Contact Print Test", VERSION,
+		      LIBGNOMEUI_MODULE,
+		      argc, argv,
+		      NULL);
 
   glade_gnome_init ();
   
@@ -77,9 +78,9 @@ int main( int argc, char *argv[] )
 
   print = e_contact_print_dialog_new(NULL, NULL);
   gtk_widget_show_all(print);
-  gtk_signal_connect(GTK_OBJECT(print), "close", GTK_SIGNAL_FUNC(test_close), NULL);
+  g_signal_connect(print, "close", G_CALLBACK(test_close), NULL);
 
-  gtk_main(); 
+  bonobo_main(); 
 
   /* Not reached. */
   return 0;