From bc80332460c353e391cd620f2cc51f7b56eef4de Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Jan 2009 18:49:51 +0000 Subject: Miscellaneous stuff. svn path=/branches/kill-bonobo/; revision=37134 --- addressbook/conduit/address-conduit.c | 1 - .../GNOME_Evolution_Addressbook.server.in.in | 136 --------------------- addressbook/gui/component/Makefile.am | 9 -- addressbook/gui/component/e-book-shell-content.c | 2 +- .../gui/component/e-book-shell-view-actions.c | 4 +- addressbook/gui/component/eab-composer-util.c | 19 +-- addressbook/gui/component/eab-composer-util.h | 9 +- .../printing/test-contact-print-style-editor.c | 54 +++----- addressbook/printing/test-print.c | 35 +++--- 9 files changed, 40 insertions(+), 229 deletions(-) delete mode 100644 addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in (limited to 'addressbook') diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index e80d1c346e..3faf74242f 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -29,7 +29,6 @@ #define G_LOG_DOMAIN "eaddrconduit" -#include #include #include #include diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in deleted file mode 100644 index 823d5bd89f..0000000000 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index ad603bf9b4..52a99e4901 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -98,23 +98,14 @@ install-data-local: fi endif -server_in_files = GNOME_Evolution_Addressbook.server.in.in -server_DATA = $(server_in_files:.server.in.in=.server) -@EVO_SERVER_RULE@ -@INTLTOOL_SERVER_RULE@ - glade_DATA = \ ldap-config.glade -BUILT_SOURCES = $(server_DATA) -CLEANFILES = $(BUILT_SOURCES) - DISTCLEANFILES = $(schema_DATA) EXTRA_DIST = \ $(glade_DATA) \ $(schema_in_files) \ - $(server_in_files) \ openldap-extract.h dist-hook: diff --git a/addressbook/gui/component/e-book-shell-content.c b/addressbook/gui/component/e-book-shell-content.c index 52549f0122..8830c797e0 100644 --- a/addressbook/gui/component/e-book-shell-content.c +++ b/addressbook/gui/component/e-book-shell-content.c @@ -50,7 +50,7 @@ book_shell_content_send_message_cb (EBookShellContent *book_shell_content, { GList node = { destination, NULL, NULL }; - eab_send_message (&node, EAB_DISPOSITION_AS_TO); + eab_send_as_to (&node); } static void diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/addressbook/gui/component/e-book-shell-view-actions.c index 016563845b..36c04eaf6b 100644 --- a/addressbook/gui/component/e-book-shell-view-actions.c +++ b/addressbook/gui/component/e-book-shell-view-actions.c @@ -306,7 +306,7 @@ action_contact_forward_cb (GtkAction *action, iter->data = destination; } - eab_send_message (list, EAB_DISPOSITION_AS_ATTACHMENT); + eab_send_as_attachment (list); g_list_foreach (list, (GFunc) g_object_unref, NULL); g_list_free (list); } @@ -488,7 +488,7 @@ action_contact_send_message_cb (GtkAction *action, iter->data = destination; } - eab_send_message (list, EAB_DISPOSITION_AS_TO); + eab_send_as_to (list); g_list_foreach (list, (GFunc) g_object_unref, NULL); g_list_free (list); } diff --git a/addressbook/gui/component/eab-composer-util.c b/addressbook/gui/component/eab-composer-util.c index c69375a0b9..b7daa3dddc 100644 --- a/addressbook/gui/component/eab-composer-util.c +++ b/addressbook/gui/component/eab-composer-util.c @@ -27,7 +27,7 @@ #include "addressbook/util/eab-book-util.h" #include "addressbook/gui/widgets/eab-gui-util.h" -static void +void eab_send_as_to (GList *destinations) { EMsgComposer *composer; @@ -108,7 +108,7 @@ get_email (EContact *contact, EContactField field_id, gchar **to_free) return value; } -static void +void eab_send_as_attachment (GList *destinations) { EMsgComposer *composer; @@ -195,18 +195,3 @@ eab_send_as_attachment (GList *destinations) gtk_widget_show (GTK_WIDGET (composer)); } - -void -eab_send_message (GList *destinations, - EABDisposition disposition) -{ - switch (disposition) { - case EAB_DISPOSITION_AS_TO: - eab_send_as_to (destinations); - break; - - case EAB_DISPOSITION_AS_ATTACHMENT: - eab_send_as_attachment (destinations); - break; - } -} diff --git a/addressbook/gui/component/eab-composer-util.h b/addressbook/gui/component/eab-composer-util.h index 4e9ce581d0..ffee76b2b7 100644 --- a/addressbook/gui/component/eab-composer-util.h +++ b/addressbook/gui/component/eab-composer-util.h @@ -23,13 +23,8 @@ G_BEGIN_DECLS -typedef enum { - EAB_DISPOSITION_AS_ATTACHMENT, - EAB_DISPOSITION_AS_TO, -} EABDisposition; - -void eab_send_message (GList *destinations, - EABDisposition disposition); +void eab_send_as_to (GList *destinations); +void eab_send_as_attachment (GList *destinations); G_END_DECLS 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 #include -#include -#include -#include #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 #include -#include #include -#include #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; } -- cgit v1.2.3