<div dir="ltr">ack<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Oct 30, 2014 at 1:56 PM, Christophe Fergeau <span dir="ltr"><<a href="mailto:cfergeau@redhat.com" target="_blank">cfergeau@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">const guint16 const * has one extra 'const' which is removed by that<br>
commit<br>
---<br>
gtk/spice-widget-priv.h | 2 +-<br>
gtk/vncdisplaykeymap.c | 6 +++---<br>
gtk/vncdisplaykeymap.h | 4 ++--<br>
3 files changed, 6 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/gtk/spice-widget-priv.h b/gtk/spice-widget-priv.h<br>
index 597ce10..8be0644 100644<br>
--- a/gtk/spice-widget-priv.h<br>
+++ b/gtk/spice-widget-priv.h<br>
@@ -104,7 +104,7 @@ struct _SpiceDisplayPrivate {<br>
bool keyboard_grab_active;<br>
bool keyboard_have_focus;<br>
<br>
- const guint16 const *keycode_map;<br>
+ const guint16 *keycode_map;<br>
size_t keycode_maplen;<br>
uint32_t key_state[512 / 32];<br>
int key_delayed_scancode;<br>
diff --git a/gtk/vncdisplaykeymap.c b/gtk/vncdisplaykeymap.c<br>
index b2da5e5..340a86f 100644<br>
--- a/gtk/vncdisplaykeymap.c<br>
+++ b/gtk/vncdisplaykeymap.c<br>
@@ -158,8 +158,8 @@ static gboolean check_for_xquartz(GdkDisplay *dpy)<br>
}<br>
#endif<br>
<br>
-const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,<br>
- size_t *maplen)<br>
+const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,<br>
+ size_t *maplen)<br>
{<br>
#ifdef GDK_WINDOWING_X11<br>
if (GDK_IS_X11_WINDOW(window)) {<br>
@@ -262,7 +262,7 @@ const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,<br>
return NULL;<br>
}<br>
<br>
-guint16 vnc_display_keymap_gdk2xtkbd(const guint16 const *keycode_map,<br>
+guint16 vnc_display_keymap_gdk2xtkbd(const guint16 *keycode_map,<br>
size_t keycode_maplen,<br>
guint16 keycode)<br>
{<br>
diff --git a/gtk/vncdisplaykeymap.h b/gtk/vncdisplaykeymap.h<br>
index 3cb2abb..3ec55d5 100644<br>
--- a/gtk/vncdisplaykeymap.h<br>
+++ b/gtk/vncdisplaykeymap.h<br>
@@ -24,8 +24,8 @@<br>
<br>
#include <glib.h><br>
<br>
-const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,<br>
- size_t *maplen);<br>
+const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,<br>
+ size_t *maplen);<br>
guint16 vnc_display_keymap_gdk2xtkbd(const guint16 *keycode_map,<br>
size_t keycode_maplen,<br>
guint16 keycode);<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.0<br>
<br>
_______________________________________________<br>
Spice-devel mailing list<br>
<a href="mailto:Spice-devel@lists.freedesktop.org">Spice-devel@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/spice-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/spice-devel</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br>Marc-André Lureau
</div>