From 13525d7b0451f0a9ca7b73e83e2f374fbfb7c1bc Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 22 Oct 2017 23:07:30 +0000
Subject: Fork from Ubuntu's indicator-sound.

---
 src/gmenuharness/CMakeLists.txt      | 1 -
 src/gmenuharness/MatchResult.cpp     | 2 +-
 src/gmenuharness/MatchUtils.cpp      | 4 ++--
 src/gmenuharness/MenuItemMatcher.cpp | 6 +++---
 src/gmenuharness/MenuMatcher.cpp     | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/gmenuharness')

diff --git a/src/gmenuharness/CMakeLists.txt b/src/gmenuharness/CMakeLists.txt
index ca9d4dc..761949b 100644
--- a/src/gmenuharness/CMakeLists.txt
+++ b/src/gmenuharness/CMakeLists.txt
@@ -1,4 +1,3 @@
-pkg_check_modules(UNITY_API libunity-api>=0.1.3 REQUIRED)
 include_directories(${UNITY_API_INCLUDE_DIRS})
 
 include_directories("${CMAKE_SOURCE_DIR}/include")
diff --git a/src/gmenuharness/MatchResult.cpp b/src/gmenuharness/MatchResult.cpp
index 40629aa..158e1fd 100644
--- a/src/gmenuharness/MatchResult.cpp
+++ b/src/gmenuharness/MatchResult.cpp
@@ -16,7 +16,7 @@
  * Authored by: Pete Woods <pete.woods@canonical.com>
  */
 
-#include <unity/gmenuharness/MatchResult.h>
+#include <desktop/gmenuharness/MatchResult.h>
 
 #include <chrono>
 #include <map>
diff --git a/src/gmenuharness/MatchUtils.cpp b/src/gmenuharness/MatchUtils.cpp
index 7b87a25..1eeaf52 100644
--- a/src/gmenuharness/MatchUtils.cpp
+++ b/src/gmenuharness/MatchUtils.cpp
@@ -16,9 +16,9 @@
  * Authored by: Pete Woods <pete.woods@canonical.com>
  */
 
-#include <unity/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MatchUtils.h>
 
-#include <unity/util/ResourcePtr.h>
+#include <desktop/util/ResourcePtr.h>
 
 using namespace std;
 namespace util = unity::util;
diff --git a/src/gmenuharness/MenuItemMatcher.cpp b/src/gmenuharness/MenuItemMatcher.cpp
index f39acef..4e9f98e 100644
--- a/src/gmenuharness/MenuItemMatcher.cpp
+++ b/src/gmenuharness/MenuItemMatcher.cpp
@@ -16,9 +16,9 @@
  * Authored by: Pete Woods <pete.woods@canonical.com>
  */
 
-#include <unity/gmenuharness/MatchResult.h>
-#include <unity/gmenuharness/MatchUtils.h>
-#include <unity/gmenuharness/MenuItemMatcher.h>
+#include <desktop/gmenuharness/MatchResult.h>
+#include <desktop/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MenuItemMatcher.h>
 
 #include <iostream>
 #include <vector>
diff --git a/src/gmenuharness/MenuMatcher.cpp b/src/gmenuharness/MenuMatcher.cpp
index 5bb4fbd..7b32068 100644
--- a/src/gmenuharness/MenuMatcher.cpp
+++ b/src/gmenuharness/MenuMatcher.cpp
@@ -16,8 +16,8 @@
  * Authored by: Pete Woods <pete.woods@canonical.com>
  */
 
-#include <unity/gmenuharness/MenuMatcher.h>
-#include <unity/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MenuMatcher.h>
+#include <desktop/gmenuharness/MatchUtils.h>
 
 #include <iostream>
 
-- 
cgit v1.2.3