Remove the mail folder control factory

	* GNOME_Evolution_Mail.server.in.in: Remove the mail folder
	control factory

	* mail-component-factory.c (factory): Remove support for the mail
	folder control

	* mail-component.c: Remove the property bag stuff
	(mail_control_new): Gone

svn path=/trunk/; revision=25858

5 files changed, 11 insertions, 88 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e3abdd617c..cdd72b130e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2004-05-11  Dan Winship  <danw@ximian.com>
+
+	* GNOME_Evolution_Mail.server.in.in: Remove the mail folder
+	control factory
+
+	* mail-component-factory.c (factory): Remove support for the mail
+	folder control
+
+	* mail-component.c: Remove the property bag stuff
+	(mail_control_new): Gone
+
 2004-05-10  David Malcolm  <dmalcolm@redhat.com>
 
 	* em-subscribe-editor.c (sub_queue_fill_level): Fixed warning
diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index eaca251026..8ddebd765a 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -76,21 +76,6 @@
 		   _value="Evolution Mail composer"/>
   </oaf_server>
 
-  <!-- (control) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control:@VERSION@"
-	      type="factory"
-              location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-	<item value="IDL:BonoboControl/evolution-mail-control:@VERSION@"/>
-	<item value="IDL:GNOME/Control:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="name" type="string"
-	    	   _value="Evolution Mail folder viewer"/>
-
-  </oaf_server>
-
   <!-- Startup Wizard -->
   <!-- (wizard) -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard:@VERSION@"
diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c
index 77d1501d10..293c5bc3d9 100644
--- a/mail/mail-component-factory.c
+++ b/mail/mail-component-factory.c
@@ -48,7 +48,6 @@
 #define FACTORY_ID	"OAFIID:GNOME_Evolution_Mail_Factory:" BASE_VERSION
 #define COMPONENT_ID	"OAFIID:GNOME_Evolution_Mail_Component:" BASE_VERSION
 #define COMPOSER_ID	"OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION
-#define MAIL_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_Control:" BASE_VERSION
 #define FOLDER_INFO_ID	"OAFIID:GNOME_Evolution_FolderInfo:" BASE_VERSION
 #define MAIL_CONFIG_ID	"OAFIID:GNOME_Evolution_MailConfig:" BASE_VERSION
 #define WIZARD_ID	"OAFIID:GNOME_Evolution_Mail_Wizard:" BASE_VERSION
@@ -63,8 +62,6 @@ factory(BonoboGenericFactory *factory, const char *component_id, void *closure)
 
 		bonobo_object_ref (BONOBO_OBJECT (component));
 		return BONOBO_OBJECT (component);
-	} else if (strcmp(component_id, MAIL_CONTROL_ID) == 0) {
-		return (BonoboObject *) mail_control_new ();
 	} else if (strcmp(component_id, MAIL_CONFIG_ID) == 0) {
 		return (BonoboObject *)g_object_new (evolution_mail_config_get_type (), NULL);
 	} else if (strcmp(component_id, WIZARD_ID) == 0) {
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 227fa3df34..71b82f89fd 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -331,42 +331,6 @@ folder_selected_cb (EMFolderTree *emft, const char *path, const char *uri, guint
 		em_folder_view_set_folder_uri (view, uri);
 }
 
-#define PROPERTY_FOLDER_URI          "folder_uri"
-#define PROPERTY_FOLDER_URI_IDX      1
-
-static void
-set_prop(BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EMFolderView *view  = (EMFolderView *)bonobo_control_get_widget (user_data);
-
-	switch (arg_id) {
-	case PROPERTY_FOLDER_URI_IDX:
-		em_folder_view_set_folder_uri (view, BONOBO_ARG_GET_STRING (arg));
-		break;
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-static void
-get_prop(BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	GtkWidget *widget = bonobo_control_get_widget (user_data);
-	EMFolderView *view = (EMFolderView *)widget;
-
-	switch (arg_id) {
-	case PROPERTY_FOLDER_URI_IDX:
-		if (view->folder_uri)
-			BONOBO_ARG_SET_STRING (arg, view->folder_uri);
-		else 
-			BONOBO_ARG_SET_STRING (arg, "");
-		break;
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
 static int
 check_autosave(void *data)
 {
@@ -850,38 +814,6 @@ mail_component_init (MailComponent *component)
 }
 
 /* Public API.  */
-BonoboControl *
-mail_control_new (void) 
-{
-	BonoboControl *view_control;
-	GtkWidget *view_widget;
-	BonoboPropertyBag *pbag;
-
-	view_widget = em_folder_browser_new ();
-	em_folder_view_set_statusbar ((EMFolderView *) view_widget, FALSE);
-	gtk_widget_show (view_widget);
-	
-	view_control = bonobo_control_new (view_widget);
-	pbag = bonobo_property_bag_new (get_prop, set_prop, view_control);
-  
-	bonobo_property_bag_add (pbag,
-				 PROPERTY_FOLDER_URI, 
-				 PROPERTY_FOLDER_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("URI of the mail source that the view will display"),
-				 0);
-	
-	bonobo_control_set_properties (view_control,
-				       bonobo_object_corba_objref (BONOBO_OBJECT (pbag)),
-				       NULL);
-	bonobo_object_unref (BONOBO_OBJECT (pbag));
-	
-	g_signal_connect (view_control, "activate", G_CALLBACK (view_control_activate_cb), view_widget);
-	
-	return view_control;
-}
-
 MailComponent *
 mail_component_peek (void)
 {
diff --git a/mail/mail-component.h b/mail/mail-component.h
index adedf00ba3..806b53263e 100644
--- a/mail/mail-component.h
+++ b/mail/mail-component.h
@@ -64,8 +64,6 @@ struct _MailComponentClass {
 
 GType  mail_component_get_type  (void);
 
-struct _BonoboControl *mail_control_new(void);
-
 MailComponent *mail_component_peek  (void);
 
 /* NOTE: Using NULL as the component implies using the default component */