AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdk-pixbuf/gdk-pixbuf-io.c Don't use the deprectated

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2008-09-13 19:31:29 +00:00 committed by Tor Lillqvist
parent 42ec45e3c2
commit 4125df1d8e
4 changed files with 71 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,13 @@
2008-09-13 Tor Lillqvist <tml@novell.com>
* 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.
2008-09-13 Cosimo Cecchi <cosimoc@gnome.org> 2008-09-13 Cosimo Cecchi <cosimoc@gnome.org>
Bug 552153 – GtkModules loading with XSettings doesn't work if the Bug 552153 – GtkModules loading with XSettings doesn't work if the
@ -8,12 +18,6 @@
Call _gtk_modules_init () even if gtk_modules_string is NULL, so Call _gtk_modules_init () even if gtk_modules_string is NULL, so
that GtkModules specified with XSettings could be loaded. that GtkModules specified with XSettings could be loaded.
2008-09-13 Tor Lillqvist <tml@novell.com>
* gtk/gtkmain.c: Do as the docs for
g_win32_get_package_installation_directory() say and pass NULL as
the first parameter.
2008-09-11 Cosimo Cecchi <cosimoc@gnome.org> 2008-09-11 Cosimo Cecchi <cosimoc@gnome.org>
Bug 536542 – gtk_list_store_set() documentation doesn't say whether Bug 536542 – gtk_list_store_set() documentation doesn't say whether

9
gdk-pixbuf/ChangeLog
View File

@ -1,8 +1,11 @@
2008-09-13 Tor Lillqvist <tml@novell.com> 2008-09-13 Tor Lillqvist <tml@novell.com>
* gdk-pixbuf-io.c: Do as the docs for * gdk-pixbuf-io.c: Don't use the deprectated
g_win32_get_package_installation_directory() say and pass NULL as g_win32_get_package_installation_subdirectory(). Use
the first parameter. 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> 2008-09-07 Matthias Clasen <mclasen@redhat.com>

25
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -228,8 +228,23 @@ skip_space (const char **pos)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
/* DllMain function needed to tuck away the gdk-pixbuf DLL name */ /* DllMain function needed to tuck away the gdk-pixbuf DLL handle */
G_WIN32_DLLMAIN_FOR_DLL_NAME (static, dll_name)
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 * static char *
get_toplevel (void) get_toplevel (void)
@ -237,8 +252,7 @@ get_toplevel (void)
static char *toplevel = NULL; static char *toplevel = NULL;
if (toplevel == NULL) if (toplevel == NULL)
toplevel = g_win32_get_package_installation_subdirectory toplevel = g_win32_get_package_installation_directory_of_module (gdk_pixbuf_dll);
(NULL, dll_name, "");
return toplevel; return toplevel;
} }
@ -249,8 +263,7 @@ get_sysconfdir (void)
static char *sysconfdir = NULL; static char *sysconfdir = NULL;
if (sysconfdir == NULL) if (sysconfdir == NULL)
sysconfdir = g_win32_get_package_installation_subdirectory sysconfdir = g_build_filename (get_toplevel (), "etc", NULL);
(NULL, dll_name, "etc");
return sysconfdir; return sysconfdir;
} }

48
gtk/gtkmain.c
View File

@ -68,7 +68,22 @@
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name) static HMODULE gtk_dll;
BOOL WINAPI
DllMain (HINSTANCE hinstDLL,
DWORD fdwReason,
LPVOID lpvReserved)
{
switch (fdwReason)
{
case DLL_PROCESS_ATTACH:
gtk_dll = (HMODULE) hinstDLL;
break;
}
return TRUE;
}
/* This here before inclusion of gtkprivate.h so that it sees the /* This here before inclusion of gtkprivate.h so that it sees the
* original GTK_LOCALEDIR definition. Yeah, this is a bit sucky. * original GTK_LOCALEDIR definition. Yeah, this is a bit sucky.
@ -80,7 +95,7 @@ _gtk_get_localedir (void)
if (gtk_localedir == NULL) if (gtk_localedir == NULL)
{ {
const gchar *p; const gchar *p;
gchar *temp; gchar *root, *temp;
/* GTK_LOCALEDIR ends in either /lib/locale or /* GTK_LOCALEDIR ends in either /lib/locale or
* /share/locale. Scan for that slash. * /share/locale. Scan for that slash.
@ -91,8 +106,9 @@ _gtk_get_localedir (void)
while (*--p != '/') while (*--p != '/')
; ;
temp = g_win32_get_package_installation_subdirectory root = g_win32_get_package_installation_directory_of_module (gtk_dll);
(NULL, dll_name, p); temp = g_build_filename (root, p, NULL);
g_free (root);
/* gtk_localedir is passed to bindtextdomain() which isn't /* gtk_localedir is passed to bindtextdomain() which isn't
* UTF-8-aware. * UTF-8-aware.
@ -307,8 +323,11 @@ _gtk_get_datadir (void)
{ {
static char *gtk_datadir = NULL; static char *gtk_datadir = NULL;
if (gtk_datadir == NULL) if (gtk_datadir == NULL)
gtk_datadir = g_win32_get_package_installation_subdirectory {
(NULL, dll_name, "share"); gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll);
gtk_datadir = g_build_filename (root, "share", NULL);
g_free (root);
}
return gtk_datadir; return gtk_datadir;
} }
@ -318,8 +337,11 @@ _gtk_get_libdir (void)
{ {
static char *gtk_libdir = NULL; static char *gtk_libdir = NULL;
if (gtk_libdir == NULL) if (gtk_libdir == NULL)
gtk_libdir = g_win32_get_package_installation_subdirectory {
(NULL, dll_name, "lib"); gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll);
gtk_libdir = g_build_filename (root, "lib", NULL);
g_free (root);
}
return gtk_libdir; return gtk_libdir;
} }
@ -329,8 +351,11 @@ _gtk_get_sysconfdir (void)
{ {
static char *gtk_sysconfdir = NULL; static char *gtk_sysconfdir = NULL;
if (gtk_sysconfdir == NULL) if (gtk_sysconfdir == NULL)
gtk_sysconfdir = g_win32_get_package_installation_subdirectory {
(NULL, dll_name, "etc"); gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll);
gtk_sysconfdir = g_build_filename (root, "etc", NULL);
g_free (root);
}
return gtk_sysconfdir; return gtk_sysconfdir;
} }
@ -340,8 +365,7 @@ _gtk_get_data_prefix (void)
{ {
static char *gtk_data_prefix = NULL; static char *gtk_data_prefix = NULL;
if (gtk_data_prefix == NULL) if (gtk_data_prefix == NULL)
gtk_data_prefix = g_win32_get_package_installation_directory gtk_data_prefix = g_win32_get_package_installation_directory_of_module (gtk_dll);
(NULL, dll_name);
return gtk_data_prefix; return gtk_data_prefix;
} }