gtk+ r21379 - in trunk: . gdk-pixbuf gtk

[tml svn gnome org]

Author: tml
Date: Sat Sep 13 09:19:03 2008
New Revision: 21379
URL: http://svn.gnome.org/viewvc/gtk+?rev=21379&view=rev

Log:
2008-09-13  Tor Lillqvist  <tml novell com>

	* gdk-pixbuf/gdk-pixbuf-io.c
	* gtk/gtkmain.c: Do as the docs for
	g_win32_get_package_installation_directory() say and pass NULL as
	the first parameter.



Modified:
   trunk/ChangeLog
   trunk/gdk-pixbuf/ChangeLog
   trunk/gdk-pixbuf/gdk-pixbuf-io.c
   trunk/gtk/gtkmain.c

Modified: trunk/gdk-pixbuf/gdk-pixbuf-io.c
==============================================================================
--- trunk/gdk-pixbuf/gdk-pixbuf-io.c	(original)
+++ trunk/gdk-pixbuf/gdk-pixbuf-io.c	Sat Sep 13 09:19:03 2008
@@ -238,7 +238,7 @@
 
   if (toplevel == NULL)
     toplevel = g_win32_get_package_installation_subdirectory
-      (GETTEXT_PACKAGE, dll_name, "");
+      (NULL, dll_name, "");
 
   return toplevel;
 }
@@ -250,7 +250,7 @@
 
   if (sysconfdir == NULL)
     sysconfdir = g_win32_get_package_installation_subdirectory
-      (GETTEXT_PACKAGE, dll_name, "etc");
+      (NULL, dll_name, "etc");
 
   return sysconfdir;
 }

Modified: trunk/gtk/gtkmain.c
==============================================================================
--- trunk/gtk/gtkmain.c	(original)
+++ trunk/gtk/gtkmain.c	Sat Sep 13 09:19:03 2008
@@ -92,7 +92,7 @@
 	;
 
       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 @@
   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 @@
   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 @@
   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 @@
   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;
 }