summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-09 02:58:42 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-09 02:58:42 +0200
commitcae9ecbd0261f2868d1983dda91ffcac7acb9f23 (patch)
tree6078c2c4f27612709399ed333c072a06c385ed1d
parent1e9f0fd00605b4fc601498cbec0d523c96aea2c9 (diff)
downloadtde-packaging-cae9ecbd0261f2868d1983dda91ffcac7acb9f23.tar.gz
tde-packaging-cae9ecbd0261f2868d1983dda91ffcac7acb9f23.zip
Fix tdebase FTBFS on Ubuntu
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff11
1 files 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