From fc9eb9430d6d96d0427e52b7230440731a44c42c Mon Sep 17 00:00:00 2001
From: Konstantin <ria.freelander@gmail.com>
Date: Wed, 17 May 2017 21:35:51 +0300
Subject: [PATCH] All: Fixes for new build method.

---
 CMakeLists.txt              | 18 ++++++++++--------
 data/sntray-mate.service.in |  2 +-
 src/CMakeLists.txt          |  4 ++--
 src/dbusmenu                |  2 +-
 src/snconfig.vala           |  1 +
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 191868d..7c90e66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,14 +15,16 @@ determine_fallback_version(${CMAKE_SOURCE_DIR}/cmake/vala)
 include(FallbackVersion)
 
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-add_definitions(-Wall -Wno-unused # Vala loves to create variables
-#		-pedantic
-		-Wno-ignored-qualifiers
-		-Wno-incompatible-pointer-types
-		-Wno-missing-field-initializers
-		-Wno-discarded-qualifiers
-		-Wno-sign-compare
-		-Wextra) #Vala often forgot cast to GtkWidget or gpointer
+add_definitions(-Wall -Wextra
+                -Wno-unused
+                -Wno-unused-parameter# Vala loves to create variables
+#				-pedantic
+                -Wno-ignored-qualifiers
+                -Wno-incompatible-pointer-types
+                -Wno-missing-field-initializers
+                -Wno-discarded-qualifiers
+                -Wno-sign-compare
+                ) #Vala often forgot cast to GtkWidget or gpointer
 pkg_check_modules(GTK+ REQUIRED gtk+-3.0>=3.22)
 
 option(ENABLE_XFCE "Enable xfce4-panel plugin" ON)
diff --git a/data/sntray-mate.service.in b/data/sntray-mate.service.in
index c607ac6..1f29303 100644
--- a/data/sntray-mate.service.in
+++ b/data/sntray-mate.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.SNTrayAppletFactory
-Exec=@CMAKE_INSTALL_FULL_LIBDIR@/mate-panel/sntray-mate
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/mate-panel/sntray-mate
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 991fe28..3163375 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,8 +36,8 @@ set(VALA_FILES_CORE
         source
             sntray.gresource.xml
     )
-add_library(sntray-core STATIC ${VALA_C_CORE})
-target_link_libraries (sntray-core ${CORE_LIBRARIES} m vala-dbusmenu)
+add_library(sntray-core STATIC ${VALA_C_CORE} $<TARGET_OBJECTS:vala-dbusmenu-o>)
+target_link_libraries (sntray-core ${CORE_LIBRARIES} m)
 add_custom_target(sntray-core-ide SOURCES ${VALA_FILES_DBUSMENU} ${VALA_FILES_CORE})
 #################
 # Xfce Panel part
diff --git a/src/dbusmenu b/src/dbusmenu
index 1323a72..cce1dda 160000
--- a/src/dbusmenu
+++ b/src/dbusmenu
@@ -1 +1 @@
-Subproject commit 1323a72e94104c4d71dcb01dd9a0f0a9d52b0414
+Subproject commit cce1dda93933ed291a8ce52db8a08eefef42308b
diff --git a/src/snconfig.vala b/src/snconfig.vala
index 4c770a5..b23d7ab 100644
--- a/src/snconfig.vala
+++ b/src/snconfig.vala
@@ -61,6 +61,7 @@ namespace StatusNotifier
             widget.configure_icon_size = configure_icon_size;
             var dlg = new Dialog();
             dlg.set_title(_("StatusNotifier Configuration"));
+            widget.show();
             dlg.get_content_area().add(widget);
             return dlg;
         }