From e087f8c43c6456bc638fee2ee687575e3320bc10 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 6 Jun 2007 19:13:45 +0000 Subject: [PATCH] Add definitions for more CSIDL_* constants in case missing from headers. 2007-06-06 Tor Lillqvist * 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 --- ChangeLog | 7 +++++++ glib/gutils.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f595ed4..89a9a89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-06-06 Tor Lillqvist + + * 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 * glib/gutils.c (g_get_user_special_dir): Fall back to diff --git a/glib/gutils.c b/glib/gutils.c index e9ae8d1..32af311 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -87,6 +87,12 @@ # include # include /* 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 -- 2.7.4