diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-07-09 02:58:42 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-23 23:18:04 +0200 |
| commit | a90de98f32fceeb1c5acee474ce0b8d5b735c062 (patch) | |
| tree | 9c1816a9770f14b2251351350eeef5678e1c3339 | |
| parent | 4bfe7946f45b4b65894e07af645c7d70273fc7b1 (diff) | |
| download | tde-packaging-a90de98f32fceeb1c5acee474ce0b8d5b735c062.tar.gz tde-packaging-a90de98f32fceeb1c5acee474ce0b8d5b735c062.zip | |
Fix tdebase FTBFS on Ubuntu
(cherry picked from commit cae9ecbd0261f2868d1983dda91ffcac7acb9f23)
| -rw-r--r-- | ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff index 80cd1877c..b17107a66 100644 --- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,18 +1,17 @@ --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.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 -@@ -278,7 +278,7 @@ +@@ -688,7 +688,7 @@ 2 * KDialog::spacingHint() ); // default factor |