[Spice-commits] gtk/desktop-integration.c

[Marc-André Lureau]

 gtk/desktop-integration.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c5968967475bd29ae9c08d86f52040520321e908
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Sun Jul 8 17:27:17 2012 +0200

    Fix mingw build
    
    printf is redefined by glib/gi18n.h
    
    In file included from ../spice-common/common/spice_common.h:29:0,
                     from ../spice-common/common/ring.h:23,
                     from spice-channel-cache.h:23,
                     from spice-session-priv.h:26,
                     from desktop-integration.c:29:
    ../spice-common/common/log.h:49:17: error: 'libintl_printf' is an unrecognized format function type [-Werror=format]
    ../spice-common/common/log.h:56:16: error: 'libintl_printf' is an unrecognized format function type [-Werror=format]
    In file included from ../spice-common/common/canvas_base.h:25:0,
                     from decode.h:23,
                     from spice-session-priv.h:27,
                     from desktop-integration.c:29:
    ../spice-common/common/lz.h:22:5: error: 'libintl_printf' is an unrecognized format function type [-Werror=format]
    ../spice-common/common/lz.h:23:5: error: 'libintl_printf' is an unrecognized format function type [-Werror=format]
    ../spice-common/common/lz.h:24:5: error: 'libintl_printf' is an unrecognized format function type [-Werror=format]

diff --git a/gtk/desktop-integration.c b/gtk/desktop-integration.c
index 9261406..044e0d3 100644
--- a/gtk/desktop-integration.c
+++ b/gtk/desktop-integration.c
@@ -20,15 +20,18 @@
 */
 
 #include "config.h"
+
 #include <glib-object.h>
-#include <glib/gi18n.h>
 #ifdef USE_DBUS
 #include <dbus/dbus-glib.h>
 #endif
+
 #include "glib-compat.h"
 #include "spice-session-priv.h"
 #include "desktop-integration.h"
 
+#include <glib/gi18n.h>
+
 #define GNOME_SESSION_INHIBIT_AUTOMOUNT 16
 
 /* ------------------------------------------------------------------ */