File 0001-Fix-compiling-for-win32.patch of Package mingw32-gtk3

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-compiling-for-win32.patch of Package mingw32-gtk3 (Revision bf4d4b8844df7be264f4b19ef0d90c40)

Currently displaying revision bf4d4b8844df7be264f4b19ef0d90c40 , Show latest

From 09982ac163898791ab17e0e4dc34bf7eb4fa7f00 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Sun, 28 Oct 2012 20:05:23 +0100
Subject: [PATCH] Fix compiling for win32

---
 gtk/gtk-launch.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gtk/gtk-launch.c b/gtk/gtk-launch.c
index 6d5be1c..4ab931c 100644
--- a/gtk/gtk-launch.c
+++ b/gtk/gtk-launch.c
@@ -28,7 +28,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
+#ifdef G_OS_UNIX
 #include <gio/gdesktopappinfo.h>
+#endif
 #include <gtk.h>
 
 static gchar **args = NULL;
@@ -45,8 +47,10 @@ main (int argc, char *argv[])
   GOptionContext *context = NULL;
   gchar *summary;
   gchar *app_name;
+#ifdef G_OS_UNIX
   gchar *desktop_file_name;
-  GDesktopAppInfo *info;
+#endif
+  GAppInfo *info = NULL;
   GAppLaunchContext *launch_context;
   GList *l;
   GFile *f;
@@ -107,12 +111,16 @@ main (int argc, char *argv[])
   gtk_init (&argc, &argv);
 
   app_name = *args;
+#ifdef G_OS_UNIX
   if (g_str_has_suffix (app_name, ".desktop"))
     desktop_file_name = g_strdup (app_name);
   else 
     desktop_file_name = g_strconcat (app_name, ".desktop", NULL);
-  info = g_desktop_app_info_new (desktop_file_name);
+  info = G_APP_INFO (g_desktop_app_info_new (desktop_file_name));
   g_free (desktop_file_name);
+#else
+  g_printerr (_("Creating AppInfo from id not supported on non unix operating systems"));
+#endif
   args++;
 
   if (!info)
@@ -133,7 +141,7 @@ main (int argc, char *argv[])
     }
 
   launch_context = (GAppLaunchContext*) gdk_display_get_app_launch_context (gdk_display_get_default ());
-  if (!g_app_info_launch (G_APP_INFO (info), l, launch_context, &error))
+  if (!g_app_info_launch (info, l, launch_context, &error))
     {
        /* Translators: the first %s is the program name, the second one  */
        /* is the error message.                                          */
-- 
1.7.5.4

Places

File 0001-Fix-compiling-for-win32.patch of Package mingw32-gtk3 (Revision bf4d4b8844df7be264f4b19ef0d90c40)

Places