diff options
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/printing/test-contact-print-style-editor.c | 54 | ||||
| -rw-r--r-- | addressbook/printing/test-print.c | 35 |
3 files changed, 39 insertions, 56 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index a47ad53c04..84d5a3f9ca 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2009-01-26 Matthew Barnes <mbarnes@redhat.com> + + * printing/test-print.c: + * printing/test-contact-print-style-editor.c: + Migrate the test programs off libgnomeui/libbonobo. + 2009-01-21 Milan Crha <mcrha@redhat.com> ** Fix for bug #362754 diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c index 2ca9afb159..de9fd6b6d6 100644 --- a/addressbook/printing/test-contact-print-style-editor.c +++ b/addressbook/printing/test-contact-print-style-editor.c @@ -24,51 +24,35 @@ #include <stdlib.h> #include <gtk/gtk.h> -#include <libgnomeui/gnome-app.h> -#include <libgnomeui/gnome-ui-init.h> -#include <bonobo/bonobo-main.h> #include "e-contact-print-style-editor.h" -/* This is a horrible thing to do, but it is just a test. */ -static GtkWidget *editor; - -static void destroy_callback(GtkWidget *app, gpointer data) +int +main (int argc, char *argv[]) { - static int count = 2; - count --; - if ( count <= 0 ) - exit(0); -} - -int main( int argc, char *argv[] ) -{ - GtkWidget *app; - - /* bindtextdomain (PACKAGE, GNOMELOCALEDIR); - textdomain (PACKAGE);*/ + GtkWidget *editor; + GtkWidget *window; + const gchar *title; - gnome_program_init ("Contact Print Style Editor Test", VERSION, - LIBGNOMEUI_MODULE, - argc, argv, - NULL); + title = "Contact Print Style Editor Test"; - glade_init (); + gtk_init (&argc, &argv); - app = gnome_app_new("Contact Print Style Editor Test", NULL); + glade_init (); - editor = e_contact_print_style_editor_new(""); + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title (GTK_WINDOW (window), title); - gnome_app_set_contents( GNOME_APP( app ), editor ); + editor = e_contact_print_style_editor_new (""); + gtk_container_add (GTK_CONTAINER (window), editor); - /* Connect the signals */ - g_signal_connect( app, "destroy", - G_CALLBACK ( destroy_callback ), - ( gpointer ) app ); + g_signal_connect ( + window, "delete-event", + G_CALLBACK (gtk_main_quit), NULL); - gtk_widget_show_all( app ); + gtk_widget_show_all (window); - bonobo_main(); + gtk_main (); - /* Not reached. */ - return 0; + /* Not reached. */ + return 0; } diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index 2c658840e6..3c02834de3 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -24,35 +24,28 @@ #include <stdlib.h> #include <gtk/gtk.h> -#include <libgnomeui/gnome-ui-init.h> #include <glade/glade.h> -#include <bonobo/bonobo-main.h> #include "e-contact-print.h" -int main( int argc, char *argv[] ) +int +main (int argc, char *argv[]) { - GList *shown_fields = NULL; + GList *shown_fields = NULL; - /* bindtextdomain (PACKAGE, GNOMELOCALEDIR); - textdomain (PACKAGE);*/ + gtk_init (&argc, &argv); - gnome_program_init ("Contact Print Test", VERSION, - LIBGNOMEUI_MODULE, - argc, argv, - NULL); + glade_init (); - glade_init (); + shown_fields = g_list_append (shown_fields, "First field"); + shown_fields = g_list_append (shown_fields, "Second field"); + shown_fields = g_list_append (shown_fields, "Third field"); + shown_fields = g_list_append (shown_fields, "Fourth field"); - shown_fields = g_list_append(shown_fields, "First field"); - shown_fields = g_list_append(shown_fields, "Second field"); - shown_fields = g_list_append(shown_fields, "Third field"); - shown_fields = g_list_append(shown_fields, "Fourth field"); + /* does nothing */ + e_contact_print (NULL, NULL, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); - /* does nothing */ - e_contact_print (NULL, NULL, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); + gtk_main (); - bonobo_main(); - - /* Not reached. */ - return 0; + /* Not reached. */ + return 0; } |