72 LocalResource *local, |
72 LocalResource *local, |
73 int *counter); |
73 int *counter); |
74 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); |
74 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); |
75 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter); |
75 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter); |
76 |
76 |
|
77 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); |
77 |
78 |
78 int cmd_resolve_conflicts(CmdArgs *args); |
79 int cmd_resolve_conflicts(CmdArgs *args); |
79 int cmd_delete_conflicts(CmdArgs *args); |
80 int cmd_delete_conflicts(CmdArgs *args); |
80 |
81 |
81 int cmd_trash_info(CmdArgs *args); |
82 int cmd_trash_info(CmdArgs *args); |