diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-12-22 13:11:32 +0000 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-01-12 14:19:54 +0100 |
| commit | d0a386078f471633250a760cdcd1a21a63d0dd06 (patch) | |
| tree | 24ac3f4a5bdf4ce6a67be4bf45da6bf5cb576cd6 /src | |
| parent | 26073182645da0a7ba7214b331c725fab1506253 (diff) | |
| download | ayatana-indicator-sound-d0a386078f471633250a760cdcd1a21a63d0dd06.tar.gz ayatana-indicator-sound-d0a386078f471633250a760cdcd1a21a63d0dd06.tar.bz2 ayatana-indicator-sound-d0a386078f471633250a760cdcd1a21a63d0dd06.zip | |
Port from Unity8 to Lomiri (URL Dispatcher and API).
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gmenuharness/MatchResult.cpp | 6 | ||||
| -rw-r--r-- | src/gmenuharness/MatchUtils.cpp | 10 | ||||
| -rw-r--r-- | src/gmenuharness/MenuItemMatcher.cpp | 10 | ||||
| -rw-r--r-- | src/gmenuharness/MenuMatcher.cpp | 8 | ||||
| -rw-r--r-- | src/service.vala | 4 |
6 files changed, 20 insertions, 20 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2a06187..3630753 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi") if(URLDISPATCHER_FOUND) set (VALA_DEFINE_URLDISPATCHER "--define=HAS_URLDISPATCHER") - set (VALA_PKG_URLDISPATCHER "url-dispatcher") + set (VALA_PKG_URLDISPATCHER "lomiri-url-dispatcher") endif() if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml") diff --git a/src/gmenuharness/MatchResult.cpp b/src/gmenuharness/MatchResult.cpp index 40629aa..4543ce9 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 <lomiri/gmenuharness/MatchResult.h> #include <chrono> #include <map> @@ -25,7 +25,7 @@ using namespace std; -namespace unity +namespace lomiri { namespace gmenuharness @@ -184,4 +184,4 @@ string MatchResult::concat_failures() const } // namespace gmenuharness -} // namespace unity +} // namespace lomiri diff --git a/src/gmenuharness/MatchUtils.cpp b/src/gmenuharness/MatchUtils.cpp index c6b2ae3..89c7798 100644 --- a/src/gmenuharness/MatchUtils.cpp +++ b/src/gmenuharness/MatchUtils.cpp @@ -16,16 +16,16 @@ * Authored by: Pete Woods <pete.woods@canonical.com> */ -#include <unity/gmenuharness/MatchUtils.h> +#include <lomiri/gmenuharness/MatchUtils.h> #include <functional> -#include <unity/util/ResourcePtr.h> +#include <lomiri/util/ResourcePtr.h> using namespace std; -namespace util = unity::util; +namespace util = lomiri::util; -namespace unity +namespace lomiri { namespace gmenuharness @@ -76,4 +76,4 @@ void gvariant_deleter(GVariant* varptr) } // namespace gmenuharness -} // namespace unity +} // namespace lomiri diff --git a/src/gmenuharness/MenuItemMatcher.cpp b/src/gmenuharness/MenuItemMatcher.cpp index f2d5fe8..8048556 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 <lomiri/gmenuharness/MatchResult.h> +#include <lomiri/gmenuharness/MatchUtils.h> +#include <lomiri/gmenuharness/MenuItemMatcher.h> #include <iostream> #include <vector> @@ -26,7 +26,7 @@ using namespace std; -namespace unity +namespace lomiri { namespace gmenuharness @@ -1005,4 +1005,4 @@ void MenuItemMatcher::match( } // namepsace gmenuharness -} // namespace unity +} // namespace lomiri diff --git a/src/gmenuharness/MenuMatcher.cpp b/src/gmenuharness/MenuMatcher.cpp index 5bb4fbd..7fd257d 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 <lomiri/gmenuharness/MenuMatcher.h> +#include <lomiri/gmenuharness/MatchUtils.h> #include <iostream> @@ -25,7 +25,7 @@ using namespace std; -namespace unity +namespace lomiri { namespace gmenuharness @@ -205,4 +205,4 @@ MatchResult MenuMatcher::match() const } // namespace gmenuharness -} // namespace unity +} // namespace lomiri diff --git a/src/service.vala b/src/service.vala index 4c9579a..cf79666 100644 --- a/src/service.vala +++ b/src/service.vala @@ -259,7 +259,7 @@ public class IndicatorSound.Service: Object { #if HAS_URLDISPATCHER if (Environment.get_variable ("MIR_SOCKET") != null) { - UrlDispatch.send ("settings:///system/sound"); + LomiriURLDispatch.send ("settings:///system/sound"); return; } #endif @@ -282,7 +282,7 @@ public class IndicatorSound.Service: Object { #if HAS_URLDISPATCHER void activate_phone_settings (SimpleAction action, Variant? param) { - UrlDispatch.send ("settings:///system/sound"); + LomiriURLDispatch.send ("settings:///system/sound"); } #endif |