diff options
23 files changed, 395 insertions, 397 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 4b77ecb870..2deb9a0e73 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2000-10-05 Michael Meeks <michael@helixcode.com> + + * contact-editor/e-contact-editor.c (create_ui): upd. + (e_contact_editor_init): upd. + + * gui/component/addressbook.c (control_activate_cb): upd. + (control_deactivate): kill. + (control_activate): upd. + 2000-09-22 Michael Meeks <michael@helixcode.com> * gui/component/addressbook.c (control_activate): update. diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c index b41a5e3ae7..abf7f2fe77 100644 --- a/addressbook/contact-editor/e-contact-editor.c +++ b/addressbook/contact-editor/e-contact-editor.c @@ -724,13 +724,13 @@ tb_save_and_close_cb (BonoboUIHandler *uih, void *data, const char *path) static BonoboUIVerb verbs [] = { - BONOBO_UI_VERB ("ContactEditorSave", file_save_cb), - BONOBO_UI_VERB ("ContactEditorSaveAs", file_save_as_cb), - BONOBO_UI_VERB ("ContactEditorSaveClose", tb_save_and_close_cb), - BONOBO_UI_VERB ("ContactEditorDelete", delete_cb), - BONOBO_UI_VERB ("ContactEditorPrint", print_cb), - /* BONOBO_UI_VERB ("ContactEditorPageSetup", file_page_setup_menu), */ - BONOBO_UI_VERB ("ContactEditorClose", file_close_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb), + /* BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */ + BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb), BONOBO_UI_VERB_END }; @@ -738,17 +738,10 @@ BonoboUIVerb verbs [] = { static void create_ui (EContactEditor *ce) { - BonoboUIComponent *component; - Bonobo_UIContainer container; - - component = bonobo_ui_compat_get_component (ce->uih); - container = bonobo_ui_compat_get_container (ce->uih); - bonobo_ui_component_add_verb_list_with_data ( - component, verbs, ce); + ce->uic, verbs, ce); - bonobo_ui_util_set_ui (component, container, - EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR, "evolution-contact-editor.xml", "evolution-contact-editor"); } @@ -811,6 +804,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) GtkWidget *widget; GtkWidget *bonobo_win; GtkWidget *wants_html; + BonoboUIContainer *container; e_contact_editor->email_info = NULL; e_contact_editor->phone_info = NULL; @@ -894,13 +888,17 @@ e_contact_editor_init (EContactEditor *e_contact_editor) /* Build the menu and toolbar */ - e_contact_editor->uih = bonobo_ui_handler_new (); - if (!e_contact_editor->uih) { + container = bonobo_ui_container_new (); + bonobo_ui_container_set_win (container, BONOBO_WIN (e_contact_editor->app)); + + e_contact_editor->uic = bonobo_ui_component_new_default (); + if (!e_contact_editor->uic) { g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!"); return; } - - bonobo_ui_handler_set_app (e_contact_editor->uih, BONOBO_WIN (e_contact_editor->app)); + bonobo_ui_component_set_container (e_contact_editor->uic, + bonobo_object_corba_objref ( + BONOBO_OBJECT (container))); create_ui (e_contact_editor); diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h index 83ac71fd78..fae6939595 100644 --- a/addressbook/contact-editor/e-contact-editor.h +++ b/addressbook/contact-editor/e-contact-editor.h @@ -60,7 +60,7 @@ struct _EContactEditor ECardSimple *simple; /* UI handler */ - BonoboUIHandler *uih; + BonoboUIComponent *uic; GladeXML *gui; GtkWidget *app; diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 1c0aa4ada7..65f4fdca93 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -49,18 +49,6 @@ typedef struct { static void change_view_type (AddressbookView *view, EAddressbookViewType view_type); static void -control_deactivate (BonoboControl *control, BonoboUIHandler *uih) -{ - Bonobo_UIContainer container = bonobo_ui_compat_get_container (uih); - - g_return_if_fail (container != CORBA_OBJECT_NIL); - - bonobo_ui_component_rm ( - bonobo_ui_compat_get_component (uih), - container, "/", NULL); -} - -static void card_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data) { @@ -323,48 +311,42 @@ stop_loading_cb (BonoboUIHandler *uih, void *user_data, const char *path) } BonoboUIVerb verbs [] = { - BONOBO_UI_VERB ("ContactsPrint", print_cb), - BONOBO_UI_VERB ("ViewAsTable", toggle_view_as_cb), - BONOBO_UI_VERB ("ViewNewContact", new_contact_cb), - BONOBO_UI_VERB ("ToolSearch", search_cb), - - BONOBO_UI_VERB ("ContactNew", new_contact_cb), -/* BONOBO_UI_VERB ("ContactFind", find_contact_cb),*/ - BONOBO_UI_VERB ("ContactDelete", delete_contact_cb), - BONOBO_UI_VERB ("ContactViewAll", show_all_contacts_cb), - BONOBO_UI_VERB ("ContactStop", stop_loading_cb), + BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb), + BONOBO_UI_UNSAFE_VERB ("ViewAsTable", toggle_view_as_cb), + BONOBO_UI_UNSAFE_VERB ("ViewNewContact", new_contact_cb), + BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb), + + BONOBO_UI_UNSAFE_VERB ("ContactNew", new_contact_cb), +/* BONOBO_UI_UNSAFE_VERB ("ContactFind", find_contact_cb),*/ + BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb), + BONOBO_UI_UNSAFE_VERB ("ContactViewAll", show_all_contacts_cb), + BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb), #ifdef HAVE_LDAP - BONOBO_UI_VERB ("ContactNewServer", new_server_cb), + BONOBO_UI_UNSAFE_VERB ("ContactNewServer", new_server_cb), #endif BONOBO_UI_VERB_END }; static void -control_activate (BonoboControl *control, BonoboUIHandler *uih, - AddressbookView *view) +control_activate (BonoboControl *control, + BonoboUIComponent *uic, + AddressbookView *view) { - Bonobo_UIContainer remote_uih; - Bonobo_UIContainer container; - BonoboUIComponent *component; + Bonobo_UIContainer remote_ui_container; GtkWidget *quick_search_widget; BonoboControl *search_control; - remote_uih = bonobo_control_get_remote_ui_handler (control); - bonobo_ui_handler_set_container (uih, remote_uih); - bonobo_object_release_unref (remote_uih, NULL); + remote_ui_container = bonobo_control_get_remote_ui_container (control); + bonobo_ui_component_set_container (uic, remote_ui_container); + bonobo_object_release_unref (remote_ui_container, NULL); - component = bonobo_ui_compat_get_component (uih); - bonobo_ui_component_add_verb_list_with_data ( - component, verbs, view); - - container = bonobo_ui_compat_get_container (uih); - g_return_if_fail (container != CORBA_OBJECT_NIL); + uic, verbs, view); - bonobo_ui_container_freeze (container, NULL); + bonobo_ui_component_freeze (uic, NULL); - bonobo_ui_util_set_ui (component, container, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, #ifdef HAVE_LDAP "evolution-addressbook-ldap.xml", #else @@ -378,12 +360,12 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, gtk_widget_show_all (quick_search_widget); search_control = bonobo_control_new (quick_search_widget); - bonobo_ui_container_object_set ( - container, "/Toolbar/QuickSearch", + bonobo_ui_component_object_set ( + uic, "/Toolbar/QuickSearch", bonobo_object_corba_objref (BONOBO_OBJECT (search_control)), NULL); - bonobo_ui_container_thaw (container, NULL); + bonobo_ui_component_thaw (uic, NULL); } static void @@ -391,15 +373,15 @@ control_activate_cb (BonoboControl *control, gboolean activate, AddressbookView *view) { - BonoboUIHandler *uih; + BonoboUIComponent *uic; - uih = bonobo_control_get_ui_handler (control); - g_assert (uih); + uic = bonobo_control_get_ui_component (control); + g_assert (uic != NULL); if (activate) - control_activate (control, uih, view); + control_activate (control, uic, view); else - control_deactivate (control, uih); + bonobo_ui_component_unset_container (uic); } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index b41a5e3ae7..abf7f2fe77 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -724,13 +724,13 @@ tb_save_and_close_cb (BonoboUIHandler *uih, void *data, const char *path) static BonoboUIVerb verbs [] = { - BONOBO_UI_VERB ("ContactEditorSave", file_save_cb), - BONOBO_UI_VERB ("ContactEditorSaveAs", file_save_as_cb), - BONOBO_UI_VERB ("ContactEditorSaveClose", tb_save_and_close_cb), - BONOBO_UI_VERB ("ContactEditorDelete", delete_cb), - BONOBO_UI_VERB ("ContactEditorPrint", print_cb), - /* BONOBO_UI_VERB ("ContactEditorPageSetup", file_page_setup_menu), */ - BONOBO_UI_VERB ("ContactEditorClose", file_close_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb), + /* BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */ + BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb), BONOBO_UI_VERB_END }; @@ -738,17 +738,10 @@ BonoboUIVerb verbs [] = { static void create_ui (EContactEditor *ce) { - BonoboUIComponent *component; - Bonobo_UIContainer container; - - component = bonobo_ui_compat_get_component (ce->uih); - container = bonobo_ui_compat_get_container (ce->uih); - bonobo_ui_component_add_verb_list_with_data ( - component, verbs, ce); + ce->uic, verbs, ce); - bonobo_ui_util_set_ui (component, container, - EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR, "evolution-contact-editor.xml", "evolution-contact-editor"); } @@ -811,6 +804,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) GtkWidget *widget; GtkWidget *bonobo_win; GtkWidget *wants_html; + BonoboUIContainer *container; e_contact_editor->email_info = NULL; e_contact_editor->phone_info = NULL; @@ -894,13 +888,17 @@ e_contact_editor_init (EContactEditor *e_contact_editor) /* Build the menu and toolbar */ - e_contact_editor->uih = bonobo_ui_handler_new (); - if (!e_contact_editor->uih) { + container = bonobo_ui_container_new (); + bonobo_ui_container_set_win (container, BONOBO_WIN (e_contact_editor->app)); + + e_contact_editor->uic = bonobo_ui_component_new_default (); + if (!e_contact_editor->uic) { g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!"); return; } - - bonobo_ui_handler_set_app (e_contact_editor->uih, BONOBO_WIN (e_contact_editor->app)); + bonobo_ui_component_set_container (e_contact_editor->uic, + bonobo_object_corba_objref ( + BONOBO_OBJECT (container))); create_ui (e_contact_editor); diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 83ac71fd78..fae6939595 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -60,7 +60,7 @@ struct _EContactEditor ECardSimple *simple; /* UI handler */ - BonoboUIHandler *uih; + BonoboUIComponent *uic; GladeXML *gui; GtkWidget *app; diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 78283abdd3..03636bdb0f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2000-10-05 Michael Meeks <michael@helixcode.com> + + * gui/calendar-commands.c: upd. + (calendar_control_activate): upd. + (calendar_control_deactivate): upd. + 2000-10-05 Damon Chaplin <damon@helixcode.com> * gui/e-day-view.c: diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 0870f70be1..676d3944de 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -483,17 +483,17 @@ static GnomeUIInfo gnome_toolbar_view_buttons [] = { #endif BonoboUIVerb verbs [] = { - BONOBO_UI_VERB ("CalendarNew", new_calendar_cmd), - BONOBO_UI_VERB ("CalendarOpen", open_calendar_cmd), - BONOBO_UI_VERB ("CalendarSaveAs", save_as_calendar_cmd), - BONOBO_UI_VERB ("CalendarPrint", file_print_cb), - BONOBO_UI_VERB ("EditNewAppointment", new_appointment_cb), - BONOBO_UI_VERB ("CalendarPreferences", properties_cmd), - - BONOBO_UI_VERB ("CalendarPrev", previous_clicked), - BONOBO_UI_VERB ("CalendarToday", today_clicked), - BONOBO_UI_VERB ("CalendarNext", next_clicked), - BONOBO_UI_VERB ("CalendarGoto", goto_clicked), + BONOBO_UI_UNSAFE_VERB ("CalendarNew", new_calendar_cmd), + BONOBO_UI_UNSAFE_VERB ("CalendarOpen", open_calendar_cmd), + BONOBO_UI_UNSAFE_VERB ("CalendarSaveAs", save_as_calendar_cmd), + BONOBO_UI_UNSAFE_VERB ("CalendarPrint", file_print_cb), + BONOBO_UI_UNSAFE_VERB ("EditNewAppointment", new_appointment_cb), + BONOBO_UI_UNSAFE_VERB ("CalendarPreferences", properties_cmd), + + BONOBO_UI_UNSAFE_VERB ("CalendarPrev", previous_clicked), + BONOBO_UI_UNSAFE_VERB ("CalendarToday", today_clicked), + BONOBO_UI_UNSAFE_VERB ("CalendarNext", next_clicked), + BONOBO_UI_UNSAFE_VERB ("CalendarGoto", goto_clicked), BONOBO_UI_VERB_END }; @@ -503,15 +503,15 @@ calendar_control_activate (BonoboControl *control, GnomeCalendar *cal) { Bonobo_UIContainer remote_uih; - BonoboUIHandler *uih; + BonoboUIComponent *uic; - uih = bonobo_control_get_ui_handler (control); - g_assert (uih != NULL); + uic = bonobo_control_get_ui_component (control); + g_assert (uic != NULL); g_print ("In calendar_control_activate\n"); - remote_uih = bonobo_control_get_remote_ui_handler (control); - bonobo_ui_handler_set_container (uih, remote_uih); + remote_uih = bonobo_control_get_remote_ui_container (control); + bonobo_ui_component_set_container (uic, remote_uih); bonobo_object_release_unref (remote_uih, NULL); #if 0 @@ -557,38 +557,25 @@ calendar_control_activate (BonoboControl *control, 1, 1, 0); #endif - { - Bonobo_UIContainer container; - BonoboUIComponent *component; + bonobo_ui_component_add_verb_list_with_data ( + uic, verbs, cal); - component = bonobo_ui_compat_get_component (uih); - bonobo_ui_component_add_verb_list_with_data ( - component, verbs, cal); - - container = bonobo_ui_compat_get_container (uih); - g_return_if_fail (container != CORBA_OBJECT_NIL); - - bonobo_ui_util_set_ui (component, container, - EVOLUTION_DATADIR, - "evolution-calendar.xml", - "evolution-calendar"); - } + bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, + "evolution-calendar.xml", + "evolution-calendar"); } void calendar_control_deactivate (BonoboControl *control) { - BonoboUIHandler *uih = bonobo_control_get_ui_handler (control); - g_assert (uih); + BonoboUIComponent *uic = bonobo_control_get_ui_component (control); + g_assert (uic != NULL); g_print ("In calendar_control_deactivate\n"); - bonobo_ui_component_rm ( - bonobo_ui_compat_get_component (uih), - bonobo_ui_compat_get_container (uih), "/", NULL); - - bonobo_ui_handler_unset_container (uih); + bonobo_ui_component_rm (uic, "/", NULL); + bonobo_ui_component_unset_container (uic); } diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog index bc60cade9c..3f6d3e1a0c 100644 --- a/executive-summary/ChangeLog +++ b/executive-summary/ChangeLog @@ -1,3 +1,10 @@ +2000-10-05 Michael Meeks <michael@helixcode.com> + + * component/e-summary-factory.c (control_activate): upd. + (set_pixmap): upd. (update_pixmaps): upd. + (control_activate_cb): upd. + (control_deactivate): upd. + 2000-10-04 Iain Holmes <iain@helixcode.com> * idl/SummaryComponent.idl: Added a title argument to the diff --git a/executive-summary/component/Makefile.in b/executive-summary/component/Makefile.in index 7aed4eb957..49846a2b60 100644 --- a/executive-summary/component/Makefile.in +++ b/executive-summary/component/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -241,8 +240,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -391,7 +390,7 @@ uninstall: uninstall-am all-am: Makefile $(PROGRAMS) all-local all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c index c87985be34..b023d38316 100644 --- a/executive-summary/component/e-summary-factory.c +++ b/executive-summary/component/e-summary-factory.c @@ -65,14 +65,14 @@ static void flash (ExecutiveSummary *summary, void *closure); BonoboUIVerb verbs[] = { - BONOBO_UI_VERB ("AddService", embed_service), + BONOBO_UI_UNSAFE_VERB ("AddService", embed_service), BONOBO_UI_VERB_END }; static void -set_pixmap (Bonobo_UIContainer container, - const char *xml_path, - const char *icon) +set_pixmap (BonoboUIComponent *component, + const char *xml_path, + const char *icon) { char *path; GdkPixbuf *pixbuf; @@ -82,53 +82,46 @@ set_pixmap (Bonobo_UIContainer container, pixbuf = gdk_pixbuf_new_from_file (path); g_return_if_fail (pixbuf != NULL); - bonobo_ui_util_set_pixbuf (container, xml_path, pixbuf); + bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf); gdk_pixbuf_unref (pixbuf); g_free (path); } static void -update_pixmaps (Bonobo_UIContainer container) +update_pixmaps (BonoboUIComponent *component) { - set_pixmap (container, "/Toolbar/AddService", "add-service.png"); + set_pixmap (component, "/Toolbar/AddService", "add-service.png"); } static void -control_activate (BonoboControl *control, - BonoboUIHandler *uih, - ESummary *esummary) +control_activate (BonoboControl *control, + BonoboUIComponent *ui_component, + ESummary *esummary) { - BonoboUIComponent *component; Bonobo_UIContainer container; container = bonobo_control_get_remote_ui_handler (control); - bonobo_ui_handler_set_container (uih, container); + bonobo_ui_component_set_container (ui_component, container); bonobo_object_release_unref (container, NULL); - g_assert (container == bonobo_ui_compat_get_container (uih)); - g_return_if_fail (container != CORBA_OBJECT_NIL); - - component = bonobo_ui_compat_get_component (uih); - bonobo_ui_component_add_verb_list_with_data (component, verbs, esummary); + bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, esummary); - bonobo_ui_container_freeze (container, NULL); + bonobo_ui_component_freeze (ui_component, NULL); - bonobo_ui_util_set_ui (component, container, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR, "evolution-executive-summary.xml", "evolution-executive-summary"); - update_pixmaps (container); - bonobo_ui_container_thaw (container, NULL); + update_pixmaps (ui_component); + bonobo_ui_component_thaw (ui_component, NULL); } static void -control_deactivate (BonoboControl *control, - BonoboUIHandler *uih, - ESummary *esummary) +control_deactivate (BonoboControl *control, + BonoboUIComponent *ui_component, + ESummary *esummary) { - bonobo_ui_component_rm (bonobo_ui_compat_get_component (uih), - bonobo_ui_compat_get_container (uih), "/", NULL); - bonobo_ui_handler_unset_container (uih); + bonobo_ui_component_unset_container (ui_component); } static void @@ -136,26 +129,26 @@ control_activate_cb (BonoboControl *control, gboolean activate, gpointer user_data) { - BonoboUIHandler *uih; + BonoboUIComponent *ui_component; - uih = bonobo_control_get_ui_handler (control); - g_assert (uih); + ui_component = bonobo_control_get_ui_component (control); + g_assert (ui_component != NULL); - if (activate) - control_activate (control, uih, user_data); - else - control_deactivate (control, uih, user_data); + if (activate) + control_activate (control, ui_component, user_data); + else + control_deactivate (control, ui_component, user_data); } static void control_destroy_cb (BonoboControl *control, gpointer user_data) { - GtkWidget *esummary = user_data; + GtkWidget *esummary = user_data; - control_list = g_list_remove (control_list, control); + control_list = g_list_remove (control_list, control); - gtk_object_destroy (GTK_OBJECT (esummary)); + gtk_object_destroy (GTK_OBJECT (esummary)); } static void diff --git a/executive-summary/evolution-services/Makefile.in b/executive-summary/evolution-services/Makefile.in index 141fb0011b..e2865c4e20 100644 --- a/executive-summary/evolution-services/Makefile.in +++ b/executive-summary/evolution-services/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -389,7 +388,7 @@ uninstall: uninstall-am all-am: Makefile $(LTLIBRARIES) all-local all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(libdir) diff --git a/executive-summary/idl/Makefile.in b/executive-summary/idl/Makefile.in index bf5a1a117b..0d9d10646f 100644 --- a/executive-summary/idl/Makefile.in +++ b/executive-summary/idl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -240,7 +239,7 @@ uninstall: uninstall-am all-am: Makefile all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: diff --git a/executive-summary/test-service/Makefile.in b/executive-summary/test-service/Makefile.in index 50e83f823f..d193f4bda1 100644 --- a/executive-summary/test-service/Makefile.in +++ b/executive-summary/test-service/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -234,8 +233,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -403,7 +402,7 @@ uninstall: uninstall-am all-am: Makefile $(PROGRAMS) $(DATA) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(oafdir) diff --git a/mail/ChangeLog b/mail/ChangeLog index b0c35dfeb4..aaa855c8a0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,23 @@ +2000-10-05 Michael Meeks <michael@helixcode.com> + + * component-factory.c (summary_fn, component_factory_init): Disable + summary stuff, it appears to be badly broken. + + * Makefile.am (evolution_mail_SOURCES): add mail-summary.[ch] + + * subscribe-dialog.c (update_pixmaps): upd. + (set_pixmap): upd. + (subscribe_dialog_gui_init): upd. + remove redundant and annoying forward definitions. + + * folder-browser-factory.c (control_deactivate): upd. + (control_activate_cb): upd. + (control_activate): upd. + (set_pixmap): upd. + (update_pixmaps): upd. + (register_ondemand): upd. + (create_ondemand_hooks): upd. + 2000-10-04 Jeffrey Stedfast <fejj@helixcode.com> * message-list.c (address_compare): Use CamelInternetAddress diff --git a/mail/component-factory.c b/mail/component-factory.c index 27fd585840..69f7a4b110 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -41,9 +41,11 @@ #include <gal/widgets/e-gui-utils.h> #include "mail-local-storage.h" -#include <executive-summary/evolution-services/executive-summary-component.h> #include "component-factory.h" +#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME +#include <executive-summary/evolution-services/executive-summary-component.h> #include "mail-summary.h" +#endif CamelFolder *drafts_folder = NULL; CamelFolder *outbox_folder = NULL; @@ -165,16 +167,17 @@ factory_destroy (BonoboEmbeddable *embeddable, gtk_main_quit (); } +#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME static BonoboObject * summary_fn (BonoboGenericFactory *factory, void *closure) { ExecutiveSummaryComponent *summary_component; - summary_component = executive_summary_component_new (NULL, - create_summary_view, - NULL, NULL); + summary_component = executive_summary_component_new ( + NULL, create_summary_view, NULL, NULL); return BONOBO_OBJECT (summary_component); } +#endif static BonoboObject * factory_fn (BonoboGenericFactory *factory, void *closure) @@ -207,7 +210,9 @@ component_factory_init (void) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); +#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL); +#endif if (factory == NULL) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, @@ -215,10 +220,12 @@ component_factory_init (void) exit (1); } +#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME if (summary_factory == NULL) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Cannot initialize Evolution's mail summary component.")); } +#endif } /* FIXME: remove */ diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 4dca006a25..c629e00151 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -35,7 +35,8 @@ static void register_ondemand (RuleContext *f, FilterRule *rule, gpointer data) { FolderBrowser *fb = FOLDER_BROWSER (data); - BonoboUIHandler *uih = gtk_object_get_data (GTK_OBJECT (fb), "uih"); + BonoboUIComponent *uic = gtk_object_get_data (GTK_OBJECT (fb), "uih"); + BonoboUIHandler *uih; gchar *text; struct fb_ondemand_closure *oc; @@ -43,7 +44,11 @@ register_ondemand (RuleContext *f, FilterRule *rule, gpointer data) oc->rule = rule; oc->fb = fb; oc->path = g_strdup_printf ("/*Component Placeholder*/Folder/Filter-%s", rule->name); - + +#warning FIXME: this should not use the bonobo_ui_handler API. + + uih = bonobo_ui_handler_new_from_component (uic); + if (fb->filter_menu_paths == NULL) bonobo_ui_handler_menu_new_separator (uih, "/*Component Placeholder*/Folder/separator1", -1); @@ -59,14 +64,14 @@ register_ondemand (RuleContext *f, FilterRule *rule, gpointer data) } static void -create_ondemand_hooks (FolderBrowser *fb, BonoboUIHandler *uih) +create_ondemand_hooks (FolderBrowser *fb, BonoboUIComponent *uic) { gchar *system, *user; user = g_strdup_printf ("%s/filters.xml", evolution_dir); system = EVOLUTION_DATADIR "/evolution/filtertypes.xml"; fb->filter_context = filter_context_new(); - gtk_object_set_data (GTK_OBJECT (fb), "uih", uih); + gtk_object_set_data (GTK_OBJECT (fb), "uih", uic); rule_context_load ((RuleContext *) fb->filter_context, system, user, register_ondemand, fb); gtk_object_remove_data (GTK_OBJECT (fb), "uih"); @@ -77,55 +82,55 @@ create_ondemand_hooks (FolderBrowser *fb, BonoboUIHandler *uih) * Add with 'folder_browser' */ BonoboUIVerb verbs [] = { - BONOBO_UI_VERB ("PrintMessage", print_msg), - BONOBO_UI_VERB ("PrintPreviewMessage", print_preview_msg), + BONOBO_UI_UNSAFE_VERB ("PrintMessage", print_msg), + BONOBO_UI_UNSAFE_VERB ("PrintPreviewMessage", print_preview_msg), /* Edit Menu */ - BONOBO_UI_VERB ("EditSelectAll", select_all), - BONOBO_UI_VERB ("EditInvertSelection", invert_selection), + BONOBO_UI_UNSAFE_VERB ("EditSelectAll", select_all), + BONOBO_UI_UNSAFE_VERB ("EditInvertSelection", invert_selection), /* Settings Menu */ - BONOBO_UI_VERB ("SetMailFilter", filter_edit), - BONOBO_UI_VERB ("VFolderEdit", vfolder_edit_vfolders), - BONOBO_UI_VERB ("SetMailConfig", providers_config), - BONOBO_UI_VERB ("SetSubscribe", manage_subscriptions), - BONOBO_UI_VERB ("SetForgetPwd", forget_passwords), + BONOBO_UI_UNSAFE_VERB ("SetMailFilter", filter_edit), + BONOBO_UI_UNSAFE_VERB ("VFolderEdit", vfolder_edit_vfolders), + BONOBO_UI_UNSAFE_VERB ("SetMailConfig", providers_config), + BONOBO_UI_UNSAFE_VERB ("SetSubscribe", manage_subscriptions), + BONOBO_UI_UNSAFE_VERB ("SetForgetPwd", forget_passwords), /* Message Menu */ - BONOBO_UI_VERB ("MessageOpenNewWnd", view_message), - BONOBO_UI_VERB ("MessageEdit", edit_message), - BONOBO_UI_VERB ("MessagePrint", print_msg), - BONOBO_UI_VERB ("MessageReplySndr", reply_to_sender), - BONOBO_UI_VERB ("MessageReplyAll", reply_to_all), - BONOBO_UI_VERB ("MessageForward", forward_msg), + BONOBO_UI_UNSAFE_VERB ("MessageOpenNewWnd", view_message), + BONOBO_UI_UNSAFE_VERB ("MessageEdit", edit_message), + BONOBO_UI_UNSAFE_VERB ("MessagePrint", print_msg), + BONOBO_UI_UNSAFE_VERB ("MessageReplySndr", reply_to_sender), + BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", reply_to_all), + BONOBO_UI_UNSAFE_VERB ("MessageForward", forward_msg), - BONOBO_UI_VERB ("MessageMarkAsRead", mark_as_seen), - BONOBO_UI_VERB ("MessageMarkAsUnRead", mark_as_unseen), - BONOBO_UI_VERB ("MessageDelete", delete_msg), - BONOBO_UI_VERB ("MessageMove", move_msg), - BONOBO_UI_VERB ("MessageCopy", copy_msg), + BONOBO_UI_UNSAFE_VERB ("MessageMarkAsRead", mark_as_seen), + BONOBO_UI_UNSAFE_VERB ("MessageMarkAsUnRead", mark_as_unseen), + BONOBO_UI_UNSAFE_VERB ("MessageDelete", delete_msg), + BONOBO_UI_UNSAFE_VERB ("MessageMove", move_msg), + BONOBO_UI_UNSAFE_VERB ("MessageCopy", copy_msg), - BONOBO_UI_VERB ("MessageVFolderSubj", vfolder_subject), - BONOBO_UI_VERB ("MessageVFolderSndr", vfolder_sender), - BONOBO_UI_VERB ("MessageVFolderRecip", vfolder_recipient), + BONOBO_UI_UNSAFE_VERB ("MessageVFolderSubj", vfolder_subject), + BONOBO_UI_UNSAFE_VERB ("MessageVFolderSndr", vfolder_sender), + BONOBO_UI_UNSAFE_VERB ("MessageVFolderRecip", vfolder_recipient), - BONOBO_UI_VERB ("MessageFilterSubj", filter_subject), - BONOBO_UI_VERB ("MessageFilderSndr", filter_sender), - BONOBO_UI_VERB ("MessageFilderRecip", filter_recipient), + BONOBO_UI_UNSAFE_VERB ("MessageFilterSubj", filter_subject), + BONOBO_UI_UNSAFE_VERB ("MessageFilderSndr", filter_sender), + BONOBO_UI_UNSAFE_VERB ("MessageFilderRecip", filter_recipient), /* Folder Menu */ - BONOBO_UI_VERB ("FolderExpunge", expunge_folder), - BONOBO_UI_VERB ("FolderConfig", configure_folder), + BONOBO_UI_UNSAFE_VERB ("FolderExpunge", expunge_folder), + BONOBO_UI_UNSAFE_VERB ("FolderConfig", configure_folder), /* Toolbar specific */ - BONOBO_UI_VERB ("MailGet", send_receieve_mail), - BONOBO_UI_VERB ("MailCompose", compose_msg), + BONOBO_UI_UNSAFE_VERB ("MailGet", send_receieve_mail), + BONOBO_UI_UNSAFE_VERB ("MailCompose", compose_msg), BONOBO_UI_VERB_END }; static void -set_pixmap (Bonobo_UIContainer container, +set_pixmap (BonoboUIComponent *uic, const char *xml_path, const char *icon) { @@ -137,7 +142,7 @@ set_pixmap (Bonobo_UIContainer container, pixbuf = gdk_pixbuf_new_from_file (path); g_return_if_fail (pixbuf != NULL); - bonobo_ui_util_set_pixbuf (container, xml_path, pixbuf); + bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf); gdk_pixbuf_unref (pixbuf); @@ -145,74 +150,69 @@ set_pixmap (Bonobo_UIContainer container, } static void -update_pixmaps (Bonobo_UIContainer container) +update_pixmaps (BonoboUIComponent *uic) { - set_pixmap (container, "/Toolbar/MailGet", "fetch-mail.png"); - set_pixmap (container, "/Toolbar/MailCompose", "compose-message.png"); - set_pixmap (container, "/Toolbar/Reply", "reply.png"); - set_pixmap (container, "/Toolbar/ReplyAll", "reply-to-all.png"); - set_pixmap (container, "/Toolbar/Forward", "forward.png"); - set_pixmap (container, "/Toolbar/Move", "move-message.png"); - set_pixmap (container, "/Toolbar/Copy", "copy-message.png"); + set_pixmap (uic, "/Toolbar/MailGet", "fetch-mail.png"); + set_pixmap (uic, "/Toolbar/MailCompose", "compose-message.png"); + set_pixmap (uic, "/Toolbar/Reply", "reply.png"); + set_pixmap (uic, "/Toolbar/ReplyAll", "reply-to-all.png"); + set_pixmap (uic, "/Toolbar/Forward", "forward.png"); + set_pixmap (uic, "/Toolbar/Move", "move-message.png"); + set_pixmap (uic, "/Toolbar/Copy", "copy-message.png"); } static void -control_activate (BonoboControl *control, BonoboUIHandler *uih, - FolderBrowser *fb) +control_activate (BonoboControl *control, + BonoboUIComponent *uic, + FolderBrowser *fb) { GtkWidget *folder_browser; - BonoboUIComponent *component; Bonobo_UIContainer container; - container = bonobo_control_get_remote_ui_handler (control); - bonobo_ui_handler_set_container (uih, container); + container = bonobo_control_get_remote_ui_container (control); + bonobo_ui_component_set_container (uic, container); bonobo_object_release_unref (container, NULL); - g_assert (container == bonobo_ui_compat_get_container (uih)); + g_assert (container == bonobo_ui_component_get_container (uic)); g_return_if_fail (container != CORBA_OBJECT_NIL); folder_browser = bonobo_control_get_widget (control); - component = bonobo_ui_compat_get_component (uih); bonobo_ui_component_add_verb_list_with_data ( - component, verbs, folder_browser); + uic, verbs, folder_browser); - bonobo_ui_container_freeze (container, NULL); + bonobo_ui_component_freeze (uic, NULL); bonobo_ui_util_set_ui ( - component, container, - EVOLUTION_DATADIR, "evolution-mail.xml", - "evolution-mail"); + uic, EVOLUTION_DATADIR, + "evolution-mail.xml", "evolution-mail"); if (mail_config_thread_list ()) - bonobo_ui_container_set_prop ( - container, "/menu/View/Threaded", "state", "1", NULL); + bonobo_ui_component_set_prop ( + uic, "/menu/View/Threaded", "state", "1", NULL); else - bonobo_ui_container_set_prop ( - container, "/menu/View/Threaded", "state", "0", NULL); + bonobo_ui_component_set_prop ( + uic, "/menu/View/Threaded", "state", "0", NULL); bonobo_ui_component_add_verb ( - component, "ViewThreaded", + uic, "ViewThreaded", (BonoboUIVerbFn) message_list_toggle_threads, FOLDER_BROWSER (folder_browser)->message_list); - create_ondemand_hooks (fb, uih); + create_ondemand_hooks (fb, uic); - update_pixmaps (container); + update_pixmaps (uic); - bonobo_ui_container_thaw (container, NULL); + bonobo_ui_component_thaw (uic, NULL); } static void -control_deactivate (BonoboControl *control, - BonoboUIHandler *uih, - FolderBrowser *fb) +control_deactivate (BonoboControl *control, + BonoboUIComponent *uic, + FolderBrowser *fb) { - bonobo_ui_component_rm ( - bonobo_ui_compat_get_component (uih), - bonobo_ui_compat_get_container (uih), "/", NULL); - - bonobo_ui_handler_unset_container (uih); + bonobo_ui_component_rm (uic, "/", NULL); + bonobo_ui_component_unset_container (uic); mail_do_sync_folder (fb->folder); } @@ -222,15 +222,15 @@ control_activate_cb (BonoboControl *control, gboolean activate, gpointer user_data) { - BonoboUIHandler *uih; + BonoboUIComponent *uic; - uih = bonobo_control_get_ui_handler (control); - g_assert (uih); + uic = bonobo_control_get_ui_component (control); + g_assert (uic != NULL); if (activate) - control_activate (control, uih, user_data); + control_activate (control, uic, user_data); else - control_deactivate (control, uih, user_data); + control_deactivate (control, uic, user_data); } static void diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c index ef1daa72f6..1d037af1aa 100644 --- a/mail/subscribe-dialog.c +++ b/mail/subscribe-dialog.c @@ -74,34 +74,8 @@ typedef struct { static GtkObjectClass *subscribe_dialog_parent_class; -static void subscribe_close (BonoboUIHandler *uih, void *user_data, const char *path); -static void subscribe_select_all (BonoboUIHandler *uih, void *user_data, const char *path); -static void subscribe_unselect_all (BonoboUIHandler *uih, void *user_data, const char *path); -static void subscribe_folder (GtkWidget *widget, gpointer user_data); -static void unsubscribe_folder (GtkWidget *widget, gpointer user_data); -static void subscribe_refresh_list (GtkWidget *widget, gpointer user_data); -static void subscribe_search (GtkWidget *widget, gpointer user_data); - -static BonoboUIVerb verbs [] = { - /* File Menu */ - BONOBO_UI_VERB ("FileCloseWin", subscribe_close), - - /* Edit Menu */ - BONOBO_UI_VERB ("EditSelectAll", subscribe_select_all), - BONOBO_UI_VERB ("EditUnSelectAll", subscribe_unselect_all), - - /* Folder Menu / Toolbar */ - BONOBO_UI_VERB ("SubscribeFolder", subscribe_folder), - BONOBO_UI_VERB ("UnsubscribeFolder", unsubscribe_folder), - - /* Toolbar Specific */ - BONOBO_UI_VERB ("RefreshList", subscribe_refresh_list), - - BONOBO_UI_VERB_END -}; - static void -set_pixmap (Bonobo_UIContainer container, +set_pixmap (BonoboUIComponent *component, const char *xml_path, const char *icon) { @@ -113,7 +87,7 @@ set_pixmap (Bonobo_UIContainer container, pixbuf = gdk_pixbuf_new_from_file (path); g_return_if_fail (pixbuf != NULL); - bonobo_ui_util_set_pixbuf (container, xml_path, pixbuf); + bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf); gdk_pixbuf_unref (pixbuf); @@ -121,11 +95,11 @@ set_pixmap (Bonobo_UIContainer container, } static void -update_pixmaps (Bonobo_UIContainer container) +update_pixmaps (BonoboUIComponent *component) { - set_pixmap (container, "/Toolbar/SubscribeFolder", "fetch-mail.png"); /* XXX */ - set_pixmap (container, "/Toolbar/UnsubscribeFolder", "compose-message.png"); /* XXX */ - set_pixmap (container, "/Toolbar/RefreshList", "forward.png"); /* XXX */ + set_pixmap (component, "/Toolbar/SubscribeFolder", "fetch-mail.png"); /* XXX */ + set_pixmap (component, "/Toolbar/UnsubscribeFolder", "compose-message.png"); /* XXX */ + set_pixmap (component, "/Toolbar/RefreshList", "forward.png"); /* XXX */ } static GtkWidget* @@ -154,7 +128,7 @@ make_folder_search_widget (GtkSignalFunc start_search_func, static void -subscribe_close (BonoboUIHandler *uih, +subscribe_close (BonoboUIComponent *uic, void *user_data, const char *path) { SubscribeDialog *sc = (SubscribeDialog*)user_data; @@ -163,13 +137,13 @@ subscribe_close (BonoboUIHandler *uih, } static void -subscribe_select_all (BonoboUIHandler *uih, +subscribe_select_all (BonoboUIComponent *uic, void *user_data, const char *path) { } static void -subscribe_unselect_all (BonoboUIHandler *uih, +subscribe_unselect_all (BonoboUIComponent *uic, void *user_data, const char *path) { } @@ -391,6 +365,24 @@ storage_selected_cb (EvolutionStorageSetViewListener *listener, " earth. Their tags shall blink until the end of days. \n" \ " from The Book of Mozilla, 12:10" +static BonoboUIVerb verbs [] = { + /* File Menu */ + BONOBO_UI_UNSAFE_VERB ("FileCloseWin", subscribe_close), + + /* Edit Menu */ + BONOBO_UI_UNSAFE_VERB ("EditSelectAll", subscribe_select_all), + BONOBO_UI_UNSAFE_VERB ("EditUnSelectAll", subscribe_unselect_all), + + /* Folder Menu / Toolbar */ + BONOBO_UI_UNSAFE_VERB ("SubscribeFolder", subscribe_folder), + BONOBO_UI_UNSAFE_VERB ("UnsubscribeFolder", unsubscribe_folder), + + /* Toolbar Specific */ + BONOBO_UI_UNSAFE_VERB ("RefreshList", subscribe_refresh_list), + + BONOBO_UI_VERB_END +}; + static void subscribe_dialog_gui_init (SubscribeDialog *sc) { @@ -399,7 +391,7 @@ subscribe_dialog_gui_init (SubscribeDialog *sc) ETableHeader *e_table_header; GdkPixbuf *toggles[2]; BonoboUIComponent *component; - Bonobo_UIContainer container; + BonoboUIContainer *container; GtkWidget *folder_search_widget, *vbox, *storage_set_title_bar; BonoboControl *search_control; CORBA_Environment ev; @@ -410,31 +402,26 @@ subscribe_dialog_gui_init (SubscribeDialog *sc) sc->app = bonobo_win_new ("subscribe-dialog", "Manage Subscriptions"); /* Build the menu and toolbar */ - sc->uih = bonobo_ui_handler_new (); - if (!sc->uih) { - g_message ("subscribe_dialog_gui_init(): eeeeek, could not create the UI handler!"); - return; - } - - bonobo_ui_handler_set_app (sc->uih, BONOBO_WIN (sc->app)); + container = bonobo_ui_container_new (); + bonobo_ui_container_set_win (container, BONOBO_WIN (sc->app)); /* set up the bonobo stuff */ - component = bonobo_ui_compat_get_component (sc->uih); - container = bonobo_ui_compat_get_container (sc->uih); + component = bonobo_ui_component_new_default (); + bonobo_ui_component_set_container ( + component, bonobo_object_corba_objref (BONOBO_OBJECT (container))); bonobo_ui_component_add_verb_list_with_data ( component, verbs, sc); - bonobo_ui_container_freeze (container, NULL); + bonobo_ui_component_freeze (component, NULL); - bonobo_ui_util_set_ui (component, container, - EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR, "evolution-subscribe.xml", "evolution-subscribe"); - update_pixmaps (container); + update_pixmaps (component); - bonobo_ui_container_thaw (container, NULL); + bonobo_ui_component_thaw (component, NULL); sc->storage_set_control = Evolution_Shell_create_storage_set_view (sc->shell, &ev); sc->storage_set_view = Bonobo_Unknown_query_interface (sc->storage_set_control, @@ -444,9 +431,10 @@ subscribe_dialog_gui_init (SubscribeDialog *sc) /* we just want to show storages */ Evolution_StorageSetView__set_show_folders (sc->storage_set_view, FALSE, &ev); - sc->storage_set_view_widget = bonobo_widget_new_control_from_objref (sc->storage_set_control, - container); - + sc->storage_set_view_widget = + bonobo_widget_new_control_from_objref ( + sc->storage_set_control, + bonobo_object_corba_objref (BONOBO_OBJECT (container))); /* we also want a listener so we can tell when storages are selected */ sc->listener = evolution_storage_set_view_listener_new (); @@ -480,10 +468,9 @@ subscribe_dialog_gui_init (SubscribeDialog *sc) gtk_widget_show_all (folder_search_widget); search_control = bonobo_control_new (folder_search_widget); - bonobo_ui_container_object_set (container, - "/Toolbar/FolderSearch", - bonobo_object_corba_objref (BONOBO_OBJECT (search_control)), - NULL); + bonobo_ui_component_object_set ( + component, "/Toolbar/FolderSearch", + bonobo_object_corba_objref (BONOBO_OBJECT (search_control)), NULL); /* set our our contents */ sc->description = html_new (TRUE); diff --git a/shell/ChangeLog b/shell/ChangeLog index d986283db5..c73b26ca8a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,16 @@ +2000-10-05 Michael Meeks <michael@helixcode.com> + + * e-shell-view-menu.c (shortcut_bar_mode_changed_cb): upd. + (folder_bar_mode_changed_cb): upd. + (command_xml_dump): clobber. + (e_shell_view_menu_setup): upd. + + * e-shell-view.c (shell_view_interface_set_message_cb): upd. + (shell_view_interface_unset_message_cb): upd. + (e_shell_view_construct): upd. + (get_control_for_uri): upd. + (e_shell_view_get_bonobo_ui_component): upd. + 2000-10-04 Michael Meeks <michael@helixcode.com> * e-shell-view.c (setup_progress_bar): remove evil usize set. diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 6d6d55b7c7..dd7c244692 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -42,19 +42,19 @@ shortcut_bar_mode_changed_cb (EShellView *shell_view, EShellViewSubwindowMode new_mode, void *data) { - BonoboUIHandler *uih; + BonoboUIComponent *uic; const char *path; - gboolean toggle_state; + char *txt; if (new_mode == E_SHELL_VIEW_SUBWINDOW_HIDDEN) - toggle_state = FALSE; + txt = "0"; else - toggle_state = TRUE; + txt = "1"; path = (const char *) data; - uih = e_shell_view_get_bonobo_ui_handler (shell_view); + uic = e_shell_view_get_bonobo_ui_component (shell_view); - bonobo_ui_handler_menu_set_toggle_state (uih, path, toggle_state); + bonobo_ui_component_set_prop (uic, path, "state", txt, NULL); } static void @@ -62,19 +62,19 @@ folder_bar_mode_changed_cb (EShellView *shell_view, EShellViewSubwindowMode new_mode, void *data) { - BonoboUIHandler *uih; + BonoboUIComponent *uic; const char *path; - gboolean toggle_state; + char *txt; if (new_mode == E_SHELL_VIEW_SUBWINDOW_HIDDEN) - toggle_state = FALSE; + txt = "0"; else - toggle_state = TRUE; + txt = "1"; path = (const char *) data; - uih = e_shell_view_get_bonobo_ui_handler (shell_view); + uic = e_shell_view_get_bonobo_ui_component (shell_view); - bonobo_ui_handler_menu_set_toggle_state (uih, path, toggle_state); + bonobo_ui_component_set_prop (uic, path, "state", txt, NULL); } @@ -360,17 +360,20 @@ command_create_folder (BonoboUIHandler *uih, } static void -command_xml_dump (gpointer dummy, - EShellView *view) +command_xml_dump (gpointer dummy, + EShellView *view) { +#if 0 BonoboUIHandler *uih; BonoboWin *win; - uih = e_shell_view_get_bonobo_ui_handler (view); + uih = e_shell_view_get_bonobo_ui_component (view); win = bonobo_ui_handler_get_app (uih); bonobo_win_dump (win, "On demand"); +#endif + g_warning ("FIXME: to re-instate debugging dump we need to get the container"); } @@ -378,7 +381,7 @@ command_xml_dump (gpointer dummy, #define DEFINE_UNIMPLEMENTED(func) \ static void \ -func (BonoboUIHandler *uih, void *data, const char *path) \ +func (BonoboUIComponent *uic, void *data, const char *path) \ { \ g_warning ("EShellView: %s: not implemented.", __FUNCTION__); \ } \ @@ -389,32 +392,32 @@ DEFINE_UNIMPLEMENTED (command_new_contact) DEFINE_UNIMPLEMENTED (command_new_task_request) BonoboUIVerb new_verbs [] = { - BONOBO_UI_VERB ("NewView", command_new_view), - BONOBO_UI_VERB ("NewFolder", command_new_folder), - BONOBO_UI_VERB ("NewShortcut", command_new_shortcut), - BONOBO_UI_VERB ("NewMailMessage", command_new_mail_message), + BONOBO_UI_UNSAFE_VERB ("NewView", command_new_view), + BONOBO_UI_UNSAFE_VERB ("NewFolder", command_new_folder), + BONOBO_UI_UNSAFE_VERB ("NewShortcut", command_new_shortcut), + BONOBO_UI_UNSAFE_VERB ("NewMailMessage", command_new_mail_message), - BONOBO_UI_VERB ("NewAppointment", command_new_shortcut), - BONOBO_UI_VERB ("NewContact", command_new_contact), - BONOBO_UI_VERB ("NewTask", command_new_task_request), + BONOBO_UI_UNSAFE_VERB ("NewAppointment", command_new_shortcut), + BONOBO_UI_UNSAFE_VERB ("NewContact", command_new_contact), + BONOBO_UI_UNSAFE_VERB ("NewTask", command_new_task_request), BONOBO_UI_VERB_END }; BonoboUIVerb file_verbs [] = { - BONOBO_UI_VERB ("FileGoToFolder", command_goto_folder), - BONOBO_UI_VERB ("FileCreateFolder", command_create_folder), - BONOBO_UI_VERB ("FileExit", command_quit), + BONOBO_UI_UNSAFE_VERB ("FileGoToFolder", command_goto_folder), + BONOBO_UI_UNSAFE_VERB ("FileCreateFolder", command_create_folder), + BONOBO_UI_UNSAFE_VERB ("FileExit", command_quit), BONOBO_UI_VERB_END }; BonoboUIVerb help_verbs [] = { - BONOBO_UI_VERB_DATA ("HelpIndex", command_help, "index.html"), - BONOBO_UI_VERB_DATA ("HelpGetStarted", command_help, "usage-mainwindow.html"), - BONOBO_UI_VERB_DATA ("HelpUsingMail", command_help, "usage-mail.html"), - BONOBO_UI_VERB_DATA ("HelpUsingCalendar", command_help, "usage-calendar.html"), - BONOBO_UI_VERB_DATA ("HelpUsingContact", command_help, "usage-contact.html"), + BONOBO_UI_UNSAFE_VERB_DATA ("HelpIndex", command_help, "index.html"), + BONOBO_UI_UNSAFE_VERB_DATA ("HelpGetStarted", command_help, "usage-mainwindow.html"), + BONOBO_UI_UNSAFE_VERB_DATA ("HelpUsingMail", command_help, "usage-mail.html"), + BONOBO_UI_UNSAFE_VERB_DATA ("HelpUsingCalendar", command_help, "usage-calendar.html"), + BONOBO_UI_UNSAFE_VERB_DATA ("HelpUsingContact", command_help, "usage-contact.html"), BONOBO_UI_VERB_END }; @@ -441,32 +444,29 @@ menu_do_misc (BonoboUIComponent *component, } -#define SHORTCUT_BAR_TOGGLE_PATH "/View/ShortcutBar" -#define FOLDER_BAR_TOGGLE_PATH "/View/FolderBar" +#define SHORTCUT_BAR_TOGGLE_PATH "/menu/View/ShortcutBar" +#define FOLDER_BAR_TOGGLE_PATH "/menu/View/FolderBar" void e_shell_view_menu_setup (EShellView *shell_view) { - BonoboUIHandler *uih; - BonoboUIComponent *component; + BonoboUIComponent *uic; g_return_if_fail (shell_view != NULL); g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); - uih = e_shell_view_get_bonobo_ui_handler (shell_view); - - component = bonobo_ui_compat_get_component (uih); + uic = e_shell_view_get_bonobo_ui_component (shell_view); bonobo_ui_component_add_verb_list_with_data ( - component, file_verbs, shell_view); + uic, file_verbs, shell_view); bonobo_ui_component_add_verb_list_with_data ( - component, new_verbs, shell_view); + uic, new_verbs, shell_view); bonobo_ui_component_add_verb_list ( - component, help_verbs); + uic, help_verbs); - menu_do_misc (component, shell_view); + menu_do_misc (uic, shell_view); gtk_signal_connect (GTK_OBJECT (shell_view), "shortcut_bar_mode_changed", GTK_SIGNAL_FUNC (shortcut_bar_mode_changed_cb), diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 2b56a91317..6802e2008a 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -60,7 +60,7 @@ struct _EShellViewPrivate { EShell *shell; /* The UI handler. */ - BonoboUIHandler *uih; + BonoboUIComponent *ui_component; /* Currently displayed URI. */ char *uri; @@ -442,9 +442,8 @@ setup_progress_bar (EShellViewPrivate *priv) control = bonobo_control_new (priv->progress_bar); g_return_if_fail (control != NULL); - bonobo_ui_container_object_set ( - bonobo_ui_compat_get_container (priv->uih), - "/status/Progress", + bonobo_ui_component_object_set ( + priv->ui_component, "/status/Progress", bonobo_object_corba_objref (BONOBO_OBJECT (control)), NULL); } @@ -555,7 +554,7 @@ destroy (GtkObject *object) g_hash_table_foreach (priv->uri_to_control, hash_forall_destroy_control, NULL); g_hash_table_destroy (priv->uri_to_control); - bonobo_object_unref (BONOBO_OBJECT (priv->uih)); + bonobo_object_unref (BONOBO_OBJECT (priv->ui_component)); g_free (priv->uri); @@ -605,7 +604,7 @@ class_init (EShellViewClass *klass) object_class->destroy = destroy; - parent_class = gtk_type_class (BONOBO_WIN_TYPE); + parent_class = gtk_type_class (BONOBO_TYPE_WIN); signals[SHORTCUT_BAR_MODE_CHANGED] = gtk_signal_new ("shortcut_bar_mode_changed", @@ -636,7 +635,7 @@ init (EShellView *shell_view) priv = g_new (EShellViewPrivate, 1); priv->shell = NULL; - priv->uih = NULL; + priv->ui_component = NULL; priv->uri = NULL; priv->delayed_selection = NULL; @@ -754,9 +753,8 @@ shell_view_interface_set_message_cb (EvolutionShellView *shell_view, } else status = g_strdup (""); - bonobo_ui_container_set_status ( - bonobo_ui_compat_get_container (view->priv->uih), - status, NULL); + bonobo_ui_component_set_status ( + view->priv->ui_component, status, NULL); g_free (status); @@ -776,9 +774,8 @@ shell_view_interface_unset_message_cb (EvolutionShellView *shell_view, g_return_if_fail (view != NULL); - bonobo_ui_container_set_status ( - bonobo_ui_compat_get_container (view->priv->uih), - "", NULL); + bonobo_ui_component_set_status ( + view->priv->ui_component, "", NULL); stop_progress_bar (E_SHELL_VIEW (data)); } @@ -791,8 +788,7 @@ e_shell_view_construct (EShellView *shell_view, EShellViewPrivate *priv; EShellView *view; GtkObject *window; - Bonobo_UIContainer container; - BonoboUIComponent *component; + BonoboUIContainer *container; g_return_val_if_fail (shell != NULL, NULL); g_return_val_if_fail (shell_view != NULL, NULL); @@ -818,18 +814,18 @@ e_shell_view_construct (EShellView *shell_view, priv->shell = shell; - priv->uih = bonobo_ui_handler_new (); - bonobo_ui_handler_set_app (priv->uih, BONOBO_WIN (shell_view)); + container = bonobo_ui_container_new (); + bonobo_ui_container_set_win (container, BONOBO_WIN (shell_view)); - component = bonobo_ui_compat_get_component (priv->uih); - container = bonobo_ui_compat_get_container (priv->uih); - g_return_val_if_fail (container != CORBA_OBJECT_NIL, NULL); + priv->ui_component = bonobo_ui_component_new ("evolution"); + bonobo_ui_component_set_container ( + priv->ui_component, + bonobo_object_corba_objref (BONOBO_OBJECT (container))); - bonobo_ui_container_freeze (container, NULL); + bonobo_ui_component_freeze (priv->ui_component, NULL); - bonobo_ui_util_set_ui (component, container, - EVOLUTION_DATADIR, "evolution.xml", - "evolution"); + bonobo_ui_util_set_ui (priv->ui_component, EVOLUTION_DATADIR, + "evolution.xml", "evolution"); setup_widgets (shell_view); @@ -837,7 +833,7 @@ e_shell_view_construct (EShellView *shell_view, e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_HIDDEN); - bonobo_ui_container_thaw (container, NULL); + bonobo_ui_component_thaw (priv->ui_component, NULL); return view; } @@ -1122,7 +1118,7 @@ get_control_for_uri (EShellView *shell_view, control = bonobo_widget_new_control_from_objref ( corba_control, - bonobo_ui_compat_get_container (priv->uih)); + bonobo_ui_component_get_container (priv->ui_component)); setup_evolution_shell_view_interface (shell_view, control); @@ -1148,10 +1144,8 @@ show_existing_view (EShellView *shell_view, control is dead; if it's zombie, we have to recreate it. */ if (bonobo_widget_is_dead (BONOBO_WIDGET (control))) { GtkWidget *parent; - Bonobo_UIContainer uih; parent = control->parent; - uih = bonobo_object_corba_objref (BONOBO_OBJECT (priv->uih)); /* Out with the old. */ gtk_container_remove (GTK_CONTAINER (parent), control); @@ -1375,13 +1369,13 @@ e_shell_view_get_shell (EShellView *shell_view) return shell_view->priv->shell; } -BonoboUIHandler * -e_shell_view_get_bonobo_ui_handler (EShellView *shell_view) +BonoboUIComponent * +e_shell_view_get_bonobo_ui_component (EShellView *shell_view) { g_return_val_if_fail (shell_view != NULL, NULL); g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL); - return shell_view->priv->uih; + return shell_view->priv->ui_component; } GtkWidget * @@ -1491,4 +1485,4 @@ e_shell_view_load_settings (EShellView *shell_view, } -E_MAKE_TYPE (e_shell_view, "EShellView", EShellView, class_init, init, BONOBO_WIN_TYPE) +E_MAKE_TYPE (e_shell_view, "EShellView", EShellView, class_init, init, BONOBO_TYPE_WIN) diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 0aa69a18c3..09b7a44f47 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -86,7 +86,7 @@ EShellViewSubwindowMode e_shell_view_get_shortcut_bar_mode (EShellView EShellViewSubwindowMode e_shell_view_get_folder_bar_mode (EShellView *shell_view); EShell *e_shell_view_get_shell (EShellView *shell_view); -BonoboUIHandler *e_shell_view_get_bonobo_ui_handler (EShellView *shell_view); +BonoboUIComponent *e_shell_view_get_bonobo_ui_component(EShellView *shell_view); GtkWidget *e_shell_view_get_appbar (EShellView *shell_view); const char *e_shell_view_get_current_uri (EShellView *shell_view); diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h index 6b080e48c3..db6dfe69b4 100644 --- a/shell/evolution-shell-component.h +++ b/shell/evolution-shell-component.h @@ -30,6 +30,7 @@ #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-control.h> +#include <bonobo/bonobo-ui-compat.h> #include "Evolution.h" |