From 1c176ad5f4aadbc9b217722eaf1a36b3dac6df67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 18 Sep 2017 15:21:47 +0100
Subject: [PATCH] Workaround for different swap naming conventions.

---
 src/gui/editmountpointdialogwidget.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gui/editmountpointdialogwidget.cpp b/src/gui/editmountpointdialogwidget.cpp
index 856be6c..48dd4b9 100644
--- a/src/gui/editmountpointdialogwidget.cpp
+++ b/src/gui/editmountpointdialogwidget.cpp
@@ -26,7 +26,6 @@
 
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <KMountPoint>
 
 #include <QDebug>
 #include <QFile>
@@ -34,8 +33,6 @@
 #include <QPointer>
 #include <QString>
 
-#include <blkid/blkid.h>
-
 EditMountPointDialogWidget::EditMountPointDialogWidget(QWidget* parent, const Partition& p) :
     QWidget(parent),
     m_Partition(p)
@@ -60,9 +57,11 @@ EditMountPointDialogWidget::EditMountPointDialogWidget(QWidget* parent, const Pa
         }
     }
 
-    // FIXME name() != fstabfsname (swap)
     if (!entryFound) {
-        entry = new FstabEntry(m_deviceNode, QString(), partition().fileSystem().name(), QString());
+        QString fsName = partition().fileSystem().name();
+        if (fsName == FileSystem::nameForType(FileSystem::LinuxSwap))
+            fsName = QStringLiteral("swap");
+        entry = new FstabEntry(m_deviceNode, QString(), fsName, QString());
         m_fstabEntries.append(*entry);
     }