File adjust_kwin_name.diff of Package kwin5

Overview Repositories Revisions Requests Users Attributes Meta

File adjust_kwin_name.diff of Package kwin5 (Revision 3b84a148205730761bb15420a4bb6680)

Currently displaying revision 3b84a148205730761bb15420a4bb6680 , Show latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a46ba40..039adf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,6 +181,8 @@ endif()
 
 # Binary name of KWin
 set(KWIN_NAME "kwin")
+set(KWIN_INTERNAL_NAME_X11 "kwin_x11")
+set(KWIN_INTERNAL_NAME_WAYLAND "kwin_wayland")
 set(KWIN_VERSION_MAJOR 4)
 set(KWIN_VERSION_MINOR 97)
 set(KWIN_VERSION_PATCH 0)
@@ -510,7 +512,7 @@ endif()
 kf5_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
 
 target_link_libraries(kdeinit_kwin ${kwinLibs})
-set_target_properties(kwin PROPERTIES OUTPUT_NAME ${KWIN_NAME})
+set_target_properties(kwin PROPERTIES OUTPUT_NAME ${KWIN_INTERNAL_NAME_X11})
 generate_export_header(kdeinit_kwin EXPORT_FILE_NAME kwin_export.h)
 
 if(KWIN_BUILD_OPENGL)
diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake
index d9bf15e..0457353 100644
--- a/config-kwin.h.cmake
+++ b/config-kwin.h.cmake
@@ -5,6 +5,7 @@
 #cmakedefine KWIN_BUILD_KAPPMENU 1
 #cmakedefine KWIN_BUILD_ACTIVITIES 1
 #define KWIN_NAME "${KWIN_NAME}"
+#define KWIN_INTERNAL_NAME_X11 "${KWIN_INTERNAL_NAME_X11}"
 #define KWIN_CONFIG "${KWIN_NAME}rc"
 #define KWIN_VERSION_STRING "${KWIN_VERSION}"
 #define KWIN_KILLER_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kwin_killer_helper"
diff --git a/main.cpp b/main.cpp
index c22ad0d..66a0cb5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -153,7 +153,7 @@ public:
         addWM(QStringLiteral("metacity"));
         addWM(QStringLiteral("openbox"));
         addWM(QStringLiteral("fvwm2"));
-        addWM(QStringLiteral(KWIN_NAME));
+        addWM(QStringLiteral(KWIN_INTERNAL_NAME_X11));
 
         QVBoxLayout *mainLayout = new QVBoxLayout(this);
         mainLayout->addWidget(mainWidget);
@@ -303,7 +303,7 @@ void Application::crashChecking()
     if (crashes >= 4) {
         // Something has gone seriously wrong
         AlternativeWMDialog dialog;
-        QString cmd = QStringLiteral(KWIN_NAME);
+        QString cmd = QStringLiteral(KWIN_INTERNAL_NAME_X11);
         if (dialog.exec() == QDialog::Accepted)
             cmd = dialog.selectedWM();
         else

Places

File adjust_kwin_name.diff of Package kwin5 (Revision 3b84a148205730761bb15420a4bb6680)

Places