luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 15:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add definitions for more CSIDL_* constants in case missing from headers.

Browse Source 
2007-06-06  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.c: Add definitions for more CSIDL_* constants in
	case missing from headers. Use CSIDL_PERSONAL instead of
	CSIDL_MYDOCUMENTS as CSIDL_MYDOCUMENTS seems to be a new thing
	that doesn't work in XP SP2 even.


svn path=/trunk/; revision=5544
This commit is contained in:
Tor Lillqvist 2007-06-06 19:13:45 +00:00 committed by Tor Lillqvist
parent f6f9877b50
commit e087f8c43c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-06-06 Tor Lillqvist <tml@novell.com>
* glib/gutils.c: Add definitions for more CSIDL_* constants in
case missing from headers. Use CSIDL_PERSONAL instead of
CSIDL_MYDOCUMENTS as CSIDL_MYDOCUMENTS seems to be a new thing
that doesn't work in XP SP2 even.
2007-06-06 Matthias Clasen <mclasen@redhat.com> 2007-06-06 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.c (g_get_user_special_dir): Fall back to * glib/gutils.c (g_get_user_special_dir): Fall back to

10
glib/gutils.c
View File

@ -87,6 +87,12 @@
# include <direct.h> # include <direct.h>
# include <shlobj.h> # include <shlobj.h>
/* older SDK (e.g. msvc 5.0) does not have these*/ /* older SDK (e.g. msvc 5.0) does not have these*/
# ifndef CSIDL_MYMUSIC
# define CSIDL_MYMUSIC 13
# endif
# ifndef CSIDL_MYVIDEO
# define CSIDL_MYVIDEO 14
# endif
# ifndef CSIDL_INTERNET_CACHE # ifndef CSIDL_INTERNET_CACHE
# define CSIDL_INTERNET_CACHE 32 # define CSIDL_INTERNET_CACHE 32
# endif # endif
@ -2172,7 +2178,7 @@ static void
load_user_special_dirs (void) load_user_special_dirs (void)
{ {
g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = get_special_folder (CSIDL_DESKTOPDIRECTORY); g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = get_special_folder (CSIDL_DESKTOPDIRECTORY);
g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = get_special_folder (CSIDL_MYDOCUMENTS); g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = get_special_folder (CSIDL_PERSONAL);
g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = get_special_folder (CSIDL_DESKTOPDIRECTORY); /* XXX correct ? */ g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = get_special_folder (CSIDL_DESKTOPDIRECTORY); /* XXX correct ? */
g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = get_special_folder (CSIDL_MYMUSIC); g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = get_special_folder (CSIDL_MYMUSIC);
g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = get_special_folder (CSIDL_MYPICTURES); g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = get_special_folder (CSIDL_MYPICTURES);
@ -2267,7 +2273,7 @@ static void g_init_user_config_dir (void);
* subject to the following conditions: * subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be * The above copyright notice and this permission notice shall be
/* included in all copies or substantial portions of the Software. * included in all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF