[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE
From:       Rex Dieter <rdieter () math ! unl ! edu>
Date:       2010-12-20 22:51:43
Message-ID: 20101220225143.C9329AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208194 by rdieter:

djust the kde "fake" mimetype fonts/package so
desktop-file-utils/shared-mime-info (and friends)
do not complain.

http://svn.reviewboard.kde.org/r/6111/


 M  +1 -1      kdebase/workspace/kcontrol/kfontinst/apps/kfontview.desktop  
 M  +1 -1      kdebase/workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp  
 M  +1 -1      kdebase/workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp  
 M  +1 -1      kdebase/workspace/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp  
 M  +1 -1      kdebase/workspace/kcontrol/kfontinst/viewpart/FontViewPart.cpp  
 M  +1 -2      kdelibs/mimetypes/kde.xml  


--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/apps/kfontview.desktop \
#1208193:1208194 @@ -91,7 +91,7 @@
 Icon=kfontview
 X-KDE-StartupNotify=true
 Type=Application
-MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-pcf;application/x-font-bdf;fonts/package;
 +MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-pcf;application/x-font-bdf;application/vnd.kde.fontspackage;
  GenericName=Font Viewer
 GenericName[af]=Skriftipe Besigter
 GenericName[ar]=عارض الخطوط
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp \
#1208193:1208194 @@ -1960,7 +1960,7 @@
             if(mime->is("application/x-font-ttf") ||
                mime->is("application/x-font-otf") ||
                mime->is("application/x-font-type1") ||
-               mime->is("fonts/package") ||
+               mime->is("application/vnd.kde.fontspackage") ||
                mime->is("application/x-font-pcf") ||
                mime->is("application/x-font-bdf"))
                 kurls.insert(*it);
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp \
#1208193:1208194 @@ -478,7 +478,7 @@
                    "application/x-font-type1 "
                    "application/x-font-pcf "
                    "application/x-font-bdf "
-                   "fonts/package");
+                   "application/vnd.kde.fontspackage");
 
     KUrl::List list=KFileDialog::getOpenUrls(KUrl(), filter, this, i18n("Add \
Fonts"));  
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp \
#1208193:1208194 @@ -63,7 +63,7 @@
 
     KFI_DBUG << "Create font thumbnail for:" << path << endl;
 
-    // Is this a fonts/package file? If so, extract 1 scalable font...
+    // Is this a appliaction/vnd.kde.fontspackage file? If so, extract 1 scalable \
                font...
     if(Misc::isPackage(path) || \
"application/zip"==KMimeType::findByFileContent(path)->name())  {
         KZip zip(path);
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/viewpart/FontViewPart.cpp \
#1208193:1208194 @@ -275,7 +275,7 @@
     {
         QString path(url().path());
 
-        // Is this a fonts/package file? If so, extract 1 scalable font...
+        // Is this a application/vnd.kde.fontspackage file? If so, extract 1 \
scalable font...  if((package=Misc::isPackage(path)))
         {
             KZip zip(path);
--- trunk/KDE/kdelibs/mimetypes/kde.xml #1208193:1208194
@@ -206,8 +206,7 @@
     <comment>rtspu: URIs</comment>
   </mime-type>
 
-  <!-- fonts/ fake mime types -->
-  <mime-type type="fonts/package">
+  <mime-type type="application/vnd.kde.fontspackage">
     <sub-class-of type="application/zip"/>
     <comment>fonts package</comment>
     <glob pattern="*.fonts.zip"/>


[prev in list] [next in list] [prev in thread] [next in thread]