Added to cvs. Currently contains no configurable stuff, but maybe it will

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

        * GNOME_Evolution_Mail.server.in.in: Added to cvs.  Currently
        contains no configurable stuff, but maybe it will one day.

        * Makefile.am (server_DATA): change oaf stuff to server stuff for
        bonobo activation.

        * mail-preferences.c (mail_preferences_apply): handle const entry text.

        * mail-composer-prefs.c (url_requested): Fixed typo.
        (mail_composer_prefs_construct): gnomepixmap->gtkimage.

        * mail-callbacks.c (configure_mail): destroy dialogue before dealing
        with response.
        (mail_generate_reply): Fix a typo.
        (popup_listener_cb): fix prototype.
        (tag_editor_response): Handle gtk dialog response.
        (flag_for_followup): Change gnome dialog to gtk dialog stuff.
        (tag_editor_destroy_cb):
        (tag_editor_cancel):
        (tag_editor_ok): Removed, handled in _response().
        (filter_editor_response): renamed from _clicked, handle gtk
        dialogue signal.
        (filter_editor_destroy): Removed.
        (footer_info_new): gnome font api changes.
        (do_mail_print): port to gnome print 2.

        * mail-autofilter.c (mail_filter_delete_uri): message_dialog uses
        a specific button enum, not the stock ones.

        * mail-accounts.c (mail_accounts_tab_get_type): gobjectify.
        (account_delete_clicked): gdkdialogise.

        * mail-account-gui.c (mail_account_gui_setup): Hack around font
        metric determination code.

        * mail-account-editor.c (mail_account_editor_get_type):
        gobjectise.
        (mail_account_editor_new): ""

        * folder-info.c (evolution_folder_info_notify_ready): use pbclient
        interface.

        * folder-browser-factory.c (control_destroy_cb): fix a typo.
        (folder_browser_factory_new_control): More typos.

        * folder-browser.c (on_right_click): cast around const warning.
        (context_menu_position_func): fix for api change.

        * e-searching-tokenizer.c (e_searching_tokenizer_finalise):
        Changed from destroy since it only frees memory.
        (e_searching_tokenizer_get_type): glibify.

        * component-factory.c (request_quit): gtkdialogise.
        (send_receive_cb): "
        (create_component): gdk_pixbuf api.
        (component_factory_init): bonobo activation stuff.
        (warning_response): renamed from warning_clicked.
        (owner_set_cb): gtkdialogise.

svn path=/trunk/; revision=18731

1 files changed, 9 insertions, 9 deletions

diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 763605bf9d..6f7fe4d809 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -65,7 +65,7 @@ fb_get_svi (BonoboControl *control)
 	GNOME_Evolution_ShellView shell_view_interface;
 	CORBA_Environment ev;
 	
-	control_frame = bonobo_control_get_control_frame (control);
+	control_frame = bonobo_control_get_control_frame (control, NULL);
 
 	if (control_frame == NULL)
 		return CORBA_OBJECT_NIL;
@@ -90,8 +90,8 @@ control_activate (BonoboControl     *control,
 	GtkWidget *folder_browser;
 	Bonobo_UIContainer container;
 
-	container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, container);
+	container = bonobo_control_get_remote_ui_container (control, NULL);
+	bonobo_ui_component_set_container (uic, container, NULL);
 	bonobo_object_release_unref (container, NULL);
 
 	g_assert (container == bonobo_ui_component_get_container (uic));
@@ -155,7 +155,7 @@ control_activate_cb (BonoboControl *control,
 static void
 control_destroy_cb (GtkObject *fb, GObject *deadbeef)
 {
-	gtk_object_destroy (folder_browser);
+	gtk_object_destroy (fb);
 }
 
 static void
@@ -191,11 +191,11 @@ folder_browser_factory_new_control (const char *uri,
 	if (!(fb = folder_browser_new (shell, uri)))
 		return NULL;
 	
-	FOLDER_BROWSER (folder_browser)->pref_master = TRUE; /* save UI settings changed in this FB */
+	FOLDER_BROWSER (fb)->pref_master = TRUE; /* save UI settings changed in this FB */
 	
-	gtk_widget_show (folder_browser);
+	gtk_widget_show (fb);
 	
-	control = bonobo_control_new (folder_browser);
+	control = bonobo_control_new (fb);
 	
 	if (control == NULL) {
 		g_object_unref (fb);
@@ -204,8 +204,8 @@ folder_browser_factory_new_control (const char *uri,
 	
 	g_signal_connect (control, "activate", GTK_SIGNAL_FUNC (control_activate_cb), fb);
 	
-	g_object_weak_ref (control, (GWeakNotify) control_destroy_cb, fb);
-	g_object_weak_ref (fb, (GWeakNotify) browser_destroy_cb, control);
+	g_object_weak_ref (G_OBJECT(control), (GWeakNotify) control_destroy_cb, fb);
+	g_object_weak_ref (G_OBJECT(fb), (GWeakNotify) browser_destroy_cb, control);
 	
 	if (!control_list)
 		control_list = e_list_new (NULL, NULL, NULL);