[PATCH weston 09/10] Rename screenshooter protocol to weston_screenshooter

[Jonas Ådahl]

On Thu, Nov 05, 2015 at 04:35:15PM +0200, Pekka Paalanen wrote:
> On Wed,  4 Nov 2015 16:49:58 +0800
> Jonas Ådahl <jadahl at gmail.com> wrote:
> 
> > Due to the effort of moving a way from non-prefixed protocols, rename
> > the weston specific screenshooter protocol to weston_screenshooter.
> > 
> > Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
> > ---
> >  Makefile.am                       | 14 +++++++-------
> >  clients/screenshot.c              | 21 +++++++++++++--------
> >  protocol/screenshooter.xml        | 12 ------------
> >  protocol/weston-screenshooter.xml | 12 ++++++++++++
> >  src/screenshooter.c               | 12 ++++++------
> >  5 files changed, 38 insertions(+), 33 deletions(-)
> >  delete mode 100644 protocol/screenshooter.xml
> >  create mode 100644 protocol/weston-screenshooter.xml
> 
> > diff --git a/src/screenshooter.c b/src/screenshooter.c
> > index 6e1af65..d0ec00e 100644
> > --- a/src/screenshooter.c
> > +++ b/src/screenshooter.c
> 
> > @@ -622,9 +622,9 @@ screenshooter_create(struct weston_compositor *ec)
> >  	shooter->client = NULL;
> >  
> >  	shooter->global = wl_global_create(ec->wl_display,
> > -					   &screenshooter_interface, 1,
> > +					   &weston_screenshooter_interface, 1,
> >  					   shooter, bind_shooter);
> > -	weston_compositor_add_key_binding(ec, KEY_S, MODIFIER_SUPER,
> > +	weston_compositor_add_key_binding(ec, KEY_S, MODIFIER_CTRL,
> 
> Oops? :-)

Oops indeed (MODIFIER_SUPER tends to never work on a nested weston in
gnome shell). Sorry about that.


Jonas

> 
> Otherwise
> Acked-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> 
> 
> Thanks,
> pq