gimp r24868 - in trunk: . app/widgets

[neo svn gnome org]

Author: neo
Date: Tue Feb 12 07:24:34 2008
New Revision: 24868
URL: http://svn.gnome.org/viewvc/gimp?rev=24868&view=rev

Log:
2008-02-12  Sven Neumann  <sven gimp org>

	* app/widgets/gimplanguagestore-parser.c: inverted logic; #ifdef
	is IMO easier to read than #ifndef.



Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimplanguagestore-parser.c

Modified: trunk/app/widgets/gimplanguagestore-parser.c
==============================================================================
--- trunk/app/widgets/gimplanguagestore-parser.c	(original)
+++ trunk/app/widgets/gimplanguagestore-parser.c	Tue Feb 12 07:24:34 2008
@@ -92,11 +92,11 @@
   g_return_val_if_fail (GIMP_IS_LANGUAGE_STORE (store), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-#ifndef G_OS_WIN32
-  bindtextdomain ("iso_639", ISO_CODES_LOCALEDIR);
-#else
-  /* Assume iso-codes is installed in the same location as GIMP */
+#ifdef G_OS_WIN32
+  /*  on Win32, assume iso-codes is installed in the same location as GIMP  */
   bindtextdomain ("iso_639", gimp_locale_directory ());
+#else
+  bindtextdomain ("iso_639", ISO_CODES_LOCALEDIR);
 #endif
 
   bind_textdomain_codeset ("iso_639", "UTF-8");
@@ -105,10 +105,12 @@
 
   xml_parser = gimp_xml_parser_new (&markup_parser, &parser);
 
-#ifndef G_OS_WIN32
-  filename = g_build_filename (ISO_CODES_LOCATION, "iso_639.xml", NULL);
+#ifdef G_OS_WIN32
+  filename = g_build_filename (gimp_data_directory (),
+                               "..", "..", "xml", "iso-codes", "iso_639.xml",
+                               NULL);
 #else
-  filename = g_build_filename (gimp_data_directory (), "..", "..", "xml", "iso-codes", "iso_639.xml", NULL);
+  filename = g_build_filename (ISO_CODES_LOCATION, "iso_639.xml", NULL);
 #endif
 
   success = gimp_xml_parser_parse_file (xml_parser, filename, error);