From 8ed51b3a7d1a8ba37a8b46ce20b2b933644dda31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 26 Feb 2013 14:48:15 -0600 Subject: [PATCH] Fix default settings files on Debian and Ubuntu --- .../kde-rc-files/launcher_panelapplet_kubuntu_rc | 4 ++-- .../redmond-default-settings-ii/kde-rc-files/kdeglobals | 5 +++++ .../redmond-default-settings-ii/kde-rc-files/kdesktoprc | 2 +- .../kde-rc-files/launcher_panelapplet_kubuntu_rc | 4 ++-- .../kde-rc-files/launcher_panelapplet_kubuntu_rc | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc index 8935dcd5c..e31c7d266 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc @@ -1,9 +1,9 @@ [General] AutoAdjustMinItems=0 -Buttons=kde-konqbrowser.desktop,kde-Kontact.desktop,kde-amarok.desktop,kde-kopete.desktop +Buttons=tde-konqbrowser.desktop,tde-Kontact.desktop,tde-amarok.desktop,tde-kopete.desktop ConserveSpace=false [PopularityData] ServiceHistories=0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0 ServiceInspos=4,1,3,2,5 -ServiceNames=kde-Help.desktop,kde-Home.desktop,kde-KControl.desktop,kde-konsole.desktop,kde-kwrite.desktop +ServiceNames=tde-Help.desktop,tde-Home.desktop,tde-KControl.desktop,tde-konsole.desktop,tde-kwrite.desktop diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdeglobals b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdeglobals index c1f30b63f..250274182 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdeglobals +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdeglobals @@ -322,3 +322,8 @@ inactiveForeground=212,208,200 inactiveFrame=212,208,200 inactiveHandle=212,208,200 inactiveTitleBtnBg=220,220,220 + +[Logout] +doFancyLogout=false +doUbuntuLogout=false +doNotUseKonqyPicture=true diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdesktoprc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdesktoprc index d93674804..b36d5b88b 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdesktoprc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdesktoprc @@ -16,7 +16,7 @@ MultiWallpaperMode=NoMulti ReverseBlending=false UseSHM=false Wallpaper=/usr/share/wallpapers/enterprise-desktop.png -WallpaperMode=Scaled +WallpaperMode=NoWallpaper [FMSettings] ItemTextBackground=invalid diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc index 45e8ef43f..194732832 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc @@ -1,9 +1,9 @@ [General] AutoAdjustMinItems=0 -Buttons=SPECIAL_BUTTON__SHOW_DESKTOP,kde-konqbrowser.desktop,kde-Kontact.desktop,kde-amarok.desktop,kde-kopete.desktop +Buttons=SPECIAL_BUTTON__SHOW_DESKTOP,tde-konqbrowser.desktop,tde-Kontact.desktop,tde-amarok.desktop,tde-kopete.desktop ConserveSpace=false [PopularityData] ServiceHistories=0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0 ServiceInspos=4,1,3,2,5 -ServiceNames=kde-Help.desktop,kde-Home.desktop,kde-KControl.desktop,kde-konsole.desktop,kde-kwrite.desktop +ServiceNames=tde-Help.desktop,tde-Home.desktop,tde-KControl.desktop,tde-konsole.desktop,tde-kwrite.desktop diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc index 45e8ef43f..194732832 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc @@ -1,9 +1,9 @@ [General] AutoAdjustMinItems=0 -Buttons=SPECIAL_BUTTON__SHOW_DESKTOP,kde-konqbrowser.desktop,kde-Kontact.desktop,kde-amarok.desktop,kde-kopete.desktop +Buttons=SPECIAL_BUTTON__SHOW_DESKTOP,tde-konqbrowser.desktop,tde-Kontact.desktop,tde-amarok.desktop,tde-kopete.desktop ConserveSpace=false [PopularityData] ServiceHistories=0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0 ServiceInspos=4,1,3,2,5 -ServiceNames=kde-Help.desktop,kde-Home.desktop,kde-KControl.desktop,kde-konsole.desktop,kde-kwrite.desktop +ServiceNames=tde-Help.desktop,tde-Home.desktop,tde-KControl.desktop,tde-konsole.desktop,tde-kwrite.desktop