1 files changed, 5 insertions, 27 deletions
diff --git a/wayland/democompositor/qml/main.qml b/wayland/democompositor/qml/main.qml
index 8104db6..8c0c621 100644
--- a/wayland/democompositor/qml/main.qml
+++ b/wayland/democompositor/qml/main.qml
@@ -66,33 +66,11 @@ WaylandCompositor {
         }
     }
 
-    Component {
-        id: surfaceComponent
-        WaylandSurface {
+    WlShell {
+        id: defaultShell
+        onWlShellSurfaceCreated: {
+            chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
+            defaultOutput.relayout();
         }
     }
-
-    extensions: [
-        Shell {
-            id: defaultShell
-
-
-            onCreateShellSurface: {
-                var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } );
-                item.shellSurface.initialize(defaultShell, surface, client, id);
-            }
-
-            Component.onCompleted: {
-                initialize();
-            }
-        }
-    ]
-
-    onCreateSurface: {
-        var surface = surfaceComponent.createObject(comp, { } );
-        surface.initialize(comp, client, id, version);
-    }
-    onSurfaceCreated: {
-        defaultOutput.relayout()
-    }
 }