Re: [PATCH gtk+] wayland: Track libxkbcommon changes.

2012-11-12 Thread Scott Moreau
On Mon, Nov 12, 2012 at 9:40 AM, Rob Bradford wrote: > On Mon, Nov 12, 2012 at 03:27:43PM +, Rob Bradford wrote: > > On Sun, Nov 11, 2012 at 12:19:20PM -0700, Scott Moreau wrote: > > > On Sun, Nov 11, 2012 at 5:49 AM, Rob Bradford < > robert.bradf...@intel.com>wrote: > > > > Hi Scott, > > Hell

Re: [PATCH gtk+] wayland: Track libxkbcommon changes.

2012-11-12 Thread Rob Bradford
On Mon, Nov 12, 2012 at 03:27:43PM +, Rob Bradford wrote: > On Sun, Nov 11, 2012 at 12:19:20PM -0700, Scott Moreau wrote: > > On Sun, Nov 11, 2012 at 5:49 AM, Rob Bradford > > wrote: > > Hi Scott, Hello again, > > Yes, you are right. It looks like I got confused between branches. This > > p

Re: [PATCH gtk+] wayland: Track libxkbcommon changes.

2012-11-12 Thread Rob Bradford
On Sun, Nov 11, 2012 at 12:19:20PM -0700, Scott Moreau wrote: > On Sun, Nov 11, 2012 at 5:49 AM, Rob Bradford > wrote: Hi Scott, > Yes, you are right. It looks like I got confused between branches. This > patch is meant for the wip/csd branch but it also needs the 1.0 update > patch too. Sorry a

Re: [PATCH gtk+] wayland: Track libxkbcommon changes.

2012-11-11 Thread Scott Moreau
On Sun, Nov 11, 2012 at 5:49 AM, Rob Bradford wrote: > On Sun, Nov 11, 2012 at 03:57:49AM -0700, Scott Moreau wrote: > > Hi Scott, > > > - return xkb_keysym_from_name(keyval_name); > > + return xkb_keysym_from_name(keyval_name, 0); > > I'm a little confused about this patch - AFAICT using git bl

Re: [PATCH gtk+] wayland: Track libxkbcommon changes.

2012-11-11 Thread Rob Bradford
On Sun, Nov 11, 2012 at 03:57:49AM -0700, Scott Moreau wrote: Hi Scott, > - return xkb_keysym_from_name(keyval_name); > + return xkb_keysym_from_name(keyval_name, 0); I'm a little confused about this patch - AFAICT using git blame this was already fixed when I merged Ran's patch: commit 21cf5

[PATCH gtk+] wayland: Track libxkbcommon changes.

2012-11-11 Thread Scott Moreau
--- gdk/wayland/gdkdisplaymanager-wayland.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c index 1a327b3..2e0b6bf 100644 --- a/gdk/wayland/gdkdisplaymanager-wayland.c +++ b/gdk/wayland/gdkdispla