luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-14 13:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio: Fix gio-tool-open.c on Windows/Cocoa

Browse Source 
Commit 7384e37 broke builds on these platforms as *NIX-only APIs are
being used unconditionally.  Fix the build by building these portions
when not on Windows or Cocoa.

https://bugzilla.gnome.org/show_bug.cgi?id=780296
This commit is contained in:
Chun-wei Fan 2017-10-07 10:44:28 +08:00
parent 7384e372f0
commit a804fcba7a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gio-tool-open.c
View File

@ -20,7 +20,11 @@
#include "config.h" #include "config.h"
#include <gio/gio.h> #include <gio/gio.h>
#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
#include <gio/gdesktopappinfo.h> #include <gio/gdesktopappinfo.h>
#endif
#include <gi18n.h> #include <gi18n.h>
#include "gio-tool.h" #include "gio-tool.h"
@ -30,6 +34,7 @@ static const GOptionEntry entries[] = {
{ NULL } { NULL }
}; };
#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
static gboolean static gboolean
get_bus_name_and_path_from_uri (const char *uri, get_bus_name_and_path_from_uri (const char *uri,
char **bus_name_out, char **bus_name_out,
@ -90,6 +95,7 @@ out:
return got_name; return got_name;
} }
#endif
int int
handle_open (int argc, char *argv[], gboolean do_help) handle_open (int argc, char *argv[], gboolean do_help)
@ -154,6 +160,7 @@ handle_open (int argc, char *argv[], gboolean do_help)
success = FALSE; success = FALSE;
} }
#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
/* FIXME: This chunk of madness is a workaround for a dbus-daemon bug. /* FIXME: This chunk of madness is a workaround for a dbus-daemon bug.
* See https://bugzilla.gnome.org/show_bug.cgi?id=780296 * See https://bugzilla.gnome.org/show_bug.cgi?id=780296
*/ */
@ -180,6 +187,7 @@ handle_open (int argc, char *argv[], gboolean do_help)
g_free (object_path); g_free (object_path);
} }
} }
#endif
g_object_unref (file); g_object_unref (file);
g_free (uri); g_free (uri);