3 files changed, 10 insertions, 1 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 5a9ee1b..767efb2 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -1150,49 +1150,52 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
         stream >> mode;
         QString pixmapOrColor;
         stream >> pixmapOrColor;
         if ( tabs->view(id) )
             tabs->view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
     } else if ( msg == "setTextColor(QString,QString)" ) {
         QString id;
         stream >> id;
         QString color;
         stream >> color;
         if ( tabs->view(id) )
             tabs->view(id)->setTextColor( QColor(color) );
     } else if ( msg == "setFont(QString,QString,int,int,int)" ) {
         QString id;
         stream >> id;
         QString fam;
         stream >> fam;
         int size;
         stream >> size;
         int weight;
         stream >> weight;
         int italic;
         stream >> italic;
         if ( tabs->view(id) )
-            tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
+            if ( !fam. isEmpty ( ))
+                tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
+            else
+                tabs->view(id)->unsetViewFont();
         qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
     }
     else if ( msg == "setBusyIndicatorType(QString)" ) {
         QString type;
                 stream >> type;
         tabs->setBusyIndicatorType(type);
     }
 }
 
 void Launcher::storageChanged()
 {
     if ( in_lnk_props ) {
         got_lnk_change = TRUE;
         lnk_change = QString::null;
     } else {
         updateLink( QString::null );
     }
 }
 
 
 bool Launcher::mkdir(const QString &localPath)
 {
     QDir fullDir(localPath);
     if (fullDir.exists())
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 9fc4565..2a051a6 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -829,48 +829,53 @@ void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
         if ( (*curr)->ref == 0 ) {
             delete (*curr);
             bgCache->remove( curr );
         }
     }
 
     bgType = t;
     icons->viewport()->update();
 }
 
 void LauncherView::setTextColor( const QColor &tc )
 {
     textCol = tc;
     QColorGroup cg = icons->colorGroup();
     cg.setColor( QColorGroup::Text, tc );
     icons->setPalette( QPalette(cg,cg,cg) );
     icons->viewport()->update();
 }
 
 void LauncherView::setViewFont( const QFont &f )
 {
     icons->setFont( f );
 }
 
+void LauncherView::unsetViewFont( )
+{
+    icons->unsetFont( );
+}
+
 void LauncherView::resizeEvent(QResizeEvent *e)
 {
     QVBox::resizeEvent( e );
     if ( e->size().width() != e->oldSize().width() )
         sort();
 }
 
 void LauncherView::populate( AppLnkSet *folder, const QString& typefilter )
 {
     icons->clear();
     internalPopulate( folder, typefilter );
 }
 
 QString LauncherView::getAllDocLinkInfo() const
 {
     return icons->getAllDocLinkInfo();
 }
 
 void LauncherView::selectionChanged()
 {
     QIconViewItem* item = icons->currentItem();
     if ( item && item->isSelected() ) {
         AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
         if ( icons->inKeyEvent() ) // not for mouse press
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 194e4a2..82a319b 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -43,48 +43,49 @@ public:
 
     bool removeLink(const QString& linkfile);
     void addItem(AppLnk* app, bool resort=TRUE);
     void sort();
 
     void setFileSystems(const QList<FileSystem> &);
     void setToolsEnabled(bool);
     void updateTools();
 
     void setBusy(bool);
 
     QString getAllDocLinkInfo() const;
     enum ViewMode { Icon, List };
     void setViewMode( ViewMode m );
     ViewMode viewMode() const { return vmode; }
 
     enum BackgroundType { Ruled, SolidColor, Image };
     void setBackgroundType( BackgroundType t, const QString & );
     BackgroundType backgroundType() const { return bgType; }
 
     void setTextColor( const QColor & );
     QColor textColor() const { return textCol; }
 
     void setViewFont( const QFont & );
+    void unsetViewFont ( );
 
     void setBusyIndicatorType ( const QString &type );
 
 public slots:
     void populate( AppLnkSet *folder, const QString& categoryfilter );
 
 signals:
     void clicked( const AppLnk * );
     void rightPressed( AppLnk * );
 
 protected slots:
     void selectionChanged();
     void returnPressed( QIconViewItem *item );
     void itemClicked( int, QIconViewItem * );
     void itemPressed( int, QIconViewItem * );
     void sortBy(int);
     void showType(int);
     void showCategory( int );
     void resizeEvent(QResizeEvent *);
 
 protected:
     void internalPopulate( AppLnkSet *, const QString& categoryfilter );
     void paletteChange( const QPalette & );