shell: remove duplicated code
This clean-up seems alright, but someone with better knowledge has to
doublecheck this function. I guess there's a lot of space for clean-up
there.
[pq: looks ok, redone since did not apply after my changes]
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
diff --git a/src/shell.c b/src/shell.c
index 944df49..49edf97 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1315,6 +1315,9 @@
case SHELL_SURFACE_LOCK:
center_on_output(surface, get_default_output(compositor));
break;
+ case SHELL_SURFACE_POPUP:
+ shell_map_popup(shsurf, shsurf->popup.time);
+ break;
default:
;
}
@@ -1361,22 +1364,6 @@
}
}
- switch (surface_type) {
- case SHELL_SURFACE_TOPLEVEL:
- surface->geometry.x = 10 + random() % 400;
- surface->geometry.y = 10 + random() % 400;
- surface->geometry.dirty = 1;
- break;
- case SHELL_SURFACE_POPUP:
- shell_map_popup(shsurf, shsurf->popup.time);
- break;
- default:
- break;
- }
-
- surface->geometry.width = width;
- surface->geometry.height = height;
- surface->geometry.dirty = 1;
if (do_configure) {
weston_surface_assign_output(surface);
weston_compositor_repick(compositor);