Fix rebase error

haiwen · Aug 12, 2024 · db13b64 · db13b64
1 parent 1af9897
commit db13b64
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/seadrive-gui.cpp b/src/seadrive-gui.cpp
@@ -555,7 +555,7 @@ void SeadriveGui::onDaemonStarted()
         message_pollers_.insert(EMPTY_DOMAIN_ID, message_poller);
     }
 #if defined(Q_OS_WIN32) || defined(Q_OS_LINUX)
-    rpc_client_->connectDaemon();
+    rpc_client->connectDaemon();
 #endif
 
     auto accounts = account_mgr_->activeAccounts();

diff --git a/src/ui/transfer-progress-dialog.cpp b/src/ui/transfer-progress-dialog.cpp
@@ -189,7 +189,7 @@ TransferItemsTableModel::TransferItemsTableModel(QObject* parent)
 
 }
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_LINUX)
 void TransferItemsTableModel::setTransferItems()
 {
     TransferProgress transfer_progress;

diff --git a/src/ui/tray-icon.cpp b/src/ui/tray-icon.cpp
@@ -669,10 +669,12 @@ void SeafileTrayIcon::deleteAccount()
 
     SeafileRpcClient *rpc_client = gui->rpcClient(account.domainID());
 
+#ifndef Q_OS_LINUX
     if (rpc_client && rpc_client->isAccountUploading(account)) {
         gui->warningBox(tr("There are changes being uploaded under the account, please try again later"));
         return;
     }
+#endif
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_LINUX)
     QString question = tr("Are you sure to remove account from \"%1\"?").arg(account.serverUrl.toString());
@@ -699,11 +701,13 @@ void SeafileTrayIcon::resyncAccount()
         return;
     }
 
+#ifndef Q_OS_LINUX
     bool is_uploading = rpc_client->isAccountUploading (account);
     if (is_uploading) {
         gui->warningBox (tr("There are changes being uploaded under the account, please try again later"));
         return;
     }
+#endif
 
     QString question = tr("The account will be synced to a new sync root folder. Are you sure to resync account from \"%1\"?").arg(account.serverUrl.toString());