[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara caolanm at redhat.com
Fri Feb 21 12:21:02 PST 2014


 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |    2 +-
 vcl/unx/kde4/KDESalFrame.cxx                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 47cedf845b376bf3d13f169c7d94f7f5e37578c3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 21 20:20:23 2014 +0000

    other vclplugs need adapting
    
    Change-Id: I83c54b27dc58dfeac72462d8c5eb92a08b5e8e2e

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 6ba0ec3..300385e 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1417,7 +1417,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     // preferred icon style
     gchar* pIconThemeName = NULL;
     g_object_get( pSettings, "gtk-icon-theme-name", &pIconThemeName, (char *)NULL );
-    aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( pIconThemeName ) );
+    aStyleSet.SetPreferredIconTheme( OUString::createFromAscii( pIconThemeName ) );
     g_free( pIconThemeName );
 
     aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index a322912..52a0315 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -198,7 +198,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 
         pKey = "Theme";
         if ( aGroup.hasKey( pKey ) )
-            style.SetPreferredSymbolsStyleName( readEntryUntranslated( &aGroup, pKey ) );
+            style.SetPreferredIconTheme( readEntryUntranslated( &aGroup, pKey ) );
 
         //toolbar
         pKey = "toolbarFont";


More information about the Libreoffice-commits mailing list