[Spice-devel] [PATCH spice-gtk v2 09/15] desktop: Do not try org.gnome.SessionManager on Windows or Mac
Marc-André Lureau
marcandre.lureau at gmail.com
Fri Jan 11 12:10:33 UTC 2019
Hi
On Wed, Jan 9, 2019 at 9:43 PM Marc-André Lureau
<marcandre.lureau at gmail.com> wrote:
>
> Hi
>
> On Wed, Jan 9, 2019 at 9:19 PM Frediano Ziglio <fziglio at redhat.com> wrote:
> >
> > >
> > > From: Marc-André Lureau <marcandre.lureau at redhat.com>
> > >
> > > DBus support is available on those systems, yet it doesn't make sense
> > > to attempt to connect to GNOME session manager.
> > >
> > > Fixes:
> > > https://gitlab.freedesktop.org/spice/spice-gtk/issues/81
> > >
> > > Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
> >
> > Thanks, faster than light!
> >
> > > ---
> > > src/desktop-integration.c | 8 ++++++--
> > > 1 file changed, 6 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/src/desktop-integration.c b/src/desktop-integration.c
> > > index 7c433bb3..37d1791e 100644
> > > --- a/src/desktop-integration.c
> > > +++ b/src/desktop-integration.c
> > > @@ -160,8 +160,12 @@ static void
> > > spice_desktop_integration_init(SpiceDesktopIntegration *self)
> > > priv = spice_desktop_integration_get_instance_private(self);
> > > self->priv = priv;
> > >
> > > - if (!gnome_integration_init(self))
> > > - g_warning("Warning no automount-inhibiting implementation
> > > available");
> > > +#if defined(G_OS_UNIX) && !__APPLE__
> > > + if (gnome_integration_init(self))
> > > + return;
> >
> > style: missing brackets
> >
> > this generates on Windows:
> >
> > desktop-integration.c:56:17: error: 'gnome_integration_init' defined but not used [-Werror=unused-function]
> > static gboolean gnome_integration_init(SpiceDesktopIntegration *self)
> > ^~~~~~~~~~~~~~~~~~~~~~
>
> Oh well, it is solved by the following patch, I can squash both.
ack with the squash?
>
> >
> > > +#endif
> > > +
> > > + g_warning("Warning no automount-inhibiting implementation available");
> > > }
> > >
> > > static void spice_desktop_integration_dispose(GObject *gobject)
> >
> > Frediano
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/spice-devel
>
>
>
> --
> Marc-André Lureau
--
Marc-André Lureau
More information about the Spice-devel
mailing list