for the Seafile cloud storage system.
| local-repo.cpp (seafile-client-9.0.1) | : | local-repo.cpp (seafile-client-9.0.2) |
|---|
| | |
| skipping to change at line 57 | | skipping to change at line 57 |
|---|
| | |
| g_free (id); | | g_free (id); |
| g_free (name); | | g_free (name); |
| g_free (desc); | | g_free (desc); |
| g_free (worktree); | | g_free (worktree); |
| g_free (relay_id); | | g_free (relay_id); |
| | |
| return repo; | | return repo; |
| } | | } |
| | |
|
| void LocalRepo::setSyncInfo(const QString &state, const int error) | | void LocalRepo::setSyncInfo(const QString &state) |
| { | | { |
|
| // qWarning("error: %s\n", toCStr(error)); | | translateSyncState(state); |
| // qWarning("state: %s\n", toCStr(state)); | | |
| if (error != SYNC_ERROR_ID_NO_ERROR) { | | |
| translateSyncError(error); | | |
| } else { | | |
| translateSyncState(state); | | |
| } | | |
| } | | } |
| | |
| void LocalRepo::translateSyncState(const QString &status) | | void LocalRepo::translateSyncState(const QString &status) |
| { | | { |
| if (status == "synchronized") { | | if (status == "synchronized") { |
| sync_state_str = QObject::tr("synchronized"); | | sync_state_str = QObject::tr("synchronized"); |
| sync_state = SYNC_STATE_DONE; | | sync_state = SYNC_STATE_DONE; |
| | |
| } else if (status == "committing") { | | } else if (status == "committing") { |
| sync_state_str = QObject::tr("indexing files"); | | sync_state_str = QObject::tr("indexing files"); |
| | |
| skipping to change at line 131 | | skipping to change at line 125 |
|---|
| sync_state = SYNC_STATE_UNKNOWN; | | sync_state = SYNC_STATE_UNKNOWN; |
| } | | } |
| | |
| if (!auto_sync && sync_state != SYNC_STATE_ING) { | | if (!auto_sync && sync_state != SYNC_STATE_ING) { |
| sync_state_str = QObject::tr("auto sync is turned off"); | | sync_state_str = QObject::tr("auto sync is turned off"); |
| sync_state = SYNC_STATE_DISABLED; | | sync_state = SYNC_STATE_DISABLED; |
| return; | | return; |
| } | | } |
| } | | } |
| | |
|
| void LocalRepo::translateSyncError(const int error) | | |
| { | | |
| sync_state = SYNC_STATE_ERROR; | | |
| sync_error_str = translateSyncErrorCode(error); | | |
| } | | |
| | | |
| QString LocalRepo::getErrorString() const | | QString LocalRepo::getErrorString() const |
| { | | { |
|
| return sync_error_str; | | return sync_error_str; |
| } | | } |
| | | |
| End of changes. 4 change blocks. |
|---|
| 15 lines changed or deleted | | 3 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 