From 485ca612d89dd090f8a004bce7c45bed064b6bb1 Mon Sep 17 00:00:00 2001
From: Falk Elvedal Bruskeland <66320400+falbru@users.noreply.github.com>
Date: Thu, 16 May 2024 20:08:53 +0200
Subject: [PATCH] Fix compilation error on Ubuntu (#31)

In addition:
- Fix passing arguments to newClient
- Remove unused macro for DBUS_SERVICE_NAME
---
 src/kakounecli.cpp     | 2 +-
 src/kakouneclient.cpp  | 2 +-
 src/kakounesession.cpp | 8 ++++----
 src/main.cpp           | 2 --
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/kakounecli.cpp b/src/kakounecli.cpp
index d8b981d..d660ba9 100644
--- a/src/kakounecli.cpp
+++ b/src/kakounecli.cpp
@@ -32,7 +32,7 @@ int KakouneCli::run(QStringList command)
         }
         else
         {
-            QString request = QString("{\"method\":\"newClient\",\"args\":\"%1\"}").arg(command[1]);
+            QString request = QString("{\"method\":\"newClient\",\"args\":\"%1\"}").arg(command.mid(1).join(" "));
             m_socket->write(request.toLocal8Bit());
             m_socket->flush();
         }
diff --git a/src/kakouneclient.cpp b/src/kakouneclient.cpp
index 290e7a7..5d3fbc4 100644
--- a/src/kakouneclient.cpp
+++ b/src/kakouneclient.cpp
@@ -94,7 +94,7 @@ KakouneClient::KakouneClient(const QString &session_id, QString arguments,
     });
 
     connect(&m_process, &QProcess::readyReadStandardError,
-            [=]() { qFatal() << "KakouneClient: " << m_process.readAllStandardError(); });
+            [=]() { qCritical() << "KakouneClient: " << m_process.readAllStandardError(); });
 
     connect(&m_process, &QProcess::finished, this, &KakouneClient::finished);
 
diff --git a/src/kakounesession.cpp b/src/kakounesession.cpp
index 2611250..3940fe3 100644
--- a/src/kakounesession.cpp
+++ b/src/kakounesession.cpp
@@ -18,7 +18,7 @@ void createFifo(const QString &path)
 {
     if (mkfifo(path.toStdString().c_str(), 0666) == -1)
     {
-        qFatal("Failed to create fifo");
+        qCritical("Failed to create fifo");
     }
 }
 
@@ -27,7 +27,7 @@ void waitForFifo(const QString &path)
     int fd = open(path.toStdString().c_str(), O_RDONLY);
     if (fd == -1)
     {
-        qFatal("Failed to read from fifo");
+        qCritical("Failed to read from fifo");
     }
 
     char buffer[16];
@@ -42,7 +42,7 @@ void deleteFifo(const QString &path)
 {
     if (unlink(path.toStdString().c_str()) == -1)
     {
-        qFatal("Failed to remove fifo");
+        qCritical("Failed to remove fifo");
     }
 }
 
@@ -51,7 +51,7 @@ KakouneSession::KakouneSession(QString session_id)
     m_session_id = session_id;
 
     connect(&m_process, &QProcess::readyReadStandardError,
-            [=]() { qFatal() << "KakouneSession: " << m_process.readAllStandardError(); });
+            [=]() { qCritical() << "KakouneSession: " << m_process.readAllStandardError(); });
 
     QString session_ready_path = "/tmp/" + session_id;
 
diff --git a/src/main.cpp b/src/main.cpp
index 34e29f5..8a76b36 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,8 +3,6 @@
 #include "mainwindow.hpp"
 #include <QApplication>
 
-#define DBUS_SERVICE_NAME "com.github.falbru.KakouneQt"
-
 QString generateRandomKakouneSessionId()
 {
     return QString::number(QRandomGenerator::global()->bounded(1000, 9999));