feat: use user dbus and user home path

Change-Id: I0e599542825ab277fdc16195d3277223993913c9
linuxdeepin · Nov 14, 2017 · b8e70e4 · b8e70e4
1 parent 70d8587
commit b8e70e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main.cpp b/src/main.cpp
@@ -30,6 +30,7 @@
 #include "mainwindow.h"
 
 #include <pwd.h>
+#include <unistd.h>
 
 DWIDGET_USE_NAMESPACE
 #else
@@ -110,6 +111,7 @@ int main(int argc, char *argv[])
 
         if (qEnvironmentVariableIsSet("PKEXEC_UID")) {
             quint32 pkexec_uid = qgetenv("PKEXEC_UID").toUInt();
+            setuid(pkexec_uid);
             const QDir user_home(getpwuid(pkexec_uid)->pw_dir);
 
             QFile pam_file(user_home.absoluteFilePath(".pam_environment"));
@@ -123,6 +125,7 @@ int main(int argc, char *argv[])
 
                         if (list.count() == 2) {
                             qputenv("QT_SCALE_FACTOR", list.last());
+                            break;
                         }
                     }
                 }

diff --git a/src/widgets/selectfilepage.cpp b/src/widgets/selectfilepage.cpp
@@ -38,6 +38,9 @@
 #include <QMimeDatabase>
 #include <QDebug>
 
+#include <pwd.h>
+#include <unistd.h>
+
 DWIDGET_USE_NAMESPACE
 
 class SelectFileWidget : public QWidget
@@ -114,7 +117,7 @@ SelectFileWidget::SelectFileWidget(Mode mode, QWidget *parent)
     layout->addStretch();
 
     connect(m_button, &DLinkButton::clicked, this, [this] {
-        QFileDialog dialog(this);
+        QFileDialog dialog(this, QString(), getpwuid(getuid())->pw_dir);
 
         dialog.setMimeTypeFilters(QStringList() << "application-x-deepinclone-dim");
         dialog.setNameFilters(QStringList() << tr("Deepin Image File") + "(*.dim)");