From cae9ecbd0261f2868d1983dda91ffcac7acb9f23 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Mon, 9 Jul 2012 02:58:42 +0200 Subject: Fix tdebase FTBFS on Ubuntu --- .../tdebase/debian/patches/kubuntu_89_new_logout_ui.diff | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff index c56f4f7cd..8fb71d7da 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,18 +1,17 @@ --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp -@@ -467,7 +467,7 @@ - , targetList( 0 ) +@@ -472,7 +472,7 @@ { + setCaption(i18n("Shutdown TDE")); - bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); + bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true); - TQVBoxLayout* vbox = new TQVBoxLayout( this ); - TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh ); - + TQFrame* lfrm = new TQFrame( this ); + TQHBoxLayout* hbuttonbox; --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp -@@ -668,7 +668,7 @@ +@@ -697,7 +697,7 @@ 2 * KDialog::spacingHint() ); // default factor -- cgit v1.2.3