diff options
author | JP Rosevear <jpr@helixcode.com> | 2000-09-11 09:28:39 +0800 |
---|---|---|
committer | JP Rosevear <jpr@src.gnome.org> | 2000-09-11 09:28:39 +0800 |
commit | b971ef36179be89ce8fcfda712851418fadc0035 (patch) | |
tree | 3d2e4421255219ea389fef9d169f0857caeb8d85 /calendar/conduits/todo/todo-conduit.h | |
parent | 278215b3cf2caa93af681a771e4003288cdaf203 (diff) | |
download | gsoc2013-evolution-b971ef36179be89ce8fcfda712851418fadc0035.tar gsoc2013-evolution-b971ef36179be89ce8fcfda712851418fadc0035.tar.gz gsoc2013-evolution-b971ef36179be89ce8fcfda712851418fadc0035.tar.bz2 gsoc2013-evolution-b971ef36179be89ce8fcfda712851418fadc0035.tar.lz gsoc2013-evolution-b971ef36179be89ce8fcfda712851418fadc0035.tar.xz gsoc2013-evolution-b971ef36179be89ce8fcfda712851418fadc0035.tar.zst gsoc2013-evolution-b971ef36179be89ce8fcfda712851418fadc0035.zip |
Remove catch_ret_val function since its no longer useful. Fix naming of
2000-09-10 JP Rosevear <jpr@helixcode.com>
* conduits/todo/todo-conduit.c: Remove catch_ret_val function
since its no longer useful. Fix naming of various fields from
the header changes. Use GnomePilotRecord* stuff instead of
ICAL_PILOT_SYNC_*
(e_todo_context_new): Rename from gcalconduit_new_context. Now
takes
a pilot id and loads the configuration here
(e_todo_context_destroy): Rename from gcalconduit_destroy_context.
Unref the client and destroy the configuration if they exist here
(start_calendar_server): Change the default calendar name
(local_record_from_comp_uid): Rename from
local_record_from_ical_uid
(local_record_from_compobject): Rename from
local_record_from_icalobject. Properly do the pilot id and
status.
(comp_from_remote_record): Rename from ical_from_remote_record.
Handle due, complete, classification and pilot stuff properly
(pre_sync): Remove some old stuff. We need to figure out how to
set some of the field values.
(set_status): Reflect pilot status changes from above
(conduit_destroy_gpilot_conduit): Remove cleanup stuff that is
now done by e_todo_context_destroy
(conduit_get_gpilot_conduit): Only set the context as object
data of the conduit.
* conduits/todo/todo-conduit.h: Rename GCalConduitContext to
EToDoConduitContext. Remove some unused struct fields.
For GCalLocalRecord, rename ical to comp.
svn path=/trunk/; revision=5306
Diffstat (limited to 'calendar/conduits/todo/todo-conduit.h')
-rw-r--r-- | calendar/conduits/todo/todo-conduit.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h index 89cc60e920..e87141e4b1 100644 --- a/calendar/conduits/todo/todo-conduit.h +++ b/calendar/conduits/todo/todo-conduit.h @@ -11,7 +11,6 @@ #include <gpilotd/gnome-pilot-conduit.h> #include <gpilotd/gnome-pilot-conduit-standard-abs.h> #include <cal-client/cal-client.h> -#include <cal-util/calobj.h> #include <cal-util/timeutil.h> #include <liboaf/liboaf.h> @@ -27,36 +26,24 @@ struct _GCalLocalRecord { LocalRecord local; /* The corresponding Comp object, as found by GnomeCal. */ - CalComponent *ical; + CalComponent *comp; /* pilot-link todo structure, used for implementing Transmit. */ struct ToDo *todo; }; -#define GCAL_LOCALRECORD(s) ((GCalLocalRecord*)(s)) - -/* This is the configuration of the GnomeCal conduit. */ -typedef struct _GCalConduitCfg GCalConduitCfg; -struct _GCalConduitCfg { - gboolean open_secret; - guint32 pilotId; - GnomePilotConduitSyncType sync_type; /* only used by capplet */ -}; -#define GET_GCALCONFIG(c) ((GCalConduitCfg*)gtk_object_get_data(GTK_OBJECT(c),"todoconduit_cfg")) /* This is the context for all the GnomeCal conduit methods. */ -typedef struct _GCalConduitContext GCalConduitContext; -struct _GCalConduitContext { +typedef struct _EToDoConduitContext EToDoConduitContext; +struct _EToDoConduitContext { struct ToDoAppInfo ai; ToDoConduitCfg *cfg; CalClient *client; - CORBA_Environment ev; - CORBA_ORB orb; + gboolean calendar_load_tried; gboolean calendar_load_success; char *calendar_file; }; -#define GET_GCALCONTEXT(c) ((GCalConduitContext*)gtk_object_get_data(GTK_OBJECT(c),"todoconduit_context")) #endif __TODO_CONDUIT_H__ |