aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/contact-editor
diff options
context:
space:
mode:
authorMichael Meeks <michael@helixcode.com>2000-10-05 15:10:04 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-10-05 15:10:04 +0800
commitd5a93f01c1a20edf80be106993f64fc0385a7a59 (patch)
treed4cc42300219571c4b1865bb9c42d5d7a0ff87fa /addressbook/contact-editor
parent83b5ac87fca211734b8712b1bbe3247ab89f98fc (diff)
downloadgsoc2013-evolution-d5a93f01c1a20edf80be106993f64fc0385a7a59.tar
gsoc2013-evolution-d5a93f01c1a20edf80be106993f64fc0385a7a59.tar.gz
gsoc2013-evolution-d5a93f01c1a20edf80be106993f64fc0385a7a59.tar.bz2
gsoc2013-evolution-d5a93f01c1a20edf80be106993f64fc0385a7a59.tar.lz
gsoc2013-evolution-d5a93f01c1a20edf80be106993f64fc0385a7a59.tar.xz
gsoc2013-evolution-d5a93f01c1a20edf80be106993f64fc0385a7a59.tar.zst
gsoc2013-evolution-d5a93f01c1a20edf80be106993f64fc0385a7a59.zip
Disable summary stuff, it appears to be badly broken.
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-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-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-10-05 Michael Meeks <michael@helixcode.com> * gui/calendar-commands.c: upd. (calendar_control_activate): upd. (calendar_control_deactivate): upd. 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. svn path=/trunk/; revision=5742
Diffstat (limited to 'addressbook/contact-editor')
-rw-r--r--addressbook/contact-editor/e-contact-editor.c38
-rw-r--r--addressbook/contact-editor/e-contact-editor.h2
2 files changed, 19 insertions, 21 deletions
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;