Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Drop leftover use of a union.
2007-08-01  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.c (get_special_folder): Drop leftover use of a
	union.


svn path=/trunk/; revision=5661
  • Loading branch information
Tor Lillqvist authored and Tor Lillqvist committed Aug 1, 2007
1 parent 164f21f commit 75f974d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
@@ -1,5 +1,8 @@
2007-08-01 Tor Lillqvist <tml@novell.com>

* glib/gutils.c (get_special_folder): Drop leftover use of a
union.

* glibconfig.h.win32.in: Update to match what configure produces.

2007-07-31 Matthias Clasen <mclasen@redhat.com>
Expand Down
9 changes: 3 additions & 6 deletions glib/gutils.c
Expand Up @@ -1409,10 +1409,7 @@ static gchar **g_user_special_dirs = NULL;
static gchar *
get_special_folder (int csidl)
{
union {
char c[MAX_PATH+1];
wchar_t wc[MAX_PATH+1];
} path;
wchar_t path[MAX_PATH+1];
HRESULT hr;
LPITEMIDLIST pidl = NULL;
BOOL b;
Expand All @@ -1421,9 +1418,9 @@ get_special_folder (int csidl)
hr = SHGetSpecialFolderLocation (NULL, csidl, &pidl);
if (hr == S_OK)
{
b = SHGetPathFromIDListW (pidl, path.wc);
b = SHGetPathFromIDListW (pidl, path);
if (b)
retval = g_utf16_to_utf8 (path.wc, -1, NULL, NULL, NULL);
retval = g_utf16_to_utf8 (path, -1, NULL, NULL, NULL);
CoTaskMemFree (pidl);
}
return retval;
Expand Down

0 comments on commit 75f974d

Please sign in to comment.