[Aptitude-svn-commit] r3264 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Fri May  6 01:43:04 2005
New Revision: 3264

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/main.cc
Log:
Back out the guards against utf8 locales.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri May  6 01:43:04 2005
@@ -1,5 +1,9 @@
 2005-05-05  Daniel Burrows  <dburrows@debian.org>
 
+	* src/main.cc:
+
+	Remove the utf8 guards in main.
+
 	* configure.ac, src/vscreen/curses++.h:
 
 	Start using ncursesw instead of straight curses.

Modified: branches/aptitude-0.3/aptitude/src/main.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/main.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/main.cc	Fri May  6 01:43:04 2005
@@ -287,14 +287,7 @@
 	      show_version();
 	      exit(0);
 	    case OPTION_VISUAL_PREVIEW:
-	      visual_preview=true;
-	      locale = setlocale(LC_ALL, NULL);    
-	      
-              if (strstr(locale, "UTF-8")) {
-	      	      setlocale(LC_ALL, "C");
-		      locale = setlocale(LC_ALL, NULL);
-              }
-	      
+	      visual_preview=true;	      
 	      break;
 	    default:
 	      fprintf(stderr, "%s",
@@ -425,15 +418,6 @@
       usage();
       exit(1);
     }
-
-  // Apart from visual preview we also have to take care of the normal
-  // ui mess with UTF-8, and fallback to "C" locale
-  locale = setlocale(LC_ALL, NULL);    
-	      	      
-  if (strstr(locale, "UTF-8")) {
-    setlocale(LC_ALL, "C");
-    locale = setlocale(LC_ALL, NULL);
-  }			    	
   
   ui_init();