[libglade] Drop Win9x code path from libglade, too.



commit b4a5a4e4bfc1155d23e7bbb755d0eff7c16e2c7d
Author: Tor Lillqvist <tml iki fi>
Date:   Fri May 29 14:17:58 2009 +0300

    Drop Win9x code path from libglade, too.
---
 ChangeLog          |    4 ++++
 glade/glade-init.c |   16 ++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 99424f6..4bd8a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-29  Tor Lillqvist  <tml novell com>
+
+	* glade/glade-init.c (get_libdir): Drop Win9x codepath here, too.
+
 2009-03-17  Vincent Untz  <vuntz gnome org>
 
 	* configure.in: post-release bump to 2.6.5
diff --git a/glade/glade-init.c b/glade/glade-init.c
index b9eed50..2dc1ba6 100644
--- a/glade/glade-init.c
+++ b/glade/glade-init.c
@@ -74,6 +74,7 @@ replace_prefix (const char *runtime_prefix,
 static const char *
 get_libdir (void)
 {
+    wchar_t wcbfr[1000];
     static const char *libdir = NULL;
     char *prefix = NULL;
 
@@ -84,18 +85,9 @@ get_libdir (void)
     }
 
 
-    if (GetVersion () < 0x80000000) {
-	wchar_t wcbfr[1000];
-
-	if (GetModuleFileNameW (hmodule, wcbfr,
-				G_N_ELEMENTS (wcbfr))) {
-	    prefix = g_utf16_to_utf8 (wcbfr, -1, NULL, NULL, NULL);
-	}
-    } else {
-	char cpbfr[1000];
-	if (GetModuleFileNameA (hmodule, cpbfr, G_N_ELEMENTS (cpbfr)))
-	    prefix = g_locale_to_utf8 (cpbfr, -1, NULL, NULL, NULL);
-    }
+    if (GetModuleFileNameW (hmodule, wcbfr,
+			    G_N_ELEMENTS (wcbfr)))
+	prefix = g_utf16_to_utf8 (wcbfr, -1, NULL, NULL, NULL);
 
     if (prefix != NULL) {
 	char *p = strrchr (prefix, '\\');



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]