luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio/gdbusaddress.c: Silence RunDLL errors

Browse Source 
The RunDLL command call during get_session_address_dbus_launch() was
expecting _g_win32_run_session_bus@16 and g_win32_run_session_bus
on Win32 and Win64 respectively at least when GLib is compiled with MSVC,
not g_win32_run_session_bus@16, which caused annoying RunDLL error dialogue
boxes to show up during the use of GtkApplication (such as when running
gtk3-demo-application on Windows), prevented GtkApplication items from
being run for more than one time during the lifespan of the program,
and this also interfered with some GTK+ tests, causing them to fail.

Update accordingly to address the issue.
This commit is contained in:
Chun-wei Fan 2013-08-15 21:27:02 +08:00
parent 2ff85ca47c
commit bb7b0a8ca0
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/gdbusaddress.c
View File

@ -1400,7 +1400,15 @@ get_session_address_dbus_launch (GError **error)
wcscat (args, rundll_path);
wcscat (args, L"\" ");
wcscat (args, gio_path_short);
#ifdef _MSC_VER
#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
wcscat (args, L",g_win32_run_session_bus");
#else
wcscat (args, L",_g_win32_run_session_bus@16");
#endif
#else
wcscat (args, L",g_win32_run_session_bus@16");
#endif
res = CreateProcessW (rundll_path, args,
0, 0, FALSE,