diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-06-06 19:13:45 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-06-06 19:13:45 +0000 |
| commit | e087f8c43c6456bc638fee2ee687575e3320bc10 (patch) | |
| tree | 129b0c00d653d0e4f735fd7fc795d0ab7b81be78 /glib/gutils.c | |
| parent | f6f9877b50c5090e4f226ab52a4a3a32b17de1c7 (diff) | |
| download | glib-e087f8c43c6456bc638fee2ee687575e3320bc10.tar.gz | |
Add definitions for more CSIDL_* constants in case missing from headers.
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
Diffstat (limited to 'glib/gutils.c')
| -rw-r--r-- | glib/gutils.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/glib/gutils.c b/glib/gutils.c index e9ae8d1b8..32af31166 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -87,6 +87,12 @@ # include <direct.h> # include <shlobj.h> /* 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 # define CSIDL_INTERNET_CACHE 32 # endif @@ -2172,7 +2178,7 @@ static 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_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_MUSIC] = get_special_folder (CSIDL_MYMUSIC); 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: * * 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, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |