diff options
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/calendar-conduit-control-applet.c | 4 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit-control-applet.c | 4 | ||||
| -rw-r--r-- | calendar/gui/calendar-conduit-control-applet.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 53ce67a947..5c3ceb9448 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2000-01-08 Vadim Strizhevsky <vadim@optonline.net> + + * calendar-conduit-control-applet.c: Added pilotID argument to + gpilotd_conduit_mgmt_new. + + 2000-01-05 Eskil Heyn Olsen <deity@eskil.dk> * GnomeCal.idl: Added an argument to get_number_of_objects, so you diff --git a/calendar/calendar-conduit-control-applet.c b/calendar/calendar-conduit-control-applet.c index ae4bda428f..2d6fb60ef5 100644 --- a/calendar/calendar-conduit-control-applet.c +++ b/calendar/calendar-conduit-control-applet.c @@ -326,9 +326,6 @@ main( int argc, char *argv[] ) NULL, 0, NULL); - /* put all code to set things up in here */ - conduit = gpilotd_conduit_mgmt_new("calendar_conduit"); - /* get pilot name from gpilotd */ /* 1. initialize the gpilotd connection */ if (gpilotd_init(&argc,argv)!=0) { @@ -348,6 +345,7 @@ main( int argc, char *argv[] ) if(!pilotId) return -1; /* put all code to set things up in here */ + conduit = gpilotd_conduit_mgmt_new("calendar_conduit",pilotId); gcalconduit_load_configuration(&origState,pilotId); gpilotd_conduit_mgmt_get_sync_type(conduit,pilotId,&origState->sync_type); diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.c b/calendar/conduits/calendar/calendar-conduit-control-applet.c index ae4bda428f..2d6fb60ef5 100644 --- a/calendar/conduits/calendar/calendar-conduit-control-applet.c +++ b/calendar/conduits/calendar/calendar-conduit-control-applet.c @@ -326,9 +326,6 @@ main( int argc, char *argv[] ) NULL, 0, NULL); - /* put all code to set things up in here */ - conduit = gpilotd_conduit_mgmt_new("calendar_conduit"); - /* get pilot name from gpilotd */ /* 1. initialize the gpilotd connection */ if (gpilotd_init(&argc,argv)!=0) { @@ -348,6 +345,7 @@ main( int argc, char *argv[] ) if(!pilotId) return -1; /* put all code to set things up in here */ + conduit = gpilotd_conduit_mgmt_new("calendar_conduit",pilotId); gcalconduit_load_configuration(&origState,pilotId); gpilotd_conduit_mgmt_get_sync_type(conduit,pilotId,&origState->sync_type); diff --git a/calendar/gui/calendar-conduit-control-applet.c b/calendar/gui/calendar-conduit-control-applet.c index ae4bda428f..2d6fb60ef5 100644 --- a/calendar/gui/calendar-conduit-control-applet.c +++ b/calendar/gui/calendar-conduit-control-applet.c @@ -326,9 +326,6 @@ main( int argc, char *argv[] ) NULL, 0, NULL); - /* put all code to set things up in here */ - conduit = gpilotd_conduit_mgmt_new("calendar_conduit"); - /* get pilot name from gpilotd */ /* 1. initialize the gpilotd connection */ if (gpilotd_init(&argc,argv)!=0) { @@ -348,6 +345,7 @@ main( int argc, char *argv[] ) if(!pilotId) return -1; /* put all code to set things up in here */ + conduit = gpilotd_conduit_mgmt_new("calendar_conduit",pilotId); gcalconduit_load_configuration(&origState,pilotId); gpilotd_conduit_mgmt_get_sync_type(conduit,pilotId,&origState->sync_type); |