r40873 - in lyx-devel/trunk: po src

[kornel]

Author: kornel
Date: Tue Mar  6 10:41:41 2012
New Revision: 40873
URL: http://www.lyx.org/trac/changeset/40873

Log:
Handling of libmagic for some mime-types leads to incorrect value 'text/plain'.

Modified:
   lyx-devel/trunk/po/diff_po.pl
   lyx-devel/trunk/src/Format.cpp

Modified: lyx-devel/trunk/po/diff_po.pl
==============================================================================
--- lyx-devel/trunk/po/diff_po.pl       Tue Mar  6 10:36:04 2012        (r40872)
+++ lyx-devel/trunk/po/diff_po.pl       Tue Mar  6 10:41:41 2012        (r40873)
@@ -42,7 +42,7 @@
 my %Untranslated = ();          # inside new po-file
 my %Fuzzy = ();                 # inside new po-file
 my $result = 0;                 # exit value
-my $printlines = 0;
+my $printlines = 1;
 my @names = ();
 
 # Check first, if called as standalone program for git
@@ -146,7 +146,7 @@
     }
   }
 
-  if (1) {
+  if (0) {
     @MsgKeys = sort keys %Messages, keys %newMessages;
     for my $k (@MsgKeys) {
       if (defined($Messages{$k})) {

Modified: lyx-devel/trunk/src/Format.cpp
==============================================================================
--- lyx-devel/trunk/src/Format.cpp      Tue Mar  6 10:36:04 2012        (r40872)
+++ lyx-devel/trunk/src/Format.cpp      Tue Mar  6 10:41:41 2012        (r40873)
@@ -388,7 +388,7 @@
                                        
filename.toFilesystemEncoding().c_str());
                                mime = token(mime, ';', 0);
                                // we need our own ps/eps detection
-                               if (mime != "application/postscript") {
+                               if ((mime != "application/postscript") && (mime 
!= "text/plain")) {
                                        Formats::const_iterator cit =
                                                find_if(formatlist.begin(), 
formatlist.end(),
                                                        FormatMimeEqual(mime));