From 2c445af1247951fb2947d833e97814ecfeb85616 Mon Sep 17 00:00:00 2001 From: Eskil Heyn Olsen Date: Thu, 23 Sep 1999 05:58:40 +0000 Subject: 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 --- calendar/Makefile.am | 5 +++-- calendar/calendar-conduit-control-applet.c | 2 +- calendar/calendar-conduit.h | 8 ++++++++ calendar/conduits/calendar/calendar-conduit-control-applet.c | 2 +- calendar/conduits/calendar/calendar-conduit.h | 8 ++++++++ calendar/conduits/todo/todo-conduit-control-applet.c | 2 +- calendar/conduits/todo/todo-conduit-control-applet.desktop | 6 +++--- calendar/gui/Makefile.am | 5 +++-- calendar/gui/calendar-conduit-control-applet.c | 2 +- calendar/gui/calendar-conduit.h | 8 ++++++++ calendar/gui/todo-conduit-control-applet.c | 2 +- calendar/gui/todo-conduit-control-applet.desktop | 6 +++--- calendar/todo-conduit-control-applet.c | 2 +- calendar/todo-conduit-control-applet.desktop | 6 +++--- 14 files changed, 45 insertions(+), 19 deletions(-) diff --git a/calendar/Makefile.am b/calendar/Makefile.am index ed17a8aa6c..90aa6c628b 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -9,9 +9,10 @@ gnorba_DATA = gnomecal.gnorba help_base = $(datadir)/gnome/help/cal if HAVE_GNOME_PILOT -EXTRA_PROGRAMS = todo-conduit-control-applet calendar-conduit-control-applet -endif +bin_PROGRAMS = gnomecal todo-conduit-control-applet calendar-conduit-control-applet +else bin_PROGRAMS = gnomecal +endif INCLUDES = \ -I$(includedir) \ diff --git a/calendar/calendar-conduit-control-applet.c b/calendar/calendar-conduit-control-applet.c index f8e234ac13..44ca3d7898 100644 --- a/calendar/calendar-conduit-control-applet.c +++ b/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/calendar-conduit.h b/calendar/calendar-conduit.h index c34457acc5..86b38cc802 100644 --- a/calendar/calendar-conduit.h +++ b/calendar/calendar-conduit.h @@ -9,6 +9,14 @@ #include #include +#include "GnomeCal.h" +#include "calobj.h" +#include "calendar.h" +#include "timeutil.h" + +#include +#include + #define CALLOCALRECORD(s) ((CalLocalRecord*)(s)) typedef struct _CalLocalRecord CalLocalRecord; 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 #include +#include "GnomeCal.h" +#include "calobj.h" +#include "calendar.h" +#include "timeutil.h" + +#include +#include + #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 diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index ed17a8aa6c..90aa6c628b 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -9,9 +9,10 @@ gnorba_DATA = gnomecal.gnorba help_base = $(datadir)/gnome/help/cal if HAVE_GNOME_PILOT -EXTRA_PROGRAMS = todo-conduit-control-applet calendar-conduit-control-applet -endif +bin_PROGRAMS = gnomecal todo-conduit-control-applet calendar-conduit-control-applet +else bin_PROGRAMS = gnomecal +endif INCLUDES = \ -I$(includedir) \ diff --git a/calendar/gui/calendar-conduit-control-applet.c b/calendar/gui/calendar-conduit-control-applet.c index f8e234ac13..44ca3d7898 100644 --- a/calendar/gui/calendar-conduit-control-applet.c +++ b/calendar/gui/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/gui/calendar-conduit.h b/calendar/gui/calendar-conduit.h index c34457acc5..86b38cc802 100644 --- a/calendar/gui/calendar-conduit.h +++ b/calendar/gui/calendar-conduit.h @@ -9,6 +9,14 @@ #include #include +#include "GnomeCal.h" +#include "calobj.h" +#include "calendar.h" +#include "timeutil.h" + +#include +#include + #define CALLOCALRECORD(s) ((CalLocalRecord*)(s)) typedef struct _CalLocalRecord CalLocalRecord; diff --git a/calendar/gui/todo-conduit-control-applet.c b/calendar/gui/todo-conduit-control-applet.c index def35ca376..06f068b787 100644 --- a/calendar/gui/todo-conduit-control-applet.c +++ b/calendar/gui/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/gui/todo-conduit-control-applet.desktop b/calendar/gui/todo-conduit-control-applet.desktop index 869bba1476..87788bde08 100644 --- a/calendar/gui/todo-conduit-control-applet.desktop +++ b/calendar/gui/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 diff --git a/calendar/todo-conduit-control-applet.c b/calendar/todo-conduit-control-applet.c index def35ca376..06f068b787 100644 --- a/calendar/todo-conduit-control-applet.c +++ b/calendar/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/todo-conduit-control-applet.desktop b/calendar/todo-conduit-control-applet.desktop index 869bba1476..87788bde08 100644 --- a/calendar/todo-conduit-control-applet.desktop +++ b/calendar/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 -- cgit v1.2.3