aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS3
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog57
-rw-r--r--NEWS15
-rw-r--r--data/ayatana-indicator-display.service.in4
-rw-r--r--debian/changelog14
-rw-r--r--src/dbus-names.h59
-rw-r--r--src/indicator.h2
-rw-r--r--src/service.cpp20
-rw-r--r--src/service.h2
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/utils/glib-fixture.h2
-rw-r--r--tests/utils/test-dbus-fixture.h2
13 files changed, 106 insertions, 78 deletions
diff --git a/AUTHORS b/AUTHORS
index e498575..4f0a727 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Heimen Stoffels <vistausss@fastmail.com>
Heimen Stoffels <vistausss@outlook.com>
Henrique Combochi <henrique.combochi@gmail.com>
Hosted Weblate <hosted@weblate.org>
+ID J <tabby4442@gmail.com>
iNetRoos <inetroos@gmail.com>
Ivo Xavier <ivofernandes12@gmail.com>
Jami Kettunen <jami.kettunen@protonmail.com>
@@ -49,6 +50,7 @@ Moo <hazap@hotmail.com>
M Ramani Priya <priya.maremanda@gmail.com>
MrJang <ijin1322@gmail.com>
Oğuz Ersen <oguz@ersen.moe>
+OPNA2608 <opna2608@protonmail.com>
Pavel Borecki <pavel.borecki@gmail.com>
Pete Woods <pete.woods@canonical.com>
Petter Reinholdtsen <pere-weblate@hungry.com>
@@ -89,3 +91,4 @@ Zeeshan Khan <zkhan1093@gmail.com>
Володимир Бриняк <bardvv@gmail.com>
Марс Ямбар <mjambarmeta@gmail.com>
Мира Странная <miraityan2004@gmail.com>
+复予 <clonewith@qq.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c80a7e3..e711b4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.13)
-project(ayatana-indicator-display VERSION 24.4.0 LANGUAGES C CXX)
+project(ayatana-indicator-display VERSION 24.5.0 LANGUAGES C CXX)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE)
diff --git a/ChangeLog b/ChangeLog
index 5ead7a1..78b032e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,61 @@
+2024-05-22 Mike Gabriel
+
+ * release 24.5.0 (HEAD -> main, tag: 24.5.0)
+
+2024-05-22 Robert Tari
+
+ * Merge branch 'sunweaver-pr/lomiri-indicators-target' (b982756f)
+
+2024-05-21 Mike Gabriel
+
+ * data/ayatana-indicator-display.service.in: Become part of
+ lomiri-indicators.target. (3699389a)
+
+2024-05-22 Mike Gabriel
+
+ * Merge branch 'OPNA2608-fix/recursive-schema-lookup' (ffec0d45)
+
+2024-05-20 OPNA2608
+
+ * src/service.cpp: Look up schemas recursively (50b2197c)
+
+2024-05-17 Mike Gabriel
+
+ * release 24.4.1 (4d95bad3) (tag: 24.4.1)
+
+2024-05-17 Robert Tari
+
+ * Merge branch 'sunweaver-pr/cppcheck-2.14' (4b25c3a1)
+
+2024-05-04 Mike Gabriel
+
+ * cppcheck: Run with --check-level=exhaustive. (bfb74193)
+ * cppcheck: Replace C-style casts by C++-style static_cast<> casts.
+ (9b3eb0bc)
+ * cppcheck: Suppress constParameterCallback. (8c4b2d9c)
+ * cppcheck: Fix missingOverride complaints. (f1dde7a9)
+
+2024-05-15 Robert Tari
+
+ * Merge branch
+ 'sunweaver-pr/xsct-brightness-slider-blackscreen-with-de-locale'
+ (9a605aa2)
+
+2024-05-14 Mike Gabriel
+
+ * src/main.cpp: Initialize LC_NUMERIC with 'POSIX'. (89ca869f)
+
+2024-04-18 复予
+
+ * Translated using Weblate (Chinese (Simplified)) (cd7ad7e2)
+
+2024-04-13 ID J
+
+ * Translated using Weblate (Korean) (79894112)
+
2024-04-08 Mike Gabriel
- * release 24.4.0 (HEAD -> main, tag: 24.4.0)
+ * release 24.4.0 (fb208451) (tag: 24.4.0)
* Merge branch 'tari01-pr/slider-step' (3ec03467)
2024-04-05 Robert Tari
diff --git a/NEWS b/NEWS
index 23fa834..5a7a8be 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Overview of changes in ayatana-indicator-display 24.5.0
+
+ - src/service.cpp: Look up schemas recursively
+ - data/ayatana-indicator-display.service.in: Become part of
+ lomiri-indicators.target.
+
+Overview of changes in ayatana-indicator-display 24.4.1
+
+ - src/main.cpp: Initialize LC_NUMERIC with 'POSIX'.
+ - cppcheck: Fix missingOverride complaints.
+ - cppcheck: Suppress constParameterCallback.
+ - cppcheck: Replace C-style casts by C++-style static_cast<> casts.
+ - cppcheck: Run with --check-level=exhaustive.
+ - Translation updates.
+
Overview of changes in ayatana-indicator-display 24.4.0
- Fix access of unitialized variables in DisplayIndicator destructor.
diff --git a/data/ayatana-indicator-display.service.in b/data/ayatana-indicator-display.service.in
index 4ae5d2b..85070f2 100644
--- a/data/ayatana-indicator-display.service.in
+++ b/data/ayatana-indicator-display.service.in
@@ -1,11 +1,11 @@
[Unit]
Description=Ayatana Indicator Display Backend
PartOf=graphical-session.target
-PartOf=ayatana-indicators.target
+PartOf=ayatana-indicators.target lomiri-indicators.target
[Service]
ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-display/ayatana-indicator-display-service
Restart=on-failure
[Install]
-WantedBy=ayatana-indicators.target
+WantedBy=ayatana-indicators.target lomiri-indicators.target
diff --git a/debian/changelog b/debian/changelog
index c485017..2aba540 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ayatana-indicator-display (24.5.0-0) unstable; urgency=medium
+
+ * Upstream-provided Debian package for ayatana-indicator-display.
+ See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 May 2024 08:49:48 +0200
+
+ayatana-indicator-display (24.4.1-0) unstable; urgency=medium
+
+ * Upstream-provided Debian package for ayatana-indicator-display.
+ See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 17 May 2024 18:51:07 +0200
+
ayatana-indicator-display (24.4.0-0) unstable; urgency=medium
* Upstream-provided Debian package for ayatana-indicator-display.
diff --git a/src/dbus-names.h b/src/dbus-names.h
deleted file mode 100644
index aa7ef2a..0000000
--- a/src/dbus-names.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Charles Kerr <charles.kerr@canonical.com>
- */
-
-#pragma once
-
-namespace DBusNames
-{
- namespace Notify
- {
- static constexpr char const * NAME = "org.freedesktop.Notifications";
- static constexpr char const * PATH = "/org/freedesktop/Notifications";
- static constexpr char const * INTERFACE = "org.freedesktop.Notifications";
-
- namespace ActionInvoked
- {
- static constexpr char const * NAME = "ActionInvoked";
- }
-
- namespace NotificationClosed
- {
- static constexpr char const * NAME = "NotificationClosed";
- enum Reason { EXPIRED=1, DISMISSED=2, API=3, UNDEFINED=4 };
- }
- }
-
- namespace Greeter
- {
- static constexpr char const * NAME = "org.ayatana.Greeter";
- static constexpr char const * PATH = "/";
- static constexpr char const * INTERFACE = "org.ayatana.Greeter";
- }
-
- namespace Properties
- {
- static constexpr char const * INTERFACE = "org.freedesktop.DBus.Properties";
-
- namespace PropertiesChanged
- {
- static constexpr char const* NAME = "PropertiesChanged";
- static constexpr char const* ARGS_VARIANT_TYPE = "(sa{sv}as)";
- }
- }
-}
diff --git a/src/indicator.h b/src/indicator.h
index c9ccb1e..db8c5ac 100644
--- a/src/indicator.h
+++ b/src/indicator.h
@@ -65,7 +65,7 @@ class SimpleProfile: public Profile
{
public:
SimpleProfile(const char* name, const std::shared_ptr<GMenuModel>& menu): m_name(name), m_menu(menu) {}
- virtual ~SimpleProfile();
+ virtual ~SimpleProfile() override;
std::string name() const override {return m_name;}
core::Property<Header>& header() override {return m_header;}
diff --git a/src/service.cpp b/src/service.cpp
index 26faec9..e734437 100644
--- a/src/service.cpp
+++ b/src/service.cpp
@@ -76,7 +76,7 @@ public:
{
if (ayatana_common_utils_is_lomiri()) {
- GSettingsSchema *pSchema = g_settings_schema_source_lookup(pSource, "com.lomiri.touch.system", FALSE);
+ GSettingsSchema *pSchema = g_settings_schema_source_lookup(pSource, "com.lomiri.touch.system", TRUE);
if (pSchema != NULL)
{
@@ -91,7 +91,7 @@ public:
}
else {
- GSettingsSchema *pSchema = g_settings_schema_source_lookup(pSource, "org.ayatana.indicator.display", FALSE);
+ GSettingsSchema *pSchema = g_settings_schema_source_lookup(pSource, "org.ayatana.indicator.display", TRUE);
if (pSchema != NULL)
{
@@ -134,7 +134,7 @@ public:
}
}
- pSchema = g_settings_schema_source_lookup (pSource, sSchema, FALSE);
+ pSchema = g_settings_schema_source_lookup (pSource, sSchema, TRUE);
if (pSchema != NULL)
{
@@ -146,7 +146,7 @@ public:
g_error("No %s schema could be found", sSchema);
}
- pSchema = g_settings_schema_source_lookup (pSource, sCursorSchema, FALSE);
+ pSchema = g_settings_schema_source_lookup (pSource, sCursorSchema, TRUE);
if (pSchema != NULL)
{
@@ -158,7 +158,7 @@ public:
g_error("No %s schema could be found", sCursorSchema);
}
- pSchema = g_settings_schema_source_lookup (pSource, sMetacitySchema, FALSE);
+ pSchema = g_settings_schema_source_lookup (pSource, sMetacitySchema, TRUE);
if (pSchema != NULL)
{
@@ -179,7 +179,7 @@ public:
sSchema = "org.gnome.desktop.interface";
}
- pSchema = g_settings_schema_source_lookup (pSource, sSchema, FALSE);
+ pSchema = g_settings_schema_source_lookup (pSource, sSchema, TRUE);
if (pSchema != NULL)
{
@@ -334,7 +334,7 @@ private:
#ifdef COLOR_TEMP_ENABLED
static void onUserChanged (GDBusConnection *pConnection, const gchar *sSender, const gchar *sPath, const gchar *sInterface, const gchar *sSignal, GVariant *pParameters, gpointer pUserData)
{
- DisplayIndicator::Impl *pImpl = (DisplayIndicator::Impl*) pUserData;
+ DisplayIndicator::Impl *pImpl = static_cast<DisplayIndicator::Impl*>(pUserData);
g_variant_get (pParameters, "(s)", &pImpl->sUser);
loadManager (pImpl);
}
@@ -449,7 +449,7 @@ private:
static gboolean updateColor (gpointer pData)
{
- DisplayIndicator::Impl *pImpl = (DisplayIndicator::Impl*) pData;
+ DisplayIndicator::Impl *pImpl = static_cast<DisplayIndicator::Impl*>(pData);
if (pImpl->bReadingAccountsService)
{
@@ -760,7 +760,7 @@ private:
static void onGeoClueLoaded (GObject *pObject, GAsyncResult *pResult, gpointer pData)
{
- DisplayIndicator::Impl *pImpl = (DisplayIndicator::Impl*) pData;
+ DisplayIndicator::Impl *pImpl = static_cast<DisplayIndicator::Impl*>(pData);
GError *pError = NULL;
GClueSimple *pSimple = gclue_simple_new_finish (pResult, &pError);
@@ -816,7 +816,7 @@ private:
{
g_simple_action_set_state (pAction, pVariant);
- DisplayIndicator::Impl *pImpl = (DisplayIndicator::Impl*) pData;
+ DisplayIndicator::Impl *pImpl = static_cast<DisplayIndicator::Impl*>(pData);
if (pImpl->bAutoSliderUpdate)
{
diff --git a/src/service.h b/src/service.h
index da8d8ba..f134853 100644
--- a/src/service.h
+++ b/src/service.h
@@ -30,7 +30,7 @@ class DisplayIndicator: public Indicator
{
public:
DisplayIndicator();
- ~DisplayIndicator();
+ ~DisplayIndicator() override;
const char* name() const override;
GSimpleActionGroup* action_group() const override;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 81e083c..bdc074f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
add_compile_options(${CXX_WARNING_ARGS})
-add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=unusedFunction --suppress=uselessOverride)
+add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
add_subdirectory (unit)
diff --git a/tests/utils/glib-fixture.h b/tests/utils/glib-fixture.h
index ccdeccd..b56654b 100644
--- a/tests/utils/glib-fixture.h
+++ b/tests/utils/glib-fixture.h
@@ -35,7 +35,7 @@ class GlibFixture : public ::testing::Test
{
public:
- virtual ~GlibFixture() =default;
+ virtual ~GlibFixture() override =default;
protected:
diff --git a/tests/utils/test-dbus-fixture.h b/tests/utils/test-dbus-fixture.h
index b01405a..e98a002 100644
--- a/tests/utils/test-dbus-fixture.h
+++ b/tests/utils/test-dbus-fixture.h
@@ -30,7 +30,7 @@ class TestDBusFixture: public GlibFixture
public:
explicit TestDBusFixture() {};
- virtual ~TestDBusFixture() =default;
+ virtual ~TestDBusFixture() override =default;
explicit TestDBusFixture(const std::vector<std::string>& service_dirs_in): service_dirs(service_dirs_in) {}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 12:44:49 +0000