callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove the merges as valid sync types

Browse Source 
2001-10-26  JP Rosevear  <jpr@ximian.com>

	* conduits/calendar/e-calendar.conduit.in: remove the merges as valid sync
	types

	* conduits/todo/e-todo.conduit.in: as above

	* conduits/calendar/calendar-conduit.c (pre_sync): write out only the
	touched records if we are doing copies

	* conduits/todo/todo-conduit.c: as above

	* conduits/calendar/calendar-conduit-config.h
	(calconduit_load_configuration): get the sync type

	* conduits/todo/todo-conduit-config.h: as above

svn path=/trunk/; revision=14198
This commit is contained in:
JP Rosevear
2001-10-27 03:51:03 +00:00
committed by JP Rosevear
parent 8f983e58b6
commit 3ba5381842
7 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/ChangeLog
View File

@ -1,3 +1,20 @@
2001-10-26 JP Rosevear <jpr@ximian.com>
* conduits/calendar/e-calendar.conduit.in: remove the merges as valid sync
types
* conduits/todo/e-todo.conduit.in: as above
* conduits/calendar/calendar-conduit.c (pre_sync): write out only the
touched records if we are doing copies
* conduits/todo/todo-conduit.c: as above
* conduits/calendar/calendar-conduit-config.h
(calconduit_load_configuration): get the sync type
* conduits/todo/todo-conduit-config.h: as above
2001-10-26 Damon Chaplin <damon@ximian.com>
* gui/e-itip-control.c (write_label_piece): convert the formatted

17
calendar/conduits/calendar/calendar-conduit-config.h
View File

@ -42,6 +42,8 @@ struct _ECalConduitCfg {
static void
calconduit_load_configuration (ECalConduitCfg **c, guint32 pilot_id)
{
GnomePilotConduitManagement *management;
GnomePilotConduitConfig *config;
gchar prefix[256];
g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/",
pilot_id);
@ -49,14 +51,21 @@ calconduit_load_configuration (ECalConduitCfg **c, guint32 pilot_id)
*c = g_new0 (ECalConduitCfg,1);
g_assert (*c != NULL);
(*c)->pilot_id = pilot_id;
management = gnome_pilot_conduit_management_new ("ECalendar", GNOME_PILOT_CONDUIT_MGMT_NAME);
config = gnome_pilot_conduit_config_new (management, pilot_id);
if (!gnome_pilot_conduit_config_is_enabled (config, &(*c)->sync_type))
(*c)->sync_type = GnomePilotConduitSyncTypeNotSet;
gtk_object_unref (GTK_OBJECT (config));
gtk_object_unref (GTK_OBJECT (management));
/* Custom settings */
gnome_config_push_prefix (prefix);
(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
/* set in capplets main */
(*c)->sync_type = GnomePilotConduitSyncTypeCustom;
gnome_config_pop_prefix ();
(*c)->pilot_id = pilot_id;
}
#endif

5
calendar/conduits/calendar/calendar-conduit.c
View File

@ -1057,7 +1057,10 @@ pre_sync (GnomePilotConduit *conduit,
g_free (buf);
check_for_slow_setting (conduit, ctxt);
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
|| ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
ctxt->map->write_touched_only = TRUE;
return 0;
}

2
calendar/conduits/calendar/e-calendar.conduit.in
View File

@ -3,7 +3,7 @@
<name value="ECalendar"/>
<conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
<conduit-attribute name="default-synctype" value="synchronize"/>
<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
<conduit-attribute name="settings" value="FALSE"/>
<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-calendar-conduit.png"/>
</gnome-pilot-conduit>

2
calendar/conduits/todo/e-todo.conduit.in
View File

@ -3,7 +3,7 @@
<name value="EToDo"/>
<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
<conduit-attribute name="default-synctype" value="synchronize"/>
<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
<conduit-attribute name="settings" value="FALSE"/>
<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-todo-conduit.png"/>
</gnome-pilot-conduit>

23
calendar/conduits/todo/todo-conduit-config.h
View File

@ -42,6 +42,8 @@ struct _EToDoConduitCfg {
static void
todoconduit_load_configuration (EToDoConduitCfg **c, guint32 pilot_id)
{
GnomePilotConduitManagement *management;
GnomePilotConduitConfig *config;
gchar prefix[256];
g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
pilot_id);
@ -49,14 +51,21 @@ todoconduit_load_configuration (EToDoConduitCfg **c, guint32 pilot_id)
*c = g_new0 (EToDoConduitCfg,1);
g_assert (*c != NULL);
(*c)->pilot_id = pilot_id;
management = gnome_pilot_conduit_management_new ("EToDo", GNOME_PILOT_CONDUIT_MGMT_NAME);
config = gnome_pilot_conduit_config_new (management, pilot_id);
if (!gnome_pilot_conduit_config_is_enabled (config, &(*c)->sync_type))
(*c)->sync_type = GnomePilotConduitSyncTypeNotSet;
gtk_object_unref (GTK_OBJECT (config));
gtk_object_unref (GTK_OBJECT (management));
/* Custom settings */
gnome_config_push_prefix (prefix);
(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
/* set in capplets main */
(*c)->sync_type = GnomePilotConduitSyncTypeCustom;
gnome_config_pop_prefix ();
(*c)->pilot_id = pilot_id;
}
#endif
@ -112,9 +121,3 @@ todoconduit_destroy_configuration (EToDoConduitCfg **c)
#endif /* __TODO_CONDUIT_CONFIG_H__ */

5
calendar/conduits/todo/todo-conduit.c
View File

@ -759,7 +759,10 @@ pre_sync (GnomePilotConduit *conduit,
g_free (buf);
check_for_slow_setting (conduit, ctxt);
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
|| ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
ctxt->map->write_touched_only = TRUE;
return 0;
}