diff options
| author | Rodrigo Moya <rodrigo@ximian.com> | 2002-02-14 21:02:59 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2002-02-14 21:02:59 +0800 |
| commit | 378a7c56b720dd4240d192c859737ea19e709fbf (patch) | |
| tree | 45f82ede882ca6ad9fa16e0a059e4a0140e7ec03 /calendar/gui/control-factory.c | |
| parent | de5b206ef73db4f87f19ae4e5b943c28334425a8 (diff) | |
| download | gsoc2013-evolution-378a7c56b720dd4240d192c859737ea19e709fbf.tar gsoc2013-evolution-378a7c56b720dd4240d192c859737ea19e709fbf.tar.gz gsoc2013-evolution-378a7c56b720dd4240d192c859737ea19e709fbf.tar.bz2 gsoc2013-evolution-378a7c56b720dd4240d192c859737ea19e709fbf.tar.lz gsoc2013-evolution-378a7c56b720dd4240d192c859737ea19e709fbf.tar.xz gsoc2013-evolution-378a7c56b720dd4240d192c859737ea19e709fbf.tar.zst gsoc2013-evolution-378a7c56b720dd4240d192c859737ea19e709fbf.zip | |
don't append 'calendar.ics' to the URI. (get_prop): finished.
2002-02-13 Rodrigo Moya <rodrigo@ximian.com>
* gui/control-factory.c (set_prop): don't append 'calendar.ics'
to the URI.
(get_prop): finished.
* gui/tasks-control.c (tasks_control_set_property): don't append
'tasks.ics' to the URI.
(tasks_control_get_property): finished.
* gui/gnome-cal.c (gnome_calendar_open):
* gui/e-tasks.c (e_tasks_open): append $filename.ics to the uri to be
opened if the uri is local. Leave intact in other cases.
svn path=/trunk/; revision=15724
Diffstat (limited to 'calendar/gui/control-factory.c')
| -rw-r--r-- | calendar/gui/control-factory.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index f497d633e3..724d5881df 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -68,17 +68,14 @@ get_prop (BonoboPropertyBag *bag, CORBA_Environment *ev, gpointer user_data) { - /*GnomeCalendar *gcal = user_data;*/ + GnomeCalendar *gcal = user_data; + char *uri; switch (arg_id) { case PROPERTY_CALENDAR_URI_IDX: - /* - if (fb && fb->uri) - BONOBO_ARG_SET_STRING (arg, fb->uri); - else - BONOBO_ARG_SET_STRING (arg, ""); - */ + uri = cal_client_get_uri (gnome_calendar_get_cal_client (gcal)); + BONOBO_ARG_SET_STRING (arg, uri); break; default: @@ -95,14 +92,10 @@ set_prop (BonoboPropertyBag *bag, gpointer user_data) { GnomeCalendar *gcal = user_data; - char *filename; switch (arg_id) { case PROPERTY_CALENDAR_URI_IDX: - filename = g_strdup_printf ("%s/calendar.ics", - BONOBO_ARG_GET_STRING (arg)); - gnome_calendar_open (gcal, filename); /* FIXME: result value -> exception? */ - g_free (filename); + gnome_calendar_open (gcal, BONOBO_ARG_GET_STRING (arg)); /* FIXME: result value -> exception? */ break; default: @@ -156,7 +149,7 @@ control_factory_init (void) factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, control_factory_fn, NULL); bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory)); - + if (factory == NULL) g_error ("I could not register a Calendar control factory."); } |