evolution-data-server r8896 - in trunk: . libedataserver

[tml svn gnome org]

Author: tml
Date: Mon Jun  2 11:49:15 2008
New Revision: 8896
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8896&view=rev

Log:
2008-06-02  Tor Lillqvist  <tml novell com>

	* libedataserver/e-data-server-util.c (get_prefixes): Drop the
	Win9x code. The GTK+ stack hasn't supported Win9x for a while,
	so no point in attempting to do it here either.



Modified:
   trunk/ChangeLog
   trunk/libedataserver/e-data-server-util.c

Modified: trunk/libedataserver/e-data-server-util.c
==============================================================================
--- trunk/libedataserver/e-data-server-util.c	(original)
+++ trunk/libedataserver/e-data-server-util.c	Mon Jun  2 11:49:15 2008
@@ -528,32 +528,22 @@
         *full_prefix = NULL;
         *cp_prefix = NULL;
 
-        if (G_WIN32_HAVE_WIDECHAR_API ()) {
-                /* NT-based Windows has wide char API */
-                if (GetModuleFileNameW ((HMODULE) hmodule, wcbfr, G_N_ELEMENTS (wcbfr))) {
-                        *full_prefix = g_utf16_to_utf8 (wcbfr, -1,
-                                                        NULL, NULL, NULL);
-                        if (GetShortPathNameW (wcbfr, wcbfr, G_N_ELEMENTS (wcbfr)) &&
-                            /* Short pathnames always contain only
-                             * ASCII, I think, but just in case, be
-                             * prepared.
-                             */
-                            WideCharToMultiByte (CP_ACP, 0, wcbfr, -1,
-                                                 cpbfr, G_N_ELEMENTS (cpbfr),
-                                                 NULL, NULL))
-                                *cp_prefix = g_strdup (cpbfr);
-                        else if (*full_prefix)
-                                *cp_prefix = g_locale_from_utf8 (*full_prefix, -1,
-                                                                 NULL, NULL, NULL);
-                }
-        } else {
-                /* Win9x */
-                if (GetModuleFileNameA ((HMODULE) hmodule, cpbfr, G_N_ELEMENTS (cpbfr))) {
-                        *full_prefix = g_locale_to_utf8 (cpbfr, -1,
-                                                         NULL, NULL, NULL);
-                        *cp_prefix = g_strdup (cpbfr);
-                }
-        }
+	if (GetModuleFileNameW ((HMODULE) hmodule, wcbfr, G_N_ELEMENTS (wcbfr))) {
+		*full_prefix = g_utf16_to_utf8 (wcbfr, -1,
+						NULL, NULL, NULL);
+		if (GetShortPathNameW (wcbfr, wcbfr, G_N_ELEMENTS (wcbfr)) &&
+		    /* Short pathnames always contain only
+		     * ASCII, I think, but just in case, be
+		     * prepared.
+		     */
+		    WideCharToMultiByte (CP_ACP, 0, wcbfr, -1,
+					 cpbfr, G_N_ELEMENTS (cpbfr),
+					 NULL, NULL))
+			*cp_prefix = g_strdup (cpbfr);
+		else if (*full_prefix)
+			*cp_prefix = g_locale_from_utf8 (*full_prefix, -1,
+							 NULL, NULL, NULL);
+	}
 
         if (*full_prefix != NULL) {
                 gchar *p = strrchr (*full_prefix, '\\');