fix warning message, outlook->mbox.

2002-11-19  Not Zed  <NotZed@Ximian.com>

        * importers/evolution-mbox-importer.c (mail_importer_module_init):
        fix warning message, outlook->mbox.

        * importers/Makefile.am: fix serverdir to point to
        $libdir/bonobo/servers.

        * mail-callbacks.c (addrbook_sender): add type to
        bonobo_widget_set_property.

        * mail-vfolder.c (vfolder_editor_response): dont unref after destroy.

        * mail-session.c (pass_response): dont unref aftrer destroy.

        * mail-local.c (reconfigure_response): dont unref after destroy.

        * mail-display.c (launch_cb): dont unref after destroy.
        (launch_cb): "
        (drag_data_get_cb): "
        (html_button_press_event): add type to bonobo_widget::set_property

        * mail-config.c (mail_config_check_service): dont unref after
        destroy.

        * component-factory.c (send_receive_cb): dont unref after destroy.
        (request_quit): "

        * mail-signature-editor.c (mail_signature_editor): Use version 3.0
        of gtkhtml editor interfaces.
        (do_exit): dont unref after destroy.
        (format_html_cb): Add type to bonobo_widget::set_property.

svn path=/trunk/; revision=18837

11 files changed, 41 insertions, 18 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e6ffb0c42c..6524cae25b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,36 @@
+2002-11-19  Not Zed  <NotZed@Ximian.com>
+
+	* importers/evolution-mbox-importer.c (mail_importer_module_init):
+	fix warning message, outlook->mbox.
+
+	* importers/Makefile.am: fix serverdir to point to
+	$libdir/bonobo/servers.
+
+	* mail-callbacks.c (addrbook_sender): add type to
+	bonobo_widget_set_property.
+
+	* mail-vfolder.c (vfolder_editor_response): dont unref after destroy.
+
+	* mail-session.c (pass_response): dont unref aftrer destroy.
+
+	* mail-local.c (reconfigure_response): dont unref after destroy.
+
+	* mail-display.c (launch_cb): dont unref after destroy.
+	(launch_cb): "
+	(drag_data_get_cb): "
+	(html_button_press_event): add type to bonobo_widget::set_property
+
+	* mail-config.c (mail_config_check_service): dont unref after
+	destroy.
+
+	* component-factory.c (send_receive_cb): dont unref after destroy.
+	(request_quit): "
+
+	* mail-signature-editor.c (mail_signature_editor): Use version 3.0
+	of gtkhtml editor interfaces.
+	(do_exit): dont unref after destroy.
+	(format_html_cb): Add type to bonobo_widget::set_property.
+
 2002-11-18  Radek Doulik  <rodo@ximian.com>
 
 	* mail-composer-prefs.c (spell_setup_check_options): check
diff --git a/mail/component-factory.c b/mail/component-factory.c
index f6feb7357f..78cb922c6e 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -973,7 +973,6 @@ send_receive_cb (EvolutionShellComponent *shell_component,
 						_("You have not set a mail transport method"));
 		gtk_dialog_run((GtkDialog *)dialog);
 		gtk_widget_destroy(dialog);
-		g_object_unref(dialog);
 
 		return;
 	}
@@ -999,7 +998,6 @@ request_quit (EvolutionShellComponent *shell_component,
 	gtk_dialog_set_default_response((GtkDialog *)dialog, GTK_RESPONSE_NO);
 	resp = gtk_dialog_run((GtkDialog *)dialog);
 	gtk_widget_destroy(dialog);
-	g_object_unref(dialog);
 
 	return resp == GTK_RESPONSE_YES;
 }
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index e1cae100cf..49f9b17af7 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -19,7 +19,7 @@ libmbox_la_SOURCES = evolution-mbox-importer.c \
 		     mozilla-status-headers.h
 libmbox_la_LDFLAGS = -avoid-version -module
 
-serverdir = $(datadir)/bonobo/servers
+serverdir = $(libdir)/bonobo/servers
 server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in	\
 	GNOME_Evolution_Mail_Outlook_Importer.server.in.in
 server_DATA = $(server_in_files:.server.in.in=.server)
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index f90d7a2f4e..181f817898 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -397,7 +397,7 @@ mail_importer_module_init (void)
 					      mbox_factory_fn, NULL);
 
 	if (factory == NULL)
-		g_warning ("Could not initialise Outlook importer factory.");
+		g_warning ("Could not initialise mbox importer factory.");
 
 	initialised = TRUE;
 }
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 649c7634ea..7ffb8ccb00 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1799,7 +1799,7 @@ addrbook_sender (GtkWidget *widget, gpointer user_data)
 	control = bonobo_widget_new_control ("OAFIID:GNOME_Evolution_Addressbook_AddressPopup",
 					     CORBA_OBJECT_NIL);
 	bonobo_widget_set_property (BONOBO_WIDGET (control),
-				    "email", addr_str,
+				    "email", TC_CORBA_string, addr_str,
 				    NULL);
 	
 	bonobo_event_source_client_add_listener (bonobo_widget_get_objref (BONOBO_WIDGET (control)),
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 94d00cb698..875023ae7f 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -2350,7 +2350,6 @@ mail_config_check_service (const char *url, CamelProviderType type, GList **auth
 	mail_msg_wait(id);
 	
 	gtk_widget_destroy (dialog);
-	g_object_unref(dialog);
 	dialog = NULL;
 	
 	return ret;
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 0d9305344e..c74a0f7b37 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -379,7 +379,6 @@ launch_cb (GtkWidget *widget, gpointer user_data)
 		/* FIXME: this should be async */
 		gtk_dialog_run(dialogue);
 		gtk_widget_destroy((GtkWidget *)dialogue);
-		g_object_unref(dialogue);
 		return;
 	}
 	
@@ -394,7 +393,6 @@ launch_cb (GtkWidget *widget, gpointer user_data)
 		/* FIXME: this should be async */
 		gtk_dialog_run(dialogue);
 		gtk_widget_destroy((GtkWidget *)dialogue);
-		g_object_unref(dialogue);
 		g_free(filename);
 		return;
 	}
@@ -888,7 +886,6 @@ drag_data_get_cb (GtkWidget *widget,
 			/* FIXME: this should be async */
 			gtk_dialog_run(dialogue);
 			gtk_widget_destroy((GtkWidget *)dialogue);
-			g_object_unref(dialogue);
 		}
 		
 		filename = camel_mime_part_get_filename (part);
@@ -2316,7 +2313,7 @@ html_button_press_event (GtkWidget *widget, GdkEventButton *event, MailDisplay *
 										 CORBA_OBJECT_NIL);
 
 					bonobo_widget_set_property (BONOBO_WIDGET (popup_thing),
-								    "email", url_decoded+7,
+								    "email", TC_CORBA_string, url_decoded+7,
 								    NULL);
 					g_free (url_decoded);
 					
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 3b06ebed5e..3c73261a7c 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -1408,7 +1408,6 @@ reconfigure_response(GtkDialog *dialog, int button, struct _reconfigure_msg *m)
 	}
 
 	gtk_widget_destroy((GtkWidget *)dialog);
-	g_object_unref(dialog);
 }
 
 static void
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 00c58f4220..c338ad3e63 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -214,7 +214,6 @@ pass_response(GtkDialog *dialogue, int button, void *data)
 	}
 
 	gtk_widget_destroy((GtkWidget *)dialogue);
-	g_object_unref(dialogue);
 
 	password_dialogue = NULL;
 	e_msgport_reply((EMsg *)m);
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index a78804987a..96921aa23d 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -181,7 +181,6 @@ do_exit (ESignatureEditor *editor)
 
 		button = gtk_dialog_run((GtkDialog *)dialog);
 		gtk_widget_destroy(dialog);
-		g_object_unref(dialog);
 
 		exit_dialog_cb (button, editor);
 	} else
@@ -302,7 +301,7 @@ format_html_cb (BonoboUIComponent           *component,
 		return;
 	
 	editor->html = atoi (state);
-	bonobo_widget_set_property (BONOBO_WIDGET (editor->control), "FormatHTML", editor->html, NULL);
+	bonobo_widget_set_property (BONOBO_WIDGET (editor->control), "FormatHTML", TC_CORBA_boolean, editor->html, NULL);
 }
 
 void
@@ -333,11 +332,11 @@ mail_signature_editor (MailConfigSignature *sig)
 	bonobo_ui_component_add_verb_list_with_data (component, verbs, editor);
 	bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR, "evolution-signature-editor.xml", "evolution-signature-editor", NULL);
 	
-	editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:1.1",
+	editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:3.0",
 						     bonobo_ui_component_get_container (component));
 	
 	if (editor->control == NULL) {
-		g_warning ("Cannot get 'OAFIID:GNOME_GtkHTML_Editor:1.1'.");
+		g_warning ("Cannot get 'OAFIID:GNOME_GtkHTML_Editor:3.0'.");
 		
 		destroy_editor (editor);
 		return;
@@ -376,7 +375,7 @@ mail_signature_editor (MailConfigSignature *sig)
 	gtk_box_pack_start_defaults (GTK_BOX (vbox), editor->control);
 
 	bonobo_window_set_contents (BONOBO_WINDOW (editor->win), vbox);
-	bonobo_widget_set_property (BONOBO_WIDGET (editor->control), "FormatHTML", editor->html, NULL);
+	bonobo_widget_set_property (BONOBO_WIDGET (editor->control), "FormatHTML", TC_CORBA_boolean, editor->html, NULL);
 	gtk_widget_show (GTK_WIDGET (editor->win));
 	gtk_widget_show (GTK_WIDGET (editor->control));
 
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 42a5a23df8..b1b7a20d92 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -802,7 +802,6 @@ vfolder_editor_response (GtkWidget *dialog, int button, void *data)
 	vfolder_editor = NULL;
 
 	gtk_widget_destroy(dialog);
-	g_object_unref(dialog);
 }
 
 void