aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/gui/calendar-commands.c20
2 files changed, 10 insertions, 14 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8aaee757ad..8650f31077 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-22 Michael Meeks <michael@helixcode.com>
+
+ * gui/calendar-commands.c (calendar_control_activate): upd.
+
2000-09-21 Federico Mena Quintero <federico@helixcode.com>
* gui/calendar-commands.c (verbs): Removed the "about calendar"
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 8443323f43..0870f70be1 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -557,9 +557,7 @@ calendar_control_activate (BonoboControl *control,
1, 1, 0);
#endif
- { /* FIXME: sweeten this whole function */
- char *fname;
- xmlNode *ui;
+ {
Bonobo_UIContainer container;
BonoboUIComponent *component;
@@ -569,17 +567,11 @@ calendar_control_activate (BonoboControl *control,
container = bonobo_ui_compat_get_container (uih);
g_return_if_fail (container != CORBA_OBJECT_NIL);
-
- fname = bonobo_ui_util_get_ui_fname (
- EVOLUTION_DATADIR, "evolution-calendar.xml");
- g_warning ("Attempting ui load from '%s'", fname);
-
- ui = bonobo_ui_util_new_ui (component, fname, "evolution-calendar");
-
- bonobo_ui_component_set_tree (component, container, "/", ui, NULL);
-
- g_free (fname);
- xmlFreeNode (ui);
+
+ bonobo_ui_util_set_ui (component, container,
+ EVOLUTION_DATADIR,
+ "evolution-calendar.xml",
+ "evolution-calendar");
}
}