diff --git a/phosh/NEWS b/phosh/NEWS index b897a6d09..952a36a4f 100644 --- a/phosh/NEWS +++ b/phosh/NEWS @@ -1,49 +1,3 @@ -phosh 0.53.0 ------------- -Released February 2026 -* Various auto brightness improvements, e.g. - * remember auto brightness offset - * compensate for night light -* overview: Show thumbnails for launching apps -* overview: Style improvements -* polkit-prompt: Show more user data -* Activation fixes for notifications - (Needs https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9269) -* caffeine: Allow to open plugin prefs from the status page -* Multiple other fixes (Use alias for Bluetooth devices, improve app icon - lookup, …) -* Issues fixed: - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/647 - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/813 - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1229 - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1280 - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1287 - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1292 - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1297 - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1300 - * https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1298 -* Contributors: - * AJ Dunevent - * Arun Mani J - * Guido Günther - * Rudra Pratap Singh -* UI translations: - * Anders Jonsson (sv) - * Antonio Marin (ro) - * Artur S0 (ru) - * Álvaro Burns (pt_BR) - * Danial Behzadi (fa) - * Efstathios Iosifidis (el) - * Ekaterine Papava (ka) - * Flynn Peck (kw) - * Fredrik Fyksen (nb) - * Jürgen Benvenuti (de) - * Martin (sl) - * Quentin PAGÈS (oc) - * Sabri Ünal (tr) - * Yuri Chornoivan (uk) - * twlvnn kraftwerk (bg) - phosh 0.52.1 ------------ Released January 2026 diff --git a/phosh/data/icons/fake-app.svg b/phosh/data/icons/fake-app.svg new file mode 100644 index 000000000..26b42d774 --- /dev/null +++ b/phosh/data/icons/fake-app.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/phosh/data/mobi.phosh.shell.gschema.xml b/phosh/data/mobi.phosh.shell.gschema.xml index 0df34d8dc..8494b1812 100644 --- a/phosh/data/mobi.phosh.shell.gschema.xml +++ b/phosh/data/mobi.phosh.shell.gschema.xml @@ -11,17 +11,6 @@ - - - 0.0 - - Auto brightness offset - - Fixed offset added to the calculated auto brightnes value. - - - - diff --git a/phosh/data/phosh-portals.conf b/phosh/data/phosh-portals.conf index 3bf377d27..600c13984 100644 --- a/phosh/data/phosh-portals.conf +++ b/phosh/data/phosh-portals.conf @@ -1,5 +1,5 @@ [preferred] -default=phrosh;phosh;gtk; +default=phosh;phrosh;gtk; org.freedesktop.impl.portal.Access=phosh-shell; org.freedesktop.impl.portal.Background=none; org.freedesktop.impl.portal.Clipboard=none; diff --git a/phosh/data/phosh-session.in b/phosh/data/phosh-session.in index 960eb5e7a..878e716d9 100755 --- a/phosh/data/phosh-session.in +++ b/phosh/data/phosh-session.in @@ -2,7 +2,7 @@ COMPOSITOR="@compositor@" PHOC_INI="@pkgdatadir@/phoc.ini" -PHOSH_SESSION_BIN=${PHOSH_SESSION_BIN:-gnome-session} +GNOME_SESSION=${GNOME_SESSION:-gnome-session} help() { @@ -52,4 +52,6 @@ fi [ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput export WLR_BACKENDS -exec $SYSTEMD_CAT "${COMPOSITOR}" -v -S -C "${PHOC_INI}" -E "${PHOSH_SESSION_BIN} --session=phosh" +# Run gnome-session through a login shell so it picks +# variables from /etc/profile.d (XDG_*) +exec $SYSTEMD_CAT "${COMPOSITOR}" -v -S -C "${PHOC_INI}" -E "bash -lc 'exec ${GNOME_SESSION} --disable-acceleration-check --session=phosh'" diff --git a/phosh/debian/changelog b/phosh/debian/changelog index 4ffa9620a..9230bf583 100644 --- a/phosh/debian/changelog +++ b/phosh/debian/changelog @@ -1,250 +1,3 @@ -phosh (0.53.0) experimental; urgency=medium - - [ Guido Günther ] - * portal: Use Rust based GUI variants by default. We want to drop the C - variants so let's switch. - * gvc: Update to latest upstream commit. We landed another bugfix, let's - grab it - - [ Álvaro Burns ] - * Update Brazilian Portuguese translation - - [ Quentin PAGÈS ] - * Update Occitan translation - - -- Guido Günther Sun, 15 Feb 2026 09:23:10 +0100 - -phosh (0.53~rc1) experimental; urgency=medium - - [ Efstathios Iosifidis ] - * Update Greek translation - - [ Antonio Marin ] - * Update Romanian translation - - [ Guido Günther ] - * run: Use plugin_schema_path. - We have it already so no need to maintain it in two locations - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1298o - * util: Allow to activate without actions - * util: Make platform-data helpers public. We'll use them for - notifications - * util: Determine object path automatically. - Code taken from xdg-desktop-portal-phosh - * notification: Activate applications when sending notifications. - We activate the app and send the signal. - Should our heuristic to determine the bus name fail to work well we - can send `org.freedesktop.Notifications.ActivationToken` in - `on_app_activated` as a future improvement. - Helps: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/852 - * doc: Document missing plugin schema entries - * brightness-manager: Use _ID for schema consistently. - No point in having one schema with that suffix and the other without it. - * brightness-manager: Use faster up interval. - The human eye adjust to brightness gains more rapidly. - * backlight: Round backlight level. - This gives us more precise values than integer cutoff. - * brightness-manager: Simplify ending the transition - * brightness-manager: Smoothen brightness transition. - Use smoothstep to make things look less jittering - * monitor-manager: Add night light temperature property. - This allows us to track whether it is in use - * brightness-manager: Add additional factor when night light is on. - Night light reduces contrast as the eye is less susceptible to contrast - in the red spectrum. Lets make the display a bit brighter in those - cases. - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1292 - * brightness-manager: Drop schema check. We can assume the 49 schema - now. - * brightness-manager: Add auto-brightness offset. - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1297 - * util: Fix indent. - Gbp-dch: Ignore - * app-tracker: Fix indent. - We shorten a variable name and add get the shell variable in an extra - step for readability. - * app-list-model: Allow app-info lookup by recently launched executable. - The shell is usually used to launch apps so when launching remember the - executable. This will allow us look up app-info by exectable. - This is useful for DBus activated apps too as they still usually `Exec` - have an exec line in the desktop file. - * audio-manager: Manage audio devices. - Track the input and output audio devices - * audio-settings: Use audio-devices and mixer control from audio-manager. - This will allow us to use audio devices outside settings - * audio-devices: Move out of settings. - They're used in the audio manager now - * channel-bar: Use proper namespace. - It's a widget in Phosh so use that namespace. This also removes some - confusion between the gvc submodule and our internal widget. - * channel-bar: Rename source files. - Do that in an extra commit to ease review - * audio-settings: Avoid channel-bar casts. - Just use the most specific type right away. - * audio-settings: Avoid pointless cast - * channel-bar: Remove unused defines - * audio-devices: Use type. - We used gpointer to not leak it into libphosh but the library - is more self contained nowadays. - * overview: Use common pattern for find_activity_by_toplevel() - Return early from the loop instead of breaking and make the `l->data` - assignment the first thing in the loop. - Also make sure `g_autoptr ()` is always initialized. - Again fewer lines with easier to read code. - * overview: Use most specific type for carousel. - Avoids the long casts - * activity: Just use `MIN` - No need to open code this. - * activity: Use phosh_util_toggle_style_class consistently. - We use it to remove the class, use it for adding it too - * shell: Create splash manager earlier. - We want to use it from the overview so it has to be there with the - panels. - * shell: Allow to get splash manager - * swipe-tracker: Allow to disable swipes - * splash: Allow to lower/raise the splash - * splash-manager: Allow to lower all splashs and to raise base on startup-id - * overview: Use splash colors instead of fake app. - The fake app wasn't very useful. Use the splash screen - colors instead. - * activity: Show spinner when we don't have a thumbnail. - Add a spinner and show it when we don't have a thumbnail of the - application yet. - * activity: Disable swipe and close button while app is loading. - We can't stop it sensibly atm. - * activity: Try harder to get an app-id - * overview: Show activity for launching apps. - This gives the user feedback that the app is launching. - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/647 - * overview: Add splash manager - * overview: Raise and lower launch splashs. - When activating a splash we raise it to the top, when activating - an activity we lower all splashs so the app becomes visible. - This is not the ideal place to do it as it doesn't concernt the overview - but we track the toplevels here only atm (see - https://gitlab.gnome.org/World/Phosh/phosh/-/issues/327) - Helps: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/812 - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/813 - * overview: Use light mode based on what the splash manager does. - We won't switch when the user flips the theme during launch but - that's o.k. for the moment. - * activity: Render empty state only on drawing area. - This makes the thumbnail look more like the app - * activity: Use slightly rounded corners - * phosh-session: Drop disable-acceleration-check. - It is a noop nowadays - * phosh-session: Avoid the extra shell exec - gnome-session handles that for us - * phosh-session: Use name variable. - This ensures we don't accidentally clash with something set - in the environment - * media-player: Avoid nan when track length is empty. - Zero track length (as happens with gapless) can lead to -NAN - which trips up the progress bar. Use 0.0 in that case. - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1287 - * brightness-manager: Skip brightenss update. - We can skip the brightness update on night light changes when - auto brightness is disabled. - * lockscreen: Sort callbacks alphabetically - * lockscreen: Use two finger swipe gesture for brightness. - This works better then trying to fit a zoom gesture. Move - to the UI file while at that. - Fixes: 336929ca4 ("lockscreen: Ignore gesture when user wants to zoom") - Co-authored-by: Arun Mani J - * packaging: Update dependencies. - We need recent schema to start successfully. Drop an ancient - conflict on calls and require stevia so we always have a working - OSK (user can still switch ofc). - * docs: Mention UsesNotifications. - This is is similar to UsesFeedback. - * gvc: Switch back to blessed repo. - Most of our patches are in. The leak fix is still missing but hopefully - we get that soon. - Update to 664eba4 ("mixer-control: Document that add_stream is transfer full") - * overview: Ignore missing activity. - When an app failed to start and we can't find a matching - activity that is usually because it crashed or exited - already. Avoid a critical in that case. - * toplevel-manager: Drop super-cautious checks. - The pointer arrays are created in init and never unref'ed or - free'd until dispose so no need to check this every call. - * overview: Drop unused arguments from signal handler. - No need to check types we never use - * toplevel-manager: Track launched apps. - When an app is reporting that it launced we track its app-id - and wait for a matching toplevel in toplevel-manager. When - that doesn't happen in time, we send out a signal. - * overview: Remove splash if we never get a toplevel. - In the unlikely case that we don't see a toplevel from a launched - app, remove the splash when toplevel-manager tells us that the - toplevel will likely never show up. - - [ Jürgen Benvenuti ] - * Update German translation - - [ Fredrik Fyksen ] - * Update Norwegian Bokmål translation - - [ twlvnn kraftwerk ] - * Update Bulgarian translation - - [ Flynn Peck ] - * Add Cornish translation - - [ Arun Mani J ] - * pokit-auth-agent: Follow our coding style - * polkit-auth-prompt: Follow our coding style - * polkit-auth-agent: Uncrustify - * polkit-auth-prompt: Uncrustify - * polkit-auth-prompt: Display more information about user. - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1229 - - [ Rudra Pratap Singh ] - * top-panel: Add a common parsing function for panel options. - This way, we can keep the parsing in - sync for both mobile and non mobile panels. - * top-panel: Make panel launching actions take parameters. - Instead of a string we use (sav) parameter type - so we can pass additional parameters. - * util: Allow to open settings panel with additional parameters. - We add a second parameter to - `phosh_util_open_mobile_settings_panel`, allowing - one to send panel options alongside. The panel - name and options can then be packed to remotely - activate settings app accordingly. - * caffeine-quick-setting: Allow to open prefs via mobile settings. - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1280 - - [ Danial Behzadi ] - * Update Persian translation - - [ Yuri Chornoivan ] - * Update Ukrainian translation - - [ Martin ] - * Update Slovenian translation - - [ Ekaterine Papava ] - * Update Georgian translation - - [ Anders Jonsson ] - * Update Swedish translation - - [ Sabri Ünal ] - * Update Turkish translation - - [ AJ Dunevent ] - * device-row: Use 'alias' instead of 'name' for device display. - The 'alias' property is preferred as it contains user-defined names - while falling back to the hardware name if no alias is set. Stays - consistent with other UI elements, similar environments, etc. - Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1300 - - [ Artur S0 ] - * Update Russian translation - - -- Guido Günther Tue, 10 Feb 2026 18:03:17 +0100 - phosh (0.52.1) experimental; urgency=medium * gvc: Handle port changes on streams. diff --git a/phosh/debian/control b/phosh/debian/control index b9154644a..f6ba60e01 100644 --- a/phosh/debian/control +++ b/phosh/debian/control @@ -9,7 +9,7 @@ Build-Depends: libadwaita-1-dev, libappstream-dev, libcallaudio-dev, - libevince-dev, + libpapers-dev, libgirepository1.0-dev, libgmobile-dev, libjson-glib-dev, @@ -74,16 +74,16 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, fonts-lato, - gnome-shell-common (>= 49), - gsettings-desktop-schemas (>= 49), + gnome-shell-common, + gsettings-desktop-schemas (>= 47), libcap2-bin, libqrcodegen1, - phoc (>= 0.52.0), + phoc (>= 0.45.0), phosh-common (= ${source:Version}), Recommends: feedbackd (>= 0.5.0), - fonts-adwaita, - gnome-session-bin (>= 49), + fonts-cantarell, + gnome-session-bin, gnome-session-common, gnome-settings-daemon (>= 49), iio-sensor-proxy, @@ -93,11 +93,12 @@ Recommends: phosh-mobile-tweaks, phosh-plugins, slurp, - phosh-osk-stevia, + phosh-osk-stevia | squeekboard, Provides: notification-daemon, polkit-1-auth-agent, Breaks: + gnome-calls (<< 42), gnome-control-center (<< 42), gnome-settings-daemon (<< 49), libgtk-3-0 (<< 3.24.30), diff --git a/phosh/docs/app-dev.md b/phosh/docs/app-dev.md index f4135b766..d7119f65b 100644 --- a/phosh/docs/app-dev.md +++ b/phosh/docs/app-dev.md @@ -26,10 +26,6 @@ additional entries: feedbackd to trigger audio, haptic or led feedback. This is useful for setting applications so they can show entries for individual apps. Example: `X-Phosh-UsesFeedback=true` -* `X-GNOME-UsesNotifications`: Used to indicate that application submit notifications - This is useful for setting applications so they can show entries for - individual apps to fine tune their feedback. - Example: `X-GNOME-UsesNotifications=true` ## Desktop Notification Specification diff --git a/phosh/docs/phosh.gsettings.rst b/phosh/docs/phosh.gsettings.rst index 729e77c5b..f9ba92a8b 100644 --- a/phosh/docs/phosh.gsettings.rst +++ b/phosh/docs/phosh.gsettings.rst @@ -26,10 +26,6 @@ GSettings These gsettings are used by ``phosh``: -- `mobi.phosh.shell.brightness` - - - `auto-brightness-offset`: Offset added to the calculated auto brightness value - - `mobi.phosh.shell.cell-broadcast` - `enabled`: Whether receiving cell broadcasts is enabled @@ -82,7 +78,7 @@ These gsettings are used by ``phosh``: - `sm.puri.phosh.plugins.launcher-box` - - `folder`: The folder containing the desktop files to show in the launcher box + - `folder` - `sm.puri.phosh.plugins.ticket-box` @@ -90,7 +86,7 @@ These gsettings are used by ``phosh``: - `sm.puri.phosh.plugins.upcoming-events` - - `days`: Number of days to show in the upcoming events list + - `days` - `org.gnome.desktop.app-folders.folder`: Folder support diff --git a/phosh/meson.build b/phosh/meson.build index f7a08c37e..1298e5bea 100644 --- a/phosh/meson.build +++ b/phosh/meson.build @@ -1,7 +1,7 @@ project( 'phosh', 'c', - version: '0.53.0', + version: '0.52.1', license: 'GPL-3.0-or-later', meson_version: '>= 1.7.0', default_options: [ @@ -122,6 +122,11 @@ endif add_project_arguments(global_c_args, language: 'c') +run_data = configuration_data() +run_data.set('ABS_BUILDDIR', meson.current_build_dir()) +run_data.set('ABS_SRCDIR', meson.current_source_dir()) +configure_file(input: 'run.in', output: 'run', configuration: run_data) + gnome = import('gnome') i18n = import('i18n') pkgconfig = import('pkgconfig') @@ -130,11 +135,12 @@ appstream_dep = dependency('appstream', version: '>= 1.0.0') ecal_dep = dependency('libecal-2.0', version: '>= 3.33.1') eds_dep = dependency('libedataserver-1.2', version: '>= 3.33.1') fribidi_dep = dependency('fribidi') -gcr_dep = dependency('gcr-3', version: '>= 3.7.5') +gcr_dep = dependency('gcr-4', version: '>= 4.3.0') glib_dep = dependency('glib-2.0', version: glib_ver_cmp) gio_dep = dependency('gio-2.0', version: glib_ver_cmp) -gio_unix_dep = dependency('gio-unix-2.0', version: glib_ver_cmp) -gnome_bluetooth_dep = dependency('gnome-bluetooth-3.0', version: '>= 46.0') +gio_unix_dep = dependency('gio-unix-2.0', version: glib_ver_cmp) +gnome_bg_dep = dependency('gnome-bg-4') +gnome_bluetooth_dep = dependency ('gnome-bluetooth-3.0', version: '>= 46.0') gmobile_dep = dependency( 'gmobile', version: '>= 0.1.0', @@ -147,15 +153,15 @@ gmobile_dep = dependency( ], ) gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_ver_cmp) -gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>=3.26') +gnome_desktop_dep = dependency('gnome-desktop-4', version: '>=4.0') gobject_dep = dependency('gobject-2.0', version: glib_ver_cmp) gsettings_desktop_schemas_dep = dependency( 'gsettings-desktop-schemas', version: '>=47', ) -gtk_dep = dependency('gtk+-3.0', version: '>=3.22') -gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>=3.22') +gtk_dep = dependency('gtk4', version: '>=4.15') gudev_dep = dependency('gudev-1.0') +libadwaita_dep = dependency('libadwaita-1') libcall_ui = subproject( 'libcall-ui', default_options: [ @@ -189,12 +195,6 @@ libgvc = subproject( ], ) libgvc_dep = libgvc.get_variable('libgvc_dep') -libhandy_dep = dependency( - 'libhandy-1', - version: '>=1.1.90', - fallback: ['libhandy', 'libhandy_dep'], - default_options: ['introspection=disabled'], -) libcall_ui_dep = libcall_ui.get_variable('libcall_ui_dep') libnm_dep = dependency('libnm', version: '>= 1.14') libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.122') @@ -249,19 +249,11 @@ configure_file( install_dir: lib_inc_dir, ) - subdir('data') subdir('po') subdir('protocol') subdir('src') subdir('plugins') - -run_data = configuration_data() -run_data.set('ABS_BUILDDIR', meson.current_build_dir()) -run_data.set('ABS_SRCDIR', meson.current_source_dir()) -run_data.set('PLUGIN_SCHEMA_PATH', plugin_schema_path) -configure_file(input: 'run.in', output: 'run', configuration: run_data) - subdir('searchd') subdir('tests') subdir('tools') diff --git a/phosh/plugins/caffeine-quick-setting/caffeine-quick-setting.c b/phosh/plugins/caffeine-quick-setting/caffeine-quick-setting.c index fea45648d..8d65497cc 100644 --- a/phosh/plugins/caffeine-quick-setting/caffeine-quick-setting.c +++ b/phosh/plugins/caffeine-quick-setting/caffeine-quick-setting.c @@ -193,17 +193,17 @@ on_interval_row_activated (GtkListBox *listbox, PhoshCaffeineQuickSetting *self) { uint selected_idx = 0; - g_autoptr (GList) children = NULL; if (self->cur_row != row) { + GtkListBoxRow *child; phosh_caffeine_quick_setting_clear_timer (self); - children = gtk_container_get_children (GTK_CONTAINER (self->listbox)); - for (GList *child = children; child; child = child->next) { - if (child->data == row) + child = gtk_list_box_get_row_at_index (self->listbox, selected_idx); + while (child) { + if (child == row) break; - selected_idx++; + child = gtk_list_box_get_row_at_index (self->listbox, selected_idx); } g_settings_set_uint (self->settings, CAFFEINE_SELECTED_KEY, selected_idx); @@ -317,8 +317,14 @@ static void on_selected_index_changed (PhoshCaffeineQuickSetting *self) { uint selected_idx = g_settings_get_uint (self->settings, CAFFEINE_SELECTED_KEY); - g_autoptr (GList) children = gtk_container_get_children (GTK_CONTAINER (self->listbox)); - uint len = g_list_length (children); + GtkListBoxRow *child; + uint len = 0; + + child = gtk_list_box_get_row_at_index (self->listbox, len); + while (child) { + len++; + child = gtk_list_box_get_row_at_index (self->listbox, len); + } phosh_caffeine_quick_setting_clear_timer (self); @@ -346,14 +352,12 @@ on_intervals_changed (PhoshCaffeineQuickSetting *self) GVariantIter iter; PhoshIntervalRow* row = NULL; g_autoptr (GVariant) intervals = NULL; - g_autoptr (GList) children = gtk_container_get_children (GTK_CONTAINER (self->listbox)); g_debug ("Intervals changed, reconfiguring listbox..."); self->cur_row = NULL; - for (GList *child = children; child; child = child->next) - gtk_container_remove (GTK_CONTAINER (self->listbox), child->data); + gtk_list_box_remove_all (self->listbox); intervals = g_settings_get_value (self->settings, CAFFEINE_INTERVALS_KEY); @@ -373,7 +377,7 @@ static void phosh_caffeine_quick_setting_init (PhoshCaffeineQuickSetting *self) { gtk_widget_init_template (GTK_WIDGET (self)); - gtk_icon_theme_add_resource_path (gtk_icon_theme_get_default (), + gtk_icon_theme_add_resource_path (gtk_icon_theme_get_for_display (gdk_display_get_default ()), "/mobi/phosh/plugins/caffeine-quick-setting/icons"); self->settings = g_settings_new (CAFFEINE_QUICK_SETTING_SCHEMA); diff --git a/phosh/plugins/caffeine-quick-setting/interval-row.c b/phosh/plugins/caffeine-quick-setting/interval-row.c index 191a33096..e5eb6169c 100644 --- a/phosh/plugins/caffeine-quick-setting/interval-row.c +++ b/phosh/plugins/caffeine-quick-setting/interval-row.c @@ -26,14 +26,14 @@ enum { static GParamSpec *props[PROP_LAST_PROP]; struct _PhoshIntervalRow { - HdyActionRow parent; + AdwActionRow parent; GtkRevealer *revealer; uint value; gboolean selected; }; -G_DEFINE_TYPE (PhoshIntervalRow, phosh_interval_row, HDY_TYPE_ACTION_ROW); +G_DEFINE_TYPE (PhoshIntervalRow, phosh_interval_row, ADW_TYPE_ACTION_ROW); static void phosh_interval_row_set_value (PhoshIntervalRow *self, uint value) @@ -43,9 +43,9 @@ phosh_interval_row_set_value (PhoshIntervalRow *self, uint value) if (value < PHOSH_INTERVAL_ROW_INFINITY_VALUE) { g_autofree char *label = cui_call_format_duration ((double) value); - hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (self), label); + adw_preferences_row_set_title (ADW_PREFERENCES_ROW (self), label); } else { - hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (self), "∞"); + adw_preferences_row_set_title (ADW_PREFERENCES_ROW (self), "∞"); } g_object_bind_property (self, diff --git a/phosh/plugins/caffeine-quick-setting/interval-row.h b/phosh/plugins/caffeine-quick-setting/interval-row.h index 2c11b6a75..586a8b9ce 100644 --- a/phosh/plugins/caffeine-quick-setting/interval-row.h +++ b/phosh/plugins/caffeine-quick-setting/interval-row.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #define PHOSH_INTERVAL_ROW_INFINITY_VALUE G_MAXUINT32 @@ -14,7 +14,7 @@ G_BEGIN_DECLS #define PHOSH_TYPE_INTERVAL_ROW (phosh_interval_row_get_type ()) -G_DECLARE_FINAL_TYPE (PhoshIntervalRow, phosh_interval_row, PHOSH, INTERVAL_ROW, HdyActionRow) +G_DECLARE_FINAL_TYPE (PhoshIntervalRow, phosh_interval_row, PHOSH, INTERVAL_ROW, AdwActionRow) PhoshIntervalRow *phosh_interval_row_new (uint value, gboolean selected); uint phosh_interval_row_get_value (PhoshIntervalRow *self); diff --git a/phosh/plugins/caffeine-quick-setting/interval-row.ui b/phosh/plugins/caffeine-quick-setting/interval-row.ui index df286c0fa..9adecfb8b 100644 --- a/phosh/plugins/caffeine-quick-setting/interval-row.ui +++ b/phosh/plugins/caffeine-quick-setting/interval-row.ui @@ -1,8 +1,7 @@ - - -