Miscellaneous stuff.

svn path=/branches/kill-bonobo/; revision=37134

9 files changed, 40 insertions, 229 deletions

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 <bonobo.h>
 #include <libxml/parser.h>
 #include <pi-source.h>
 #include <pi-socket.h>
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 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"
-            type="shlib"
-            location="@COMPONENTDIR_IN_SERVER_FILE@/libevolution-addressbook@SOEXT@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Address Book"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Control:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Address Book card viewer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Component:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-	               _value="Evolution Address Book component"/>
-
-	<oaf_attribute name="evolution:component_alias" type="string" value="contacts"/>
-
-        <oaf_attribute name="evolution:menu_label" type="string" _value="C_ontacts"/>
-        <oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*2"/>
-        <oaf_attribute name="evolution:button_label" type="string" _value="Contacts"/>
-		<oaf_attribute name="evolution:button_tooltips" type="string" _value="Contacts"/>
-        <oaf_attribute name="evolution:button_sort_order" type="string" value="-9"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="x-office-address-book"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:@VERSION@"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Address Book address viewer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:@VERSION@"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Address Book address popup"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:@VERSION@"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-                                                                                          
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-        </oaf_attribute>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:title" type="string"
-                       _value="Certificates"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:description" type="string"
-                       _value="Manage your S/MIME certificates here"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:icon_name" type="string"
-                       value="preferences-certificates"/>
-                                                                                          
-        <oaf_attribute name="evolution2:config_item:priority" type="string" value="-6"/>
-                                                                                          
-        <oaf_attribute name="name" type="string"
-                       _value="Evolution S/MIME Certificate Management Control"/>
-                                                                                          
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:title" type="string"
-		_value="Autocompletion"/>
-
-	<oaf_attribute name="evolution2:config_item:description" type="string"
-		_value="Configure autocomplete here"/>
-
-	<oaf_attribute name="evolution2:config_item:icon_name" type="string"
-		value="preferences-autocompletion"/>
-
-	<oaf_attribute name="evolution2:config_item:type" type="stringv">
-		<item value="contacts"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:priority" type="string" value="-9"/>
-
-	<oaf_attribute name="name" type="string"
-		_value="Evolution folder settings configuration control"/>
-</oaf_server>
-
-</oaf_info>
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 <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;
 }