Commit e227a15f authored by Guido Gunther's avatar Guido Gunther

Make phosh private wayland extension optional

This allows us to run phosh with wlroots/rootston master
parent fc182dc3
......@@ -699,13 +699,17 @@ phosh_shell_constructed (GObject *object)
!priv->input_inhibit_manager || !priv->mshell || !priv->xdg_wm_base)
wl_display_roundtrip (priv->display);
if (!priv->output || !priv->layer_shell || !priv->idle_manager ||
!priv->input_inhibit_manager || !priv->mshell || !priv->xdg_wm_base) {
g_error ("Could not find needed globals\n"
"output: %p, layer_shell: %p, mshell: %p, seat: %p, "
"inhibit: %p, xdg_wm: %p\n",
priv->output, priv->layer_shell, priv->mshell, priv->idle_manager,
priv->input_inhibit_manager, priv->xdg_wm_base);
!priv->input_inhibit_manager || !priv->xdg_wm_base) {
g_error ("Could not find needed globals\n"
"output: %p, layer_shell: %p, seat: %p, "
"inhibit: %p, xdg_wm: %p\n",
priv->output, priv->layer_shell, priv->idle_manager,
priv->input_inhibit_manager, priv->xdg_wm_base);
}
if (!priv->mshell) {
g_warning ("Could not find phosh global, disabling some features\n");
}
env_setup ();
css_setup (self);
......@@ -764,6 +768,8 @@ phosh_shell_rotate_display (PhoshShell *self,
{
PhoshShellPrivate *priv = phosh_shell_get_instance_private (self);
g_return_if_fail (priv->mshell);
priv->rotation = degree;
phosh_private_rotate_display (priv->mshell,
priv->panel->wl_surface,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment