aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/calendar-commands.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-09-23 23:41:21 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-09-23 23:41:21 +0800
commit150fcadcd211229444910f2799212c27a247fa60 (patch)
tree83933be7df6b496929b1f8b50436641a661152db /calendar/gui/calendar-commands.c
parent28c50b7cb8dfb17659c6043c48d5cc03be537154 (diff)
downloadgsoc2013-evolution-150fcadcd211229444910f2799212c27a247fa60.tar.gz
gsoc2013-evolution-150fcadcd211229444910f2799212c27a247fa60.tar.zst
gsoc2013-evolution-150fcadcd211229444910f2799212c27a247fa60.zip
Updates for the Bonobo changes from Michael who is having some
troubles with CVS at home (so I commit this on his behalf). svn path=/trunk/; revision=5560
Diffstat (limited to 'calendar/gui/calendar-commands.c')
-rw-r--r--calendar/gui/calendar-commands.c20
1 files changed, 6 insertions, 14 deletions
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");
}
}