Fix rebase error

haiwen · Nov 28, 2024 · 8b8477e · 8b8477e
1 parent 0e58e5c
commit 8b8477e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/src/rpc/rpc-client.cpp b/src/rpc/rpc-client.cpp
@@ -629,9 +629,10 @@ bool SeafileRpcClient::addAccount(const Account& account)
     }
 
     searpc_client_call__int(seadrive_rpc_client_, "seafile_add_account", &error,
-                            5,
+                            6,
                             "string", toCStr(serverAddr),
                             "string", toCStr(account.username),
+                            "string", toCStr(account.accountInfo.name),
                             "string", toCStr(account.token),
                             "string", toCStr(account.displayName),
                             "int", account.isPro() ? 1 : 0);

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/search-dialog.cpp b/src/ui/search-dialog.cpp
@@ -519,6 +519,9 @@ void SearchItemsTableView::openDirectory(bool open_file)
 #endif
 #ifdef Q_OS_WIN32
     QString root = search_model_->account_.syncRoot;
+#endif
+#ifdef Q_OS_LINUX
+    QString root = gui->seadriveRoot();
 #endif
     if (root.isEmpty()) {
         qWarning() << "failed to get root path";
@@ -561,6 +564,9 @@ void SearchItemsTableView::onItemDoubleClick(const QModelIndex& index)
 #endif
 #ifdef Q_OS_WIN32
     QString root = search_model_->account_.syncRoot;
+#endif
+#ifdef Q_OS_LINUX
+    QString root = gui->seadriveRoot();
 #endif
     if (root.isEmpty()) {
         qWarning() << "failed to get root path";

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
@@ -709,10 +709,12 @@ void SeafileTrayIcon::deleteAccount()
     }
 #endif
 
+#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());
@@ -739,11 +741,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());