[gimp/soc-2011-seamless-clone2] Bug 688316 - get_special_folder reverted to exact same implementation as glib.



commit 614a74af2ad39e970e8f2cb48cfc6ac6fcbf47db
Author: Jehan <jehan girinstud io>
Date:   Wed Jan 23 15:38:21 2013 +0900

    Bug 688316 - get_special_folder reverted to exact same implementation as glib.
    
    I used SHGetFolderLocation, deprecated, which I thought was a better idea than
    SHGetSpecialFolderLocation, deprecated as well, but also unsupported. But it
    apparently won't compile on XP. Reverts back to glib exact copy.

 libgimpbase/gimpenv.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libgimpbase/gimpenv.c b/libgimpbase/gimpenv.c
index 71384d8..836ca8f 100644
--- a/libgimpbase/gimpenv.c
+++ b/libgimpbase/gimpenv.c
@@ -291,7 +291,7 @@ gimp_directory (void)
 
 #ifdef G_OS_WIN32
 
-/* Taken and slightly modified from glib 2.34.0 code. */
+/* Taken from glib 2.35 code. */
 static gchar *
 get_special_folder (int csidl)
 {
@@ -301,7 +301,7 @@ get_special_folder (int csidl)
   BOOL         b;
   gchar       *retval = NULL;
 
-  hr = SHGetFolderLocation (NULL, csidl, NULL, 0, &pidl);
+  hr = SHGetSpecialFolderLocation (NULL, csidl, &pidl);
   if (hr == S_OK)
     {
       b = SHGetPathFromIDListW (pidl, path);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]