diff options
| author | Robert Tari <robert@tari.in> | 2025-02-28 23:18:03 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2025-02-28 23:18:03 +0100 |
| commit | 2870762e21aeb363ebf1c709bdc4ac6133766689 (patch) | |
| tree | e113b38103e51ecb90e57ae5db198a27616d75b2 | |
| parent | fc481b1555468937a0cd478b10e043333779bd57 (diff) | |
| parent | cfa3db553b21177c014fd0b855b490b658405426 (diff) | |
| download | ayatana-indicator-keyboard-2870762e21aeb363ebf1c709bdc4ac6133766689.tar.gz ayatana-indicator-keyboard-2870762e21aeb363ebf1c709bdc4ac6133766689.tar.bz2 ayatana-indicator-keyboard-2870762e21aeb363ebf1c709bdc4ac6133766689.zip | |
Merge branch 'sunweaver-pr/hide-osk-toggle-on-ubuntutouch'
Attributes GH PR #75: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/75
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/service.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b5f7bfc..7e006b3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ add_definitions (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" -DLOCALEDIR="${CMAKE_INS find_package (PkgConfig REQUIRED) include (CheckIncludeFile) include (FindPkgConfig) -pkg_check_modules(SERVICE_DEPS REQUIRED glib-2.0>=2.36 gio-2.0>=2.36 libayatana-common>=0.9.9 accountsservice xkbcommon>=1.0.3 xkbregistry>=1.0.3) +pkg_check_modules(SERVICE_DEPS REQUIRED glib-2.0>=2.36 gio-2.0>=2.36 libayatana-common>=0.9.11 accountsservice xkbcommon>=1.0.3 xkbregistry>=1.0.3) pkg_check_modules(X11_DEPS REQUIRED x11>=1.6.5 libxklavier>=5.3) include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS}) diff --git a/src/service.c b/src/service.c index 9d57ddff..31f6ca3b 100644 --- a/src/service.c +++ b/src/service.c @@ -188,7 +188,7 @@ static GMenuModel* createSettingsSection(IndicatorKeyboardService *self) { GMenu * pMenu = g_menu_new(); - if (self->pPrivate->bLomiri) + if (self->pPrivate->bLomiri && (!ayatana_common_utils_is_ubuntutouch())) { GMenuItem *pItem = g_menu_item_new (_("Always show OSK"), "indicator.osk(true)"); g_menu_item_set_attribute (pItem, "x-ayatana-type", "s", "org.ayatana.indicator.switch"); @@ -393,7 +393,7 @@ static void initActions(IndicatorKeyboardService *self) self->pPrivate->pLayoutAction = pAction; g_signal_connect(pAction, "activate", G_CALLBACK(onLayoutSelected), self); - if (self->pPrivate->bLomiri) + if (self->pPrivate->bLomiri && (!ayatana_common_utils_is_ubuntutouch())) { gboolean bOsk = g_settings_get_boolean (self->pPrivate->pLomiriSettings, "always-show-osk"); GVariant *pOsk = g_variant_new_boolean (bOsk); |