[PATCH weston 08/10] desktop-shell: Rename protocol weston_desktop_shell

[Pekka Paalanen]

On Wed,  4 Nov 2015 16:49:57 +0800
Jonas Ådahl <jadahl at gmail.com> wrote:

> In the effort of going away from generic names of protocols only
> relevant for weston, rename the weston desktop shell
> weston_desktop_shell.
> 
> This also resets the version to 1, as there will be no prior versions
> to weston_desktop_shell.
> 
> Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
> ---
>  Makefile.am                       |  20 +++---
>  clients/desktop-shell.c           |  79 +++++++++++-----------
>  desktop-shell/input-panel.c       |   2 +-
>  desktop-shell/shell.c             |  70 ++++++++++---------
>  desktop-shell/shell.h             |   4 +-
>  protocol/desktop-shell.xml        | 138 --------------------------------------
>  protocol/weston-desktop-shell.xml | 134 ++++++++++++++++++++++++++++++++++++
>  7 files changed, 224 insertions(+), 223 deletions(-)
>  delete mode 100644 protocol/desktop-shell.xml
>  create mode 100644 protocol/weston-desktop-shell.xml

This renaming will break Maynard:
https://github.com/raspberrypi/maynard.git

This is not a blocker for this patch, just something we should be aware
of. The fix should be pretty easy if anyone cares.

> diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
> index f5342aa..6619e4c 100644
> --- a/desktop-shell/input-panel.c
> +++ b/desktop-shell/input-panel.c
> @@ -30,7 +30,7 @@
>  #include <string.h>
>  
>  #include "shell.h"
> -#include "desktop-shell-server-protocol.h"
> +#include "weston-desktop-shell-server-protocol.h"
>  #include "input-method-unstable-v1-server-protocol.h"
>  #include "shared/helpers.h"

And no other changes in this file, that's odd. Maybe the header is not
needed at all?

Acked-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20151105/48b3f5c4/attachment.sig>