--- gnome-vfs-2.8.1/libgnomevfs/eggdesktopentries.c	13 Sep 2004 15:26:51 -0000	1.5
+++ gnome-vfs-2.8.1/libgnomevfs/eggdesktopentries.c	28 Sep 2004 03:43:14 -0000	1.7
@@ -2448,9 +2448,9 @@ egg_desktop_entries_get_locale_country (
     q = strstr (p, "@");
 
   if (!q)
-    country_len = q - p;
-  else
     country_len = strlen (p);
+  else
+    country_len = q - p;
 
   if (country_len <= 0)
     return NULL;
@@ -2508,9 +2508,9 @@ egg_desktop_entries_get_locale_encoding 
   q = strstr (p, "@");
 
   if (!q)
-    encoding_len = q - p;
-  else
     encoding_len = strlen (p);
+  else
+    encoding_len = q - p;
 
   if (encoding_len <= 0)
     {