mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-03-14 19:55:12 +01:00
Merge branch 'wip/smcv/gdbus-server-auth-test' into 'master'
gdbus-server-auth test: Include gcredentialsprivate.h See merge request GNOME/glib!1210
This commit is contained in:
commit
f371b2a9d3
@ -22,6 +22,9 @@
|
|||||||
#include <glib/gstdio.h>
|
#include <glib/gstdio.h>
|
||||||
#include <gio/gio.h>
|
#include <gio/gio.h>
|
||||||
|
|
||||||
|
/* For G_CREDENTIALS_*_SUPPORTED */
|
||||||
|
#include <gio/gcredentialsprivate.h>
|
||||||
|
|
||||||
#ifdef HAVE_DBUS1
|
#ifdef HAVE_DBUS1
|
||||||
#include <dbus/dbus.h>
|
#include <dbus/dbus.h>
|
||||||
#endif
|
#endif
|
||||||
@ -441,6 +444,10 @@ do_test_server_auth (InteropFlags flags)
|
|||||||
g_test_skip ("Testing interop with libdbus not supported");
|
g_test_skip ("Testing interop with libdbus not supported");
|
||||||
#endif /* !HAVE_DBUS1 */
|
#endif /* !HAVE_DBUS1 */
|
||||||
|
|
||||||
|
/* No practical effect, just to avoid -Wunused-label under some
|
||||||
|
* combinations of #ifdefs */
|
||||||
|
goto out;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (server != NULL)
|
if (server != NULL)
|
||||||
g_dbus_server_stop (server);
|
g_dbus_server_stop (server);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user