AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compiling for win32

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=687066
This commit is contained in:
Hib Eris 2012-10-28 20:05:23 +01:00
parent 63c75a2384
commit 99e194e7cc
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtk-launch.c
View File

@ -28,7 +28,9 @@
#include <glib.h> #include <glib.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gio/gio.h> #include <gio/gio.h>
#ifdef G_OS_UNIX
#include <gio/gdesktopappinfo.h> #include <gio/gdesktopappinfo.h>
#endif
#include <gtk.h> #include <gtk.h>
static gchar **args = NULL; static gchar **args = NULL;
@ -45,8 +47,10 @@ main (int argc, char *argv[])
GOptionContext *context = NULL; GOptionContext *context = NULL;
gchar *summary; gchar *summary;
gchar *app_name; gchar *app_name;
#ifdef G_OS_UNIX
gchar *desktop_file_name; gchar *desktop_file_name;
GDesktopAppInfo *info; #endif
GAppInfo *info = NULL;
GAppLaunchContext *launch_context; GAppLaunchContext *launch_context;
GList *l; GList *l;
GFile *f; GFile *f;
@ -107,12 +111,17 @@ main (int argc, char *argv[])
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
app_name = *args; app_name = *args;
#ifdef G_OS_UNIX
if (g_str_has_suffix (app_name, ".desktop")) if (g_str_has_suffix (app_name, ".desktop"))
desktop_file_name = g_strdup (app_name); desktop_file_name = g_strdup (app_name);
else else
desktop_file_name = g_strconcat (app_name, ".desktop", NULL); 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); g_free (desktop_file_name);
#else
#warning Please add support for creating AppInfo from id for your OS
g_printerr (_("Creating AppInfo from id not supported on non unix operating systems"));
#endif
args++; args++;
if (!info) if (!info)
@ -133,7 +142,7 @@ main (int argc, char *argv[])
} }
launch_context = (GAppLaunchContext*) gdk_display_get_app_launch_context (gdk_display_get_default ()); 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 */ /* Translators: the first %s is the program name, the second one */
/* is the error message. */ /* is the error message. */