diff options
| author | Eskil Heyn Olsen <eskil@src.gnome.org> | 1999-09-23 13:58:40 +0800 |
|---|---|---|
| committer | Eskil Heyn Olsen <eskil@src.gnome.org> | 1999-09-23 13:58:40 +0800 |
| commit | 2c445af1247951fb2947d833e97814ecfeb85616 (patch) | |
| tree | c9e1d47549f5dcbc83f375d8784af0c23f0b0db2 /calendar/conduits | |
| parent | af628520342c2374267f0e9fa611ef6bad9e7076 (diff) | |
| download | gsoc2013-evolution-2c445af1247951fb2947d833e97814ecfeb85616.tar.gz gsoc2013-evolution-2c445af1247951fb2947d833e97814ecfeb85616.tar.zst gsoc2013-evolution-2c445af1247951fb2947d833e97814ecfeb85616.zip | |
better merge of summary/description when doing ical_from_remote
* calendar-conduit.c: better merge of summary/description
when doing ical_from_remote (update_record), also handles
import from gnomecal to pilot better, and on both ways, repeat
events are much better now.
svn path=/trunk/; revision=1253
Diffstat (limited to 'calendar/conduits')
4 files changed, 13 insertions, 5 deletions
diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.c b/calendar/conduits/calendar/calendar-conduit-control-applet.c index f8e234ac13..44ca3d7898 100644 --- a/calendar/conduits/calendar/calendar-conduit-control-applet.c +++ b/calendar/conduits/calendar/calendar-conduit-control-applet.c @@ -47,7 +47,7 @@ doTrySettings(GtkWidget *widget, ConduitCfg *conduitCfg) { readStateCfg(cfgStateWindow); if(activated) - gpilotd_conduit_mgmt_enable(conduit,pilotId); + gpilotd_conduit_mgmt_enable(conduit,pilotId,GnomePilotConduitSyncTypeSynchronize); else gpilotd_conduit_mgmt_disable(conduit,pilotId); } diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h index c34457acc5..86b38cc802 100644 --- a/calendar/conduits/calendar/calendar-conduit.h +++ b/calendar/conduits/calendar/calendar-conduit.h @@ -9,6 +9,14 @@ #include <pi-datebook.h> #include <gnome.h> +#include "GnomeCal.h" +#include "calobj.h" +#include "calendar.h" +#include "timeutil.h" + +#include <gpilotd/gnome-pilot-conduit.h> +#include <gpilotd/gnome-pilot-conduit-standard-abs.h> + #define CALLOCALRECORD(s) ((CalLocalRecord*)(s)) typedef struct _CalLocalRecord CalLocalRecord; diff --git a/calendar/conduits/todo/todo-conduit-control-applet.c b/calendar/conduits/todo/todo-conduit-control-applet.c index def35ca376..06f068b787 100644 --- a/calendar/conduits/todo/todo-conduit-control-applet.c +++ b/calendar/conduits/todo/todo-conduit-control-applet.c @@ -46,7 +46,7 @@ doTrySettings(GtkWidget *widget, ConduitCfg *conduitCfg) { readStateCfg(cfgStateWindow); if(activated) - gpilotd_conduit_mgmt_enable(conduit,pilotId); + gpilotd_conduit_mgmt_enable(conduit,pilotId,GnomePilotConduitSyncTypeSynchronize); else gpilotd_conduit_mgmt_disable(conduit,pilotId); } diff --git a/calendar/conduits/todo/todo-conduit-control-applet.desktop b/calendar/conduits/todo/todo-conduit-control-applet.desktop index 869bba1476..87788bde08 100644 --- a/calendar/conduits/todo/todo-conduit-control-applet.desktop +++ b/calendar/conduits/todo/todo-conduit-control-applet.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=Calendar conduit -Comment=Configure the calendar conduit -Exec=calendar-conduit-control-applet --cap-id=1 +Name=Todo conduit +Comment=Configure the todo conduit +Exec=todo-conduit-control-applet --cap-id=1 Terminal=0 Type=Application |