Thu Oct 30 09:53:53 PDT 2014

TODO                                         |    1 
 configure.ac                                 |   37 +++++++++++++--------------
 data/Makefile.am                             |   20 --------------
 data/spice-mime.xml.in                       |    8 -----
 data/spicy.desktop.in.in                     |   10 -------
 doc/reference/spice-gtk.types                |    2 -
 gtk/channel-display.c                        |    2 -
 gtk/channel-usbredir.c                       |    2 -
 gtk/continuation.c                           |    2 -
 gtk/controller/dump.c                        |    3 --
 gtk/controller/namedpipe.c                   |    2 -
 gtk/controller/namedpipeconnection.c         |    2 -
 gtk/controller/namedpipelistener.c           |    2 -
 gtk/controller/namedpipelistener.h           |    1 
 gtk/controller/spice-controller-listener.c   |    1 
 gtk/controller/spice-controller-listener.h   |    3 --
 gtk/controller/spice-foreign-menu-listener.c |    1 
 gtk/controller/test.c                        |    2 -
 gtk/controller/util.vala                     |    2 -
 gtk/controller/win32-util.c                  |    2 -
 gtk/coroutine_gthread.c                      |    2 -
 gtk/coroutine_ucontext.c                     |    2 -
 gtk/coroutine_winfibers.c                    |    2 -
 gtk/decode-glz-tmpl.c                        |    3 --
 gtk/smartcard-manager-priv.h                 |    2 -
 gtk/smartcard-manager.h                      |    1 
 gtk/spice-audio-priv.h                       |    1 
 gtk/spice-audio.c                            |    2 -
 gtk/spice-channel-enums.h                    |    4 --
 gtk/spice-channel-priv.h                     |    2 -
 gtk/spice-client-glib-usb-acl-helper.c       |    4 --
 gtk/spice-client-gtk-module.c                |    1 
 gtk/spice-client.c                           |    1 
 gtk/spice-cmdline.c                          |    4 --
 gtk/spice-grabsequence.c                     |    2 -
 gtk/spice-gstaudio.c                         |    2 -
 gtk/spice-option.c                           |    4 --
 gtk/spice-util.c                             |    4 --
 gtk/spice-widget-priv.h                      |    4 --
 gtk/spicy-screenshot.c                       |    4 --
 gtk/spicy-stats.c                            |    4 --
 gtk/spicy.c                                  |    4 --
 gtk/usb-device-widget.c                      |    2 -
 gtk/usbutil.c                                |    4 --
 gtk/vncdisplaykeymap.c                       |    6 ++--
 gtk/vncdisplaykeymap.h                       |    4 +-
 gtk/win-usb-dev.c                            |    2 -
 gtk/win-usb-driver-install.c                 |    2 -
 po/POTFILES.in                               |    2 -
 49 files changed, 49 insertions(+), 137 deletions(-)

New commits:
commit a577a155c19f50dd1ffaa7d30275a6fab17f6100
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 17:09:15 2014 +0100

    Always use #include "config.h"
    
    gnulib 'make syntax-check' prohibits use of #ifdef HAVE_CONFIG_H so this
    commit removes it from where it's used. It also makes sure we always use
    the same syntax for including config.h (#include "config.h" VS #include
    <config.h>) as a consistent way of doing that is expected.

diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index 1e1312c..940a5a7 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -15,9 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/gtk/continuation.c b/gtk/continuation.c
index e33d05a..adce858 100644
--- a/gtk/continuation.c
+++ b/gtk/continuation.c
@@ -17,7 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
-#include <config.h>
+#include "config.h"
 
 /* keep this above system headers, but below config.h */
 #ifdef _FORTIFY_SOURCE
diff --git a/gtk/controller/dump.c b/gtk/controller/dump.c
index 5e951df..831a1d7 100644
--- a/gtk/controller/dump.c
+++ b/gtk/controller/dump.c
@@ -13,9 +13,7 @@
 /* You should have received a copy of the GNU Lesser General Public */
 /* License along with this library; if not, see <http://www.gnu.org/licenses/>. */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/gtk/controller/namedpipe.c b/gtk/controller/namedpipe.c
index 6859770..5312218 100644
--- a/gtk/controller/namedpipe.c
+++ b/gtk/controller/namedpipe.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
+#include "config.h"
 #include "namedpipe.h"
 
 #include <windows.h>
diff --git a/gtk/controller/namedpipeconnection.c b/gtk/controller/namedpipeconnection.c
index 1e84e9f..3173b61 100644
--- a/gtk/controller/namedpipeconnection.c
+++ b/gtk/controller/namedpipeconnection.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
+#include "config.h"
 #include "namedpipeconnection.h"
 
 #include <windows.h>
diff --git a/gtk/controller/namedpipelistener.c b/gtk/controller/namedpipelistener.c
index 28b2a4d..820c606 100644
--- a/gtk/controller/namedpipelistener.c
+++ b/gtk/controller/namedpipelistener.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
+#include "config.h"
 #include "namedpipelistener.h"
 
 #include <windows.h>
diff --git a/gtk/controller/spice-controller-listener.c b/gtk/controller/spice-controller-listener.c
index 0189848..98baf33 100644
--- a/gtk/controller/spice-controller-listener.c
+++ b/gtk/controller/spice-controller-listener.c
@@ -15,6 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#include "config.h"
 
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/gtk/controller/spice-foreign-menu-listener.c b/gtk/controller/spice-foreign-menu-listener.c
index 6693e21..5e62606 100644
--- a/gtk/controller/spice-foreign-menu-listener.c
+++ b/gtk/controller/spice-foreign-menu-listener.c
@@ -15,6 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#include "config.h"
 
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/gtk/controller/test.c b/gtk/controller/test.c
index f426669..c08fe21 100644
--- a/gtk/controller/test.c
+++ b/gtk/controller/test.c
@@ -13,9 +13,7 @@
 /* You should have received a copy of the GNU Lesser General Public */
 /* License along with this library; if not, see <http://www.gnu.org/licenses/>. */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/gtk/controller/win32-util.c b/gtk/controller/win32-util.c
index ea68814..c3e0400 100644
--- a/gtk/controller/win32-util.c
+++ b/gtk/controller/win32-util.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
+#include "config.h"
 #include "win32-util.h"
 #include <windows.h>
 #include <sddl.h>
diff --git a/gtk/coroutine_gthread.c b/gtk/coroutine_gthread.c
index cfeac1a..b0098fa 100644
--- a/gtk/coroutine_gthread.c
+++ b/gtk/coroutine_gthread.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "coroutine.h"
 #include <stdio.h>
diff --git a/gtk/coroutine_ucontext.c b/gtk/coroutine_ucontext.c
index 46899e7..d709a33 100644
--- a/gtk/coroutine_ucontext.c
+++ b/gtk/coroutine_ucontext.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <config.h>
+#include "config.h"
 #include <glib.h>
 
 #ifdef HAVE_SYS_TYPES_H
diff --git a/gtk/coroutine_winfibers.c b/gtk/coroutine_winfibers.c
index 6f96c74..a56d33d 100644
--- a/gtk/coroutine_winfibers.c
+++ b/gtk/coroutine_winfibers.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <glib.h>
 
diff --git a/gtk/smartcard-manager-priv.h b/gtk/smartcard-manager-priv.h
index f408d1f..409c1c5 100644
--- a/gtk/smartcard-manager-priv.h
+++ b/gtk/smartcard-manager-priv.h
@@ -18,9 +18,7 @@
 #ifndef __SMARTCARD_MANAGER_PRIV_H__
 #define __SMARTCARD_MANAGER_PRIV_H__
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <gio/gio.h>
 #include "spice-session.h"
 
diff --git a/gtk/spice-audio.c b/gtk/spice-audio.c
index dbd3a8b..e7af7d5 100644
--- a/gtk/spice-audio.c
+++ b/gtk/spice-audio.c
@@ -32,9 +32,7 @@
  * application, and connect them to the default sound system.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/gtk/spice-channel-priv.h b/gtk/spice-channel-priv.h
index 6067abc..07012db 100644
--- a/gtk/spice-channel-priv.h
+++ b/gtk/spice-channel-priv.h
@@ -18,9 +18,7 @@
 #ifndef __SPICE_CLIENT_CHANNEL_PRIV_H__
 #define __SPICE_CLIENT_CHANNEL_PRIV_H__
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <openssl/ssl.h>
 #include <gio/gio.h>
diff --git a/gtk/spice-client-glib-usb-acl-helper.c b/gtk/spice-client-glib-usb-acl-helper.c
index fe247ac..bc09776 100644
--- a/gtk/spice-client-glib-usb-acl-helper.c
+++ b/gtk/spice-client-glib-usb-acl-helper.c
@@ -20,9 +20,7 @@
    with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/gtk/spice-client-gtk-module.c b/gtk/spice-client-gtk-module.c
index e93b19d..b82f1e3 100644
--- a/gtk/spice-client-gtk-module.c
+++ b/gtk/spice-client-gtk-module.c
@@ -15,6 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#include "config.h"
 #include <pygobject.h>
 
 void spice_register_classes (PyObject *d);
diff --git a/gtk/spice-cmdline.c b/gtk/spice-cmdline.c
index bb4b630..8619b57 100644
--- a/gtk/spice-cmdline.c
+++ b/gtk/spice-cmdline.c
@@ -15,9 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 #include <glib/gi18n.h>
 
 #include "spice-client.h"
diff --git a/gtk/spice-grabsequence.c b/gtk/spice-grabsequence.c
index 5d6fa9f..39adfb0 100644
--- a/gtk/spice-grabsequence.c
+++ b/gtk/spice-grabsequence.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <gdk/gdk.h>
diff --git a/gtk/spice-gstaudio.c b/gtk/spice-gstaudio.c
index faa0c74..69bfa78 100644
--- a/gtk/spice-gstaudio.c
+++ b/gtk/spice-gstaudio.c
@@ -15,9 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gst/gst.h>
 #include <gst/app/gstappsrc.h>
diff --git a/gtk/spice-option.c b/gtk/spice-option.c
index 05735ba..958e03c 100644
--- a/gtk/spice-option.c
+++ b/gtk/spice-option.c
@@ -15,9 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <glib-object.h>
diff --git a/gtk/spice-util.c b/gtk/spice-util.c
index 4d26a30..bec237b 100644
--- a/gtk/spice-util.c
+++ b/gtk/spice-util.c
@@ -16,9 +16,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/gtk/spice-widget-priv.h b/gtk/spice-widget-priv.h
index 8be0644..9c38e2e 100644
--- a/gtk/spice-widget-priv.h
+++ b/gtk/spice-widget-priv.h
@@ -20,9 +20,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef WITH_X11
 #include <X11/Xlib.h>
diff --git a/gtk/spicy-screenshot.c b/gtk/spicy-screenshot.c
index b60fb42..e7835bf 100644
--- a/gtk/spicy-screenshot.c
+++ b/gtk/spicy-screenshot.c
@@ -15,9 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 #include <glib/gi18n.h>
 
 #include "spice-client.h"
diff --git a/gtk/spicy-stats.c b/gtk/spicy-stats.c
index e236223..c98148d 100644
--- a/gtk/spicy-stats.c
+++ b/gtk/spicy-stats.c
@@ -15,9 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 #include <glib/gi18n.h>
 
 #include "spice-client.h"
diff --git a/gtk/spicy.c b/gtk/spicy.c
index 80d53b4..2fcd529 100644
--- a/gtk/spicy.c
+++ b/gtk/spicy.c
@@ -16,9 +16,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 #include <glib/gi18n.h>
 
 #include <sys/stat.h>
diff --git a/gtk/usbutil.c b/gtk/usbutil.c
index 18fb14c..16d757b 100644
--- a/gtk/usbutil.c
+++ b/gtk/usbutil.c
@@ -19,9 +19,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib-object.h>
 #include <glib/gi18n.h>
diff --git a/gtk/win-usb-dev.c b/gtk/win-usb-dev.c
index 14ab7af..1e4b2d6 100644
--- a/gtk/win-usb-dev.c
+++ b/gtk/win-usb-dev.c
@@ -20,9 +20,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <windows.h>
 #include <libusb.h>
diff --git a/gtk/win-usb-driver-install.c b/gtk/win-usb-driver-install.c
index 928b38f..e17287a 100644
--- a/gtk/win-usb-driver-install.c
+++ b/gtk/win-usb-driver-install.c
@@ -25,9 +25,7 @@
  * Each installer (instance) requests driver installation for a single device.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <windows.h>
 #include <gio/gio.h>
commit 62a077978b78d8ec49e6f797d418fff567ce4532
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 17:20:14 2014 +0100

    Remove spice-mime.xml/spicy.desktop
    
    They were never translated from .in files to actual files, and now it's
    clear we don't want to promote spicy as a first-class desktop
    application.

diff --git a/configure.ac b/configure.ac
index eee9a35..ce36d93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,7 +734,6 @@ spice-client-gtk-2.0.pc
 spice-client-gtk-3.0.pc
 spice-controller.pc
 data/Makefile
-data/spicy.desktop.in
 data/spicy.nsis
 po/Makefile.in
 gtk/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 71934af..a289c23 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,33 +1,13 @@
 NULL=
 
-# TODO: not sure if we want to do that
-#desktopdir       = $(datadir)/applications
-#desktop_in_files = spicy.desktop.in
-#desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
-#@INTLTOOL_DESKTOP_RULE@
-#
-#MIMEFILES = spice-mime.xml.in
-#mimedir = $(datadir)/mime/packages
-#mime_DATA = spice-mime.xml
-#@INTLTOOL_XML_RULE@
-
 EXTRA_DIST =					\
 	spicy.nsis				\
-	spice-mime.xml.in spicy.desktop.in      \
 	spice-protocol.vapi			\
 	gtkrc					\
 	$(desktop_in_files)			\
 	org.spice-space.lowlevelusbaccess.policy \
 	$(NULL)
 
-CLEANFILES =					\
-	$(desktop_DATA)				\
-	$(NULL)
-
-DISTCLEANFILES =				\
-	$(desktop_DATA)				\
-	$(NULL)
-
 vapidir = $(VAPIDIR)
 vapi_DATA = spice-protocol.vapi
 
diff --git a/data/spice-mime.xml.in b/data/spice-mime.xml.in
deleted file mode 100644
index 3bfd575..0000000
--- a/data/spice-mime.xml.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-	<mime-type type="application/x-spice">
-		<sub-class-of type="text/plain"/>
-		<_comment>Remote Desktop (SPICE) file</_comment>
-		<glob pattern="*.spice"/>
-	</mime-type>
-</mime-info>
diff --git a/data/spicy.desktop.in.in b/data/spicy.desktop.in.in
deleted file mode 100644
index b2e5b30..0000000
--- a/data/spicy.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=SPICE Remote Desktop Viewer
-_Comment=Access remote SPICE desktops
-Exec=spicy
-#Icon=spice
-Terminal=false
-MimeType=x-scheme-handler/spice
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Network;RemoteAccess;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3375ab5..d7bf614 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,3 @@
-data/spice-mime.xml.in
-data/spicy.desktop.in.in
 gtk/channel-usbredir.c
 gtk/desktop-integration.c
 gtk/spice-channel.c
commit 59d3eb17c2bb20a9847e54464b01841c5b2b02f2
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 17:18:04 2014 +0100

    Fix "can not" typo in comment

diff --git a/gtk/usb-device-widget.c b/gtk/usb-device-widget.c
index 69c74b3..74862ee 100644
--- a/gtk/usb-device-widget.c
+++ b/gtk/usb-device-widget.c
@@ -373,7 +373,7 @@ static void check_can_redirect(GtkWidget *widget, gpointer user_data)
                                                                 device, &err);
     gtk_widget_set_sensitive(widget, can_redirect);
 
-    /* If we can not redirect this device, append the error message to
+    /* If we cannot redirect this device, append the error message to
        err_msg, but only if it is *not* already there! */
     if (!can_redirect) {
         if (priv->err_msg) {
commit 3a20b4768833b49e031309ac53b2cc1b2790b1d3
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 17:14:15 2014 +0100

    Remove redundant use of const
    
    const guint16 const * has one extra 'const' which is removed by that
    commit

diff --git a/gtk/spice-widget-priv.h b/gtk/spice-widget-priv.h
index 597ce10..8be0644 100644
--- a/gtk/spice-widget-priv.h
+++ b/gtk/spice-widget-priv.h
@@ -104,7 +104,7 @@ struct _SpiceDisplayPrivate {
     bool                    keyboard_grab_active;
     bool                    keyboard_have_focus;
 
-    const guint16 const     *keycode_map;
+    const guint16          *keycode_map;
     size_t                  keycode_maplen;
     uint32_t                key_state[512 / 32];
     int                     key_delayed_scancode;
diff --git a/gtk/vncdisplaykeymap.c b/gtk/vncdisplaykeymap.c
index b2da5e5..340a86f 100644
--- a/gtk/vncdisplaykeymap.c
+++ b/gtk/vncdisplaykeymap.c
@@ -158,8 +158,8 @@ static gboolean check_for_xquartz(GdkDisplay *dpy)
 }
 #endif
 
-const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
-                                                        size_t *maplen)
+const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
+                                                  size_t *maplen)
 {
 #ifdef GDK_WINDOWING_X11
 	if (GDK_IS_X11_WINDOW(window)) {
@@ -262,7 +262,7 @@ const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
 	return NULL;
 }
 
-guint16 vnc_display_keymap_gdk2xtkbd(const guint16 const *keycode_map,
+guint16 vnc_display_keymap_gdk2xtkbd(const guint16 *keycode_map,
 				     size_t keycode_maplen,
 				     guint16 keycode)
 {
diff --git a/gtk/vncdisplaykeymap.h b/gtk/vncdisplaykeymap.h
index 3cb2abb..3ec55d5 100644
--- a/gtk/vncdisplaykeymap.h
+++ b/gtk/vncdisplaykeymap.h
@@ -24,8 +24,8 @@
 
 #include <glib.h>
 
-const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
-                                                        size_t *maplen);
+const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
+                                                  size_t *maplen);
 guint16 vnc_display_keymap_gdk2xtkbd(const guint16 *keycode_map,
                                      size_t keycode_maplen,
                                      guint16 keycode);
commit 53c1030054d3f417c1bfe740b6ca7afa409b4474
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 17:13:43 2014 +0100

    Remove trailing whitespace

diff --git a/gtk/decode-glz-tmpl.c b/gtk/decode-glz-tmpl.c
index ab09bba..b337a8b 100644
--- a/gtk/decode-glz-tmpl.c
+++ b/gtk/decode-glz-tmpl.c
@@ -133,7 +133,7 @@
     out->b = (out->b << 3) | ((out->b >> 2) & 0x07);                       \
     out->pad = 0;                                                          \
     out++;                                                                 \
-}                                                        
+}
 #endif
 #endif
 
commit 8ed3d76afd249ad779633f17f3c63cf9b0d45508
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 17:13:22 2014 +0100

    Remove blank lines at end of files

diff --git a/TODO b/TODO
index 73742ba..34e2c39 100644
--- a/TODO
+++ b/TODO
@@ -5,4 +5,3 @@
 See also list of bugs open:
 
 https://bugs.freedesktop.org/buglist.cgi?product=Spice&component=gtk-client&resolution=---&list_id=281013
-
diff --git a/doc/reference/spice-gtk.types b/doc/reference/spice-gtk.types
index db0374a..acd616d 100644
--- a/doc/reference/spice-gtk.types
+++ b/doc/reference/spice-gtk.types
@@ -44,4 +44,4 @@ spice_usb_device_get_type
 spice_usb_device_manager_get_type
 spice_usb_device_widget_get_type
 spice_port_channel_get_type
-spice_webdav_channel_get_type
\ No newline at end of file
+spice_webdav_channel_get_type
diff --git a/gtk/controller/dump.c b/gtk/controller/dump.c
index 306ff3a..5e951df 100644
--- a/gtk/controller/dump.c
+++ b/gtk/controller/dump.c
@@ -118,4 +118,3 @@ int main (int argc, char *argv[])
 
     return 0;
 }
-
diff --git a/gtk/controller/namedpipelistener.h b/gtk/controller/namedpipelistener.h
index 3084d00..c2dbd0a 100644
--- a/gtk/controller/namedpipelistener.h
+++ b/gtk/controller/namedpipelistener.h
@@ -68,4 +68,3 @@ SpiceNamedPipeConnection *  spice_named_pipe_listener_accept_finish  (SpiceNamed
 G_END_DECLS
 
 #endif /* __NAMED_PIPE_LISTENER_H__ */
-
diff --git a/gtk/controller/spice-controller-listener.h b/gtk/controller/spice-controller-listener.h
index fc6ba3d..a50bdea 100644
--- a/gtk/controller/spice-controller-listener.h
+++ b/gtk/controller/spice-controller-listener.h
@@ -45,6 +45,3 @@ GIOStream* spice_controller_listener_accept_finish (GObject *listener,
 G_END_DECLS
 
 #endif /* __SPICE_CONTROLLER_LISTENER_H__ */
-
-
-
diff --git a/gtk/controller/util.vala b/gtk/controller/util.vala
index 16f546c..acd677e 100644
--- a/gtk/controller/util.vala
+++ b/gtk/controller/util.vala
@@ -39,4 +39,4 @@ namespace SpiceCtrl {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/gtk/decode-glz-tmpl.c b/gtk/decode-glz-tmpl.c
index 63e3a36..ab09bba 100644
--- a/gtk/decode-glz-tmpl.c
+++ b/gtk/decode-glz-tmpl.c
@@ -334,4 +334,3 @@ static size_t FNAME(decode)(SpiceGlzDecoderWindow *window,
 #undef COPY_COMP_PIXEL
 #undef COPY_PLT_ENTRY
 #undef CAST_PLT_DISTANCE
-
diff --git a/gtk/smartcard-manager.h b/gtk/smartcard-manager.h
index 698357b..4811083 100644
--- a/gtk/smartcard-manager.h
+++ b/gtk/smartcard-manager.h
@@ -78,4 +78,3 @@ GList *spice_smartcard_manager_get_readers(SpiceSmartcardManager *manager);
 G_END_DECLS
 
 #endif /* __SPICE_SMARTCARD_MANAGER_H__ */
-
diff --git a/gtk/spice-audio-priv.h b/gtk/spice-audio-priv.h
index 71cc8ed..898c5a7 100644
--- a/gtk/spice-audio-priv.h
+++ b/gtk/spice-audio-priv.h
@@ -32,4 +32,3 @@ struct _SpiceAudioPrivate {
 G_END_DECLS
 
 #endif /* __SPICE_AUDIO_PRIVATE_H__ */
-
diff --git a/gtk/spice-channel-enums.h b/gtk/spice-channel-enums.h
index 30bfa51..02df762 100644
--- a/gtk/spice-channel-enums.h
+++ b/gtk/spice-channel-enums.h
@@ -5,7 +5,3 @@
 #include "spice-glib-enums.h"
 
 #endif /* SPICE_CHANNEL_ENUMS_H */
-
-
-
-
diff --git a/gtk/spice-client.c b/gtk/spice-client.c
index 4e7242f..5fd511f 100644
--- a/gtk/spice-client.c
+++ b/gtk/spice-client.c
@@ -25,4 +25,3 @@ GQuark spice_client_error_quark(void)
 {
     return g_quark_from_static_string("spice-client-error-quark");
 }
-
commit 20316442a5f80fc475543ceb79cdee98907dba61
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 17:07:43 2014 +0100

    Add missing (C) to Red Hat copyright line
    
    gnulib's make syntax-check comes with a rule enforcing that Red Hat
    copyright lines contain both "(C)" and "Copyright".

diff --git a/gtk/channel-usbredir.c b/gtk/channel-usbredir.c
index a52476a..5238566 100644
--- a/gtk/channel-usbredir.c
+++ b/gtk/channel-usbredir.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
-   Copyright 2010-2012 Red Hat, Inc.
+   Copyright (C) 2010-2012 Red Hat, Inc.
 
    Red Hat Authors:
    Hans de Goede <hdegoede at redhat.com>
commit 51534180d3eac1783c370ec90a32b093da320cfe
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 17:00:27 2014 +0100

    Add quoting around AC_DEFINE* first argument

diff --git a/configure.ac b/configure.ac
index 35a2140..eee9a35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,7 +285,7 @@ else
   fi
 fi
 AS_IF([test "x$have_phodav" = "xyes"],
-       AC_DEFINE(USE_PHODAV, [1], [Define if supporting phodav]))
+       AC_DEFINE([USE_PHODAV], [1], [Define if supporting phodav]))
 
 AC_ARG_WITH([audio],
   AS_HELP_STRING([--with-audio=@<:@gstreamer/pulse/auto/no@:>@], [Select audio backend @<:@default=auto@:>@]),
@@ -360,7 +360,7 @@ if test "x$enable_smartcard" != "xno"; then
     AC_MSG_ERROR("Smartcard support requested but libcacard could not be found")
   fi
   if test "x$have_smartcard" = "xyes"; then
-    AC_DEFINE(USE_SMARTCARD, [1], [Define if supporting smartcard proxying])
+    AC_DEFINE([USE_SMARTCARD], [1], [Define if supporting smartcard proxying])
   fi
 fi
 AM_CONDITIONAL([WITH_SMARTCARD], [test "x$have_smartcard" = "xyes"])
@@ -394,7 +394,7 @@ else
     PKG_CHECK_MODULES([LIBUSB_HOTPLUG], [libusb-1.0 >= 1.0.16],
                       [have_libusb_hotplug=yes], [have_libusb_hotplug=no])
     if test "x$have_libusb_hotplug" = "xyes"; then
-      AC_DEFINE(USE_LIBUSB_HOTPLUG, [1], [Define if libusb has hotplug support])
+      AC_DEFINE([USE_LIBUSB_HOTPLUG], [1], [Define if libusb has hotplug support])
       with_usbredir_hotplug="with libusb hotplug"
     else
       PKG_CHECK_MODULES([GUDEV],
@@ -406,7 +406,7 @@ else
         AC_MSG_ERROR([usbredir requested but required gudev is not available])
       fi
       if test "x$have_gudev" = "xyes"; then
-        AC_DEFINE(USE_GUDEV, [1], [Define if supporting gudev])
+        AC_DEFINE([USE_GUDEV], [1], [Define if supporting gudev])
         with_usbredir_hotplug="with gudev hotplug"
       else
         have_usbredir=no
@@ -415,7 +415,7 @@ else
   fi
 
   if test "x$have_usbredir" = "xyes"; then
-    AC_DEFINE(USE_USBREDIR, [1], [Define if supporting usbredir proxying])
+    AC_DEFINE([USE_USBREDIR], [1], [Define if supporting usbredir proxying])
   fi
 fi
 AM_CONDITIONAL([WITH_USBREDIR], [test "x$have_usbredir" = "xyes"])
@@ -438,16 +438,16 @@ if test "x$have_usbredir" = "xyes" && test "x$enable_polkit" != "xno"; then
 
   if test "x$have_polkit" = "xyes"; then
     AC_SUBST(ACL_LIBS)
-    AC_DEFINE(USE_POLKIT, [1], [Define if supporting polkit])
+    AC_DEFINE([USE_POLKIT], [1], [Define if supporting polkit])
   fi
   AM_CONDITIONAL([WITH_POLKIT], [test "x$have_polkit" = "xyes"])
   POLICYDIR=`${PKG_CONFIG} polkit-gobject-1 --variable=policydir`
   AC_SUBST(POLICYDIR)
   # Check for polkit_authority_get_sync()
   AC_CHECK_LIB([polkit-gobject-1], [polkit_authority_get_sync], ac_have_pk_auth_get_sync="1", ac_have_pk_auth_get_sync="0")
-  AC_DEFINE_UNQUOTED(HAVE_POLKIT_AUTHORITY_GET_SYNC, $ac_have_pk_auth_get_sync, [Define if you have a polkit with polkit_authority_get_sync()])
+  AC_DEFINE_UNQUOTED([HAVE_POLKIT_AUTHORITY_GET_SYNC], $ac_have_pk_auth_get_sync, [Define if you have a polkit with polkit_authority_get_sync()])
   AC_CHECK_LIB([polkit-gobject-1], [polkit_authorization_result_get_dismissed], ac_have_pk_authorization_result_get_dismissed="1", ac_have_pk_authorization_result_get_dismissed="0")
-  AC_DEFINE_UNQUOTED(HAVE_POLKIT_AUTHORIZATION_RESULT_GET_DISMISSED, $ac_have_pk_authorization_result_get_dismissed, [Define if you have a polkit with polkit_authorization_result_get_dismissed()])
+  AC_DEFINE_UNQUOTED([HAVE_POLKIT_AUTHORIZATION_RESULT_GET_DISMISSED], $ac_have_pk_authorization_result_get_dismissed, [Define if you have a polkit with polkit_authorization_result_get_dismissed()])
 else
   AM_CONDITIONAL(WITH_POLKIT, false)
 fi
@@ -508,7 +508,7 @@ fi
 if test -n "$USB_IDS"; then
   AC_MSG_RESULT([$USB_IDS])
   AC_SUBST(USB_IDS)
-  AC_DEFINE(WITH_USBIDS, [1], [Define if compiling with usb.ids support])
+  AC_DEFINE([WITH_USBIDS], [1], [Define if compiling with usb.ids support])
 else
   AC_MSG_RESULT([not found])
 fi
@@ -549,13 +549,13 @@ case $with_coroutine in
   *) AC_MSG_ERROR(Unsupported coroutine type)
 esac
 
-AC_DEFINE_UNQUOTED(WITH_UCONTEXT,[$WITH_UCONTEXT], [Whether to use ucontext coroutine impl])
+AC_DEFINE_UNQUOTED([WITH_UCONTEXT],[$WITH_UCONTEXT], [Whether to use ucontext coroutine impl])
 AM_CONDITIONAL(WITH_UCONTEXT, [test "x$WITH_UCONTEXT" = "x1"])
 
-AC_DEFINE_UNQUOTED(WITH_WINFIBER,[$WITH_WINFIBER], [Whether to use fiber coroutine impl])
+AC_DEFINE_UNQUOTED([WITH_WINFIBER],[$WITH_WINFIBER], [Whether to use fiber coroutine impl])
 AM_CONDITIONAL(WITH_WINFIBER, [test "x$WITH_WINFIBER" = "x1"])
 
-AC_DEFINE_UNQUOTED(WITH_GTHREAD,[$WITH_GTHREAD], [Whether to use gthread coroutine impl])
+AC_DEFINE_UNQUOTED([WITH_GTHREAD],[$WITH_GTHREAD], [Whether to use gthread coroutine impl])
 AM_CONDITIONAL(WITH_GTHREAD, [test "x$WITH_GTHREAD" = "x1"])
 
 AM_CONDITIONAL([HAVE_INTROSPECTION], [test "0" = "1"])
@@ -680,11 +680,11 @@ AC_ARG_ENABLE([dbus],
 have_dbus=no
 if test "x$enable_dbus" != "xno"; then
   if test "x$have_gio26" = "xyes"; then
-    AC_DEFINE(USE_GDBUS, [1], [Define if supporting gdbus])
+    AC_DEFINE([USE_GDBUS], [1], [Define if supporting gdbus])
     have_dbus=gdbus
   else
     PKG_CHECK_EXISTS([DBUS_GLIB], [dbus-glib-1], [
-      AC_DEFINE(USE_DBUS_GLIB, [1], [Define if supporting dbus-glib])
+      AC_DEFINE([USE_DBUS_GLIB], [1], [Define if supporting dbus-glib])
       have_dbus=dbus-glib
     ])
   fi
commit 94142f51b871362988e936a27844344cc9635143
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 29 16:59:33 2014 +0100

    build-sys: Don't use test -a/-o
    
    They are not portable, it's recommended to use test && test or test ||
    test instead

diff --git a/configure.ac b/configure.ac
index 0d65823..35a2140 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,7 @@ SASL_CFLAGS=
 SASL_LIBS=
 enable_sasl=no
 if test "x$with_sasl" != "xno"; then
-  if test "x$with_sasl" != "xyes" -a "x$with_sasl" != "xauto"; then
+  if test "x$with_sasl" != "xyes" && test "x$with_sasl" != "xauto"; then
     SASL_CFLAGS="-I$with_sasl"
     SASL_LIBS="-L$with_sasl"
   fi
@@ -133,7 +133,7 @@ if test "x$with_sasl" != "xno"; then
   if test "x$with_sasl" = "xyes" ; then
     AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl2=yes],[with_sasl2=no])
   fi
-  if test "x$with_sasl2" = "xno" -a "x$with_sasl" = "xyes" ; then
+  if test "x$with_sasl2" = "xno" && test "x$with_sasl" = "xyes" ; then
     AC_CHECK_LIB([sasl], [sasl_client_init],[with_sasl=yes],[with_sasl=no])
   fi
   if test "x$with_sasl2" = "xyes"; then
@@ -145,13 +145,13 @@ if test "x$with_sasl" != "xno"; then
   fi
   CFLAGS="$old_cflags"
   LIBS="$old_libs"
-  if test "x$with_sasl2" = "xyes" -o "x$with_sasl" = "xyes" ; then
+  if test "x$with_sasl2" = "xyes" || test "x$with_sasl" = "xyes" ; then
     AC_DEFINE_UNQUOTED([HAVE_SASL], 1,
       [whether Cyrus SASL is available for authentication])
     enable_sasl=yes
   fi
 fi
-AM_CONDITIONAL([HAVE_SASL], [test "x$with_sasl2" = "xyes" -o "x$with_sasl" = "xyes"])
+AM_CONDITIONAL([HAVE_SASL], [test "x$with_sasl2" = "xyes" || test "x$with_sasl" = "xyes"])
 AC_SUBST([SASL_CFLAGS])
 AC_SUBST([SASL_LIBS])
 
