114 SyncDirectory *dir, |
114 SyncDirectory *dir, |
115 DavResource *res, |
115 DavResource *res, |
116 LocalResource *local, |
116 LocalResource *local, |
117 int *counter); |
117 int *counter); |
118 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); |
118 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); |
119 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter, UcxList **cols); |
119 int sync_delete_remote_resource(SyncDirectory *dir, DavSession *sn, LocalResource *res, int *counter, UcxList **cols); |
120 int sync_update_tags(SyncDirectory *dir, DavSession *sn, DavResource *res, LocalResource *local); |
120 int sync_update_tags(SyncDirectory *dir, DavSession *sn, DavResource *res, LocalResource *local); |
121 |
121 |
122 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); |
122 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); |
123 |
123 |
124 int cmd_resolve_conflicts(CmdArgs *args); |
124 int cmd_resolve_conflicts(CmdArgs *args); |