diff --git a/ChangeLog b/ChangeLog index 6ac5bf06dc..3e6fb8a6a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-13 Tor Lillqvist + + * 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 Bug 536542 – gtk_list_store_set() documentation doesn't say whether diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 6e0ad078c5..841ff5e629 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +2008-09-13 Tor Lillqvist + + * gdk-pixbuf-io.c: Do as the docs for + g_win32_get_package_installation_directory() say and pass NULL as + the first parameter. + 2008-09-07 Matthias Clasen * gdk-pixbuf-io.c (gdk_pixbuf_io_init): Plug a small memory diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 61256e8631..967febbbd6 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -238,7 +238,7 @@ get_toplevel (void) if (toplevel == NULL) toplevel = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, ""); + (NULL, dll_name, ""); return toplevel; } @@ -250,7 +250,7 @@ get_sysconfdir (void) if (sysconfdir == NULL) sysconfdir = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, "etc"); + (NULL, dll_name, "etc"); return sysconfdir; } diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 30328cd1c3..52538a1db3 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -92,7 +92,7 @@ _gtk_get_localedir (void) ; temp = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, p); + (NULL, dll_name, p); /* gtk_localedir is passed to bindtextdomain() which isn't * UTF-8-aware. @@ -308,7 +308,7 @@ _gtk_get_datadir (void) static char *gtk_datadir = NULL; if (gtk_datadir == NULL) gtk_datadir = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, "share"); + (NULL, dll_name, "share"); return gtk_datadir; } @@ -319,7 +319,7 @@ _gtk_get_libdir (void) static char *gtk_libdir = NULL; if (gtk_libdir == NULL) gtk_libdir = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, "lib"); + (NULL, dll_name, "lib"); return gtk_libdir; } @@ -330,7 +330,7 @@ _gtk_get_sysconfdir (void) static char *gtk_sysconfdir = NULL; if (gtk_sysconfdir == NULL) gtk_sysconfdir = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, "etc"); + (NULL, dll_name, "etc"); return gtk_sysconfdir; } @@ -341,7 +341,7 @@ _gtk_get_data_prefix (void) static char *gtk_data_prefix = NULL; if (gtk_data_prefix == NULL) gtk_data_prefix = g_win32_get_package_installation_directory - (GETTEXT_PACKAGE, dll_name); + (NULL, dll_name); return gtk_data_prefix; }