summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick_automake/kdebase/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick_automake/kdebase/debian/patches')
-rw-r--r--ubuntu/maverick_automake/kdebase/debian/patches/disable_default_kdm_theme.diff8
-rw-r--r--ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff4
-rw-r--r--ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff8
3 files changed, 10 insertions, 10 deletions
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_kdm_theme.diff
index ad6fa4cf8..200843f01 100644
--- a/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_kdm_theme.diff
+++ b/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_kdm_theme.diff
@@ -1,5 +1,5 @@
---- kdm/config.def
-+++ kdm/config.def
+--- tdm/config.def
++++ tdm/config.def
@@ -2614,18 +2614,18 @@
Key: UseTheme
@@ -15,10 +15,10 @@
Key: Theme
Type: string
--Default: KDMDATA "/themes/o2_enterprise"
+-Default: TDMDATA "/themes/o2_enterprise"
+Default: ""
User: greeter
--Instance: */KDMDATA "/themes/o2_enterprise"
+-Instance: */TDMDATA "/themes/o2_enterprise"
+Instance: */ "@@@ToBeReplacedByDesktopBase@@@"
Comment: &
Description:
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff
index 52fa6a4d5..2c106549e 100644
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff
@@ -1,5 +1,5 @@
---- kdm/kfrontend/kdmshutdown.cpp
-+++ kdm/kfrontend/kdmshutdown.cpp
+--- tdm/kfrontend/tdmshutdown.cpp
++++ tdm/kfrontend/tdmshutdown.cpp
@@ -467,7 +467,7 @@
, targetList( 0 )
{
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
index 4aad9f8e3..f2584303c 100644
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
+++ b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
@@ -1,5 +1,5 @@
---- kdebase-3.5.8/kdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200
-+++ kdebase-3.5.8/kdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200
+--- kdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200
++++ kdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200
@@ -996,9 +996,14 @@ ReapChildren( void )
/* don't kill again */
break;
@@ -18,8 +18,8 @@
StartServerFailed();
break;
}
---- kdebase-3.5.8/kdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200
-+++ kdebase-3.5.8/kdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200
+--- kdebase-3.5.8/tdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200
++++ kdebase-3.5.8/tdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200
@@ -48,6 +48,10 @@ from the copyright holder.
struct display *startingServer;
time_t serverTimeout = TO_INF;