diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-09-13 19:31:29 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-09-13 19:31:29 +0000 |
| commit | 4125df1d8ec75641728902c135a0499197d5f6c6 (patch) | |
| tree | 272f135d088c0a41371fcf19d0aab2991a12b6b4 /gdk-pixbuf | |
| parent | 42ec45e3c2dc352b8e5d96ffdae9b81e779f80e5 (diff) | |
| download | gdk-pixbuf-4125df1d8ec75641728902c135a0499197d5f6c6.tar.gz | |
gdk-pixbuf/gdk-pixbuf-io.c Don't use the deprectated
2008-09-13 Tor Lillqvist <tml@novell.com>
* gdk-pixbuf/gdk-pixbuf-io.c
* gtk/gtkmain.c: Don't use the deprectated
g_win32_get_package_installation_directory() and
g_win32_get_package_installation_subdirectory() functions. Use
g_win32_get_package_installation_directory_of_module()
instead. Also, don't use the deprecated silly
G_WIN32_DLLMAIN_FOR_DLL_NAME macro, but an explicit minimal
DllMain() that just saves the DLL handle.
svn path=/trunk/; revision=21381
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 9 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 25 |
2 files changed, 25 insertions, 9 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 841ff5e62..946f9004a 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,8 +1,11 @@ 2008-09-13 Tor Lillqvist <tml@novell.com> - * gdk-pixbuf-io.c: Do as the docs for - g_win32_get_package_installation_directory() say and pass NULL as - the first parameter. + * gdk-pixbuf-io.c: Don't use the deprectated + g_win32_get_package_installation_subdirectory(). Use + g_win32_get_package_installation_directory_of_module() + instead. Also, don't use the deprecated silly + G_WIN32_DLLMAIN_FOR_DLL_NAME() macro, but an explicit minimal + DllMain() that just saves the DLL handle. 2008-09-07 Matthias Clasen <mclasen@redhat.com> diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 967febbbd..d6ddce76a 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -228,8 +228,23 @@ skip_space (const char **pos) #ifdef G_OS_WIN32 -/* DllMain function needed to tuck away the gdk-pixbuf DLL name */ -G_WIN32_DLLMAIN_FOR_DLL_NAME (static, dll_name) +/* DllMain function needed to tuck away the gdk-pixbuf DLL handle */ + +static HMODULE gdk_pixbuf_dll; + +BOOL WINAPI +DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) { + case DLL_PROCESS_ATTACH: + gdk_pixbuf_dll = (HMODULE) hinstDLL; + break; + } + + return TRUE; +} static char * get_toplevel (void) @@ -237,8 +252,7 @@ get_toplevel (void) static char *toplevel = NULL; if (toplevel == NULL) - toplevel = g_win32_get_package_installation_subdirectory - (NULL, dll_name, ""); + toplevel = g_win32_get_package_installation_directory_of_module (gdk_pixbuf_dll); return toplevel; } @@ -249,8 +263,7 @@ get_sysconfdir (void) static char *sysconfdir = NULL; if (sysconfdir == NULL) - sysconfdir = g_win32_get_package_installation_subdirectory - (NULL, dll_name, "etc"); + sysconfdir = g_build_filename (get_toplevel (), "etc", NULL); return sysconfdir; } |