The Commit from hell that breaks all UI related stuff;

Anything UI related that breaks is now my fault; apologies in advance.

svn path=/trunk/; revision=5415

3 files changed, 15 insertions, 9 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index e8449a78cb..da83b8e86c 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-12  Michael Meeks  <michael@helixcode.com>
+
+	* e-msg-composer.c: Update for new UI handler.
+
 2000-09-12  Larry Ewing  <lewing@helixcode.com>
 
 	* e-msg-composer-attachment-bar.c (add_common): add a make sure
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 4fa523e8d3..f58bcc3128 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -84,8 +84,10 @@ create_editor (EMsgComposer *composer)
 {
 	GtkWidget *control;
 
-	control = bonobo_widget_new_control (HTML_EDITOR_CONTROL_ID,
-					     bonobo_object_corba_objref (BONOBO_OBJECT (composer->uih)));
+	control = bonobo_widget_new_control (
+		HTML_EDITOR_CONTROL_ID,
+		bonobo_ui_compat_get_container (composer->uih));
+
 	if (control == NULL) {
 		g_error ("Cannot activate `%s'. Did you build gtkhtml with Bonobo and OAF support?", HTML_EDITOR_CONTROL_ID);
 		return NULL;
@@ -1189,7 +1191,7 @@ class_init (EMsgComposerClass *klass)
 	
 	widget_class->delete_event = delete_event;
 	
-	parent_class = gtk_type_class (gnome_app_get_type ());
+	parent_class = gtk_type_class (bonobo_win_get_type ());
 	
 	signals[SEND] =
 		gtk_signal_new ("send",
@@ -1251,7 +1253,7 @@ e_msg_composer_get_type (void)
 			(GtkClassInitFunc) NULL,
 		};
 		
-		type = gtk_type_unique (gnome_app_get_type (), &info);
+		type = gtk_type_unique (bonobo_win_get_type (), &info);
 	}
 	
 	return type;
@@ -1274,11 +1276,11 @@ e_msg_composer_construct (EMsgComposer *composer)
 	gtk_window_set_default_size (GTK_WINDOW (composer),
 				     DEFAULT_WIDTH, DEFAULT_HEIGHT);
 	
-	gnome_app_construct (GNOME_APP (composer), "e-msg-composer",
+	bonobo_win_construct (BONOBO_WIN (composer), "e-msg-composer",
 			     _("Compose a message"));
 	
 	composer->uih = bonobo_ui_handler_new ();
-	bonobo_ui_handler_set_app (composer->uih, GNOME_APP (composer));
+	bonobo_ui_handler_set_app (composer->uih, BONOBO_WIN (composer));
 	
 	vbox = gtk_vbox_new (FALSE, 0);
 	
@@ -1323,7 +1325,7 @@ e_msg_composer_construct (EMsgComposer *composer)
 	gtk_signal_connect (GTK_OBJECT (composer->attachment_bar), "changed",
 			    GTK_SIGNAL_FUNC (attachment_bar_changed_cb), composer);
 
-	gnome_app_set_contents (GNOME_APP (composer), vbox);
+	bonobo_win_set_contents (BONOBO_WIN (composer), vbox);
 	gtk_widget_show (vbox);
 
 	e_msg_composer_show_attachments (composer, FALSE);
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 8f8bf97c14..8903889260 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -47,7 +47,7 @@ typedef struct _EMsgComposer       EMsgComposer;
 typedef struct _EMsgComposerClass  EMsgComposerClass;
 
 struct _EMsgComposer {
-	GnomeApp parent;
+	BonoboWin parent;
 	
 	BonoboUIHandler *uih;
 	
@@ -71,7 +71,7 @@ struct _EMsgComposer {
 };
 
 struct _EMsgComposerClass {
-	GnomeAppClass parent_class;
+	BonoboWinClass parent_class;
 	
 	void (* send) (EMsgComposer *composer);
 	void (* postpone) (EMsgComposer *composer);