Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

device: Improve dialog text #1227

Merged
merged 1 commit into from
Dec 22, 2023
Merged

device: Improve dialog text #1227

merged 1 commit into from
Dec 22, 2023

Conversation

A6GibKm
Copy link
Contributor

@A6GibKm A6GibKm commented Nov 26, 2023

See https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/35.

I did my best but I was not able to test this in action.

@A6GibKm
Copy link
Contributor Author

A6GibKm commented Nov 26, 2023

cc @allanday

@A6GibKm A6GibKm force-pushed the update-monitor-version branch from cb53e42 to 46fac4d Compare November 26, 2023 10:03
@A6GibKm
Copy link
Contributor Author

A6GibKm commented Nov 26, 2023

Should this use subtitle rather than body?

GeorgesStavracas
GeorgesStavracas requested changes Dec 20, 2023
View reviewed changes
Copy link
Member

@GeorgesStavracas GeorgesStavracas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you share a screenshot of how it looks like with your changes? It would ease design review.

src/device.c Outdated Show resolved Hide resolved
src/device.c Outdated Show resolved Hide resolved
src/device.c Outdated Show resolved Hide resolved
@GeorgesStavracas
Copy link
Member

To test this, you can run src/xdg-desktop-portal --replace

This PR closes #1042

@A6GibKm A6GibKm force-pushed the update-monitor-version branch from 46fac4d to 258afb4 Compare December 20, 2023 20:28
@A6GibKm
Copy link
Contributor Author

A6GibKm commented Dec 20, 2023 •
edited
Loading

To test this, you can run src/xdg-desktop-portal --replace

This PR closes #1042

Unfortunately, that does not work on my system. For some reason portals are broken after building xdp and running xdg-desktop-portal -r on my host (e.g. apps ignore the color-scheme or I cant open the FileChooser). I have no idea why

$ G_MESSAGES_DEBUG=all _build/src/xdg-desktop-portal --replace
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.666: Looking for portals configuration in '/var/home/deathwish/.config/xdg-desktop-portal/gnome-portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/var/home/deathwish/.config/xdg-desktop-portal/portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/etc/xdg/xdg-desktop-portal/gnome-portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/etc/xdg/xdg-desktop-portal/portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/usr/local/etc/xdg-desktop-portal/gnome-portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/usr/local/etc/xdg-desktop-portal/portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/var/home/deathwish/.local/share/xdg-desktop-portal/gnome-portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/var/home/deathwish/.local/share/xdg-desktop-portal/portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/var/home/deathwish/.local/share/flatpak/exports/share/xdg-desktop-portal/gnome-portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/var/home/deathwish/.local/share/flatpak/exports/share/xdg-desktop-portal/portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/var/lib/flatpak/exports/share/xdg-desktop-portal/gnome-portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/var/lib/flatpak/exports/share/xdg-desktop-portal/portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/usr/local/share/xdg-desktop-portal/gnome-portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/usr/local/share/xdg-desktop-portal/portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: Looking for portals configuration in '/usr/share/xdg-desktop-portal/gnome-portals.conf'
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.667: load portals from /usr/local/share/xdg-desktop-portal/portals
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.676: Using cross-namespace EXTERNAL authentication (this will deadlock if server is GDBus < 2.73.3)
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.678: _g_io_module_get_default: Found default implementation local (GLocalVfs) for ‘gio-vfs’
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.678: Using cross-namespace EXTERNAL authentication (this will deadlock if server is GDBus < 2.73.3)
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.682: Failed to initialize portal (GMemoryMonitorPortal) for gio-memory-monitor: Not using portals
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.682: _g_io_module_get_default: Found default implementation dbus (GMemoryMonitorDBus) for ‘gio-memory-monitor’
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.682: providing portal org.freedesktop.portal.MemoryMonitor
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.682: Failed to initialize portal (GPowerProfileMonitorPortal) for gio-power-profile-monitor: Not using portals
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.682: Using cross-namespace EXTERNAL authentication (this will deadlock if server is GDBus < 2.73.3)
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.682: _g_io_module_get_default: Found default implementation dbus (GPowerProfileMonitorDBus) for ‘gio-power-profile-monitor’
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.682: providing portal org.freedesktop.portal.PowerProfileMonitor
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.682: Failed to initialize portal (GNetworkMonitorPortal) for gio-network-monitor: Not using portals
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.684: _g_io_module_get_default: Found default implementation networkmanager (GNetworkMonitorNM) for ‘gio-network-monitor’
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.684: providing portal org.freedesktop.portal.NetworkMonitor
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.684: _g_io_module_get_default: Found default implementation dconf (DConfSettingsBackend) for ‘gsettings-backend’
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.684: watch_fast: "/system/proxy/" (establishing: 0, active: 0)
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.684: watch_fast: "/system/proxy/http/" (establishing: 0, active: 0)
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.684: watch_fast: "/system/proxy/https/" (establishing: 0, active: 0)
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.684: watch_fast: "/system/proxy/ftp/" (establishing: 0, active: 0)
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.684: watch_fast: "/system/proxy/socks/" (establishing: 0, active: 0)
(_build/src/xdg-desktop-portal:96645): GLib-GIO-DEBUG: 21:32:26.685: _g_io_module_get_default: Found default implementation gnome (GProxyResolverGnome) for ‘gio-proxy-resolver’
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.685: providing portal org.freedesktop.portal.ProxyResolver
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.685: providing portal org.freedesktop.portal.Trash
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.685: watch_established: "/system/proxy/" (establishing: 1)
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.685: watch_established: "/system/proxy/http/" (establishing: 1)
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.686: watch_established: "/system/proxy/https/" (establishing: 1)
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.686: providing portal org.freedesktop.portal.GameMode
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.686: watch_established: "/system/proxy/ftp/" (establishing: 1)
(_build/src/xdg-desktop-portal:96645): dconf-DEBUG: 21:32:26.686: watch_established: "/system/proxy/socks/" (establishing: 1)
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.688: providing portal org.freedesktop.portal.Realtime

(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-WARNING **: 21:32:26.688: No skeleton to export
(_build/src/xdg-desktop-portal:96645): xdg-desktop-portal-DEBUG: 21:32:26.688: org.freedesktop.portal.Desktop acquired

@GeorgesStavracas
Copy link
Member

You probably need to restart xdg-desktop-portal-gnome after replacing xdg-desktop-portal

@GeorgesStavracas GeorgesStavracas added this pull request to the merge queue Dec 22, 2023
@GeorgesStavracas GeorgesStavracas added this to the 1.20 milestone Dec 22, 2023
Merged via the queue into flatpak:main with commit 0bf0bee Dec 22, 2023
4 checks passed
@GeorgesStavracas GeorgesStavracas mentioned this pull request Dec 22, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GeorgesStavracas GeorgesStavracas GeorgesStavracas approved these changes

Assignees

@A6GibKm A6GibKm

Labels
enhancement portal: devices Devices portal
Projects
No open projects
Triage
Status: Triaged
XDG Portals workboard
Status: Done
Milestone
1.20
Development

Successfully merging this pull request may close these issues.
2 participants
@A6GibKm @GeorgesStavracas