diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-09-23 23:41:21 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-09-23 23:41:21 +0800 |
| commit | 150fcadcd211229444910f2799212c27a247fa60 (patch) | |
| tree | 83933be7df6b496929b1f8b50436641a661152db /calendar | |
| parent | 28c50b7cb8dfb17659c6043c48d5cc03be537154 (diff) | |
| download | gsoc2013-evolution-150fcadcd211229444910f2799212c27a247fa60.tar gsoc2013-evolution-150fcadcd211229444910f2799212c27a247fa60.tar.gz gsoc2013-evolution-150fcadcd211229444910f2799212c27a247fa60.tar.bz2 gsoc2013-evolution-150fcadcd211229444910f2799212c27a247fa60.tar.lz gsoc2013-evolution-150fcadcd211229444910f2799212c27a247fa60.tar.xz 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')
| -rw-r--r-- | calendar/ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/gui/calendar-commands.c | 20 |
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"); } } |