summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdelibs/debian
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick/tdelibs/debian')
-rw-r--r--ubuntu/maverick/tdelibs/debian/changelog4
-rw-r--r--ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl2
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 2969809e6..18c366029 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -908,12 +908,12 @@ tdelibs (4:3.5.5a.dfsg.1-4) unstable; urgency=medium
tdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
* Patch: 41_x_kde_getactionmenu_no_timeout.diff
- Do not time out when waiting for the reply for the X-KDE-GetActionMenu
+ Do not time out when waiting for the reply for the X-TDE-GetActionMenu
DCOP call. DCOP protocol is synchronouos by design and a reply for the
timed out call (i.e. garbage) still arrives and might be falsely returned
as a valid reply for the subsequent DCOP call on the same connection. The
application currently known to be badly hurt by this is tdesvn and its
- konqueror service menu integration. Its X-KDE-GetActionMenu might take
+ konqueror service menu integration. Its X-TDE-GetActionMenu might take
longer than current 100 milisecond timeout to complete. As a result
then, a late reply will "pollute" a main DCOP connection of the client
application (e.g. konqueror) causing further DCOP failures.
diff --git a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl b/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
index 0d6c5cc92..1e2ff4bdb 100644
--- a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ b/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
@@ -53,7 +53,7 @@ sub processfiles
#warn("Using $filename");
#my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName)=};
- my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName|Query|ExtraNames|X-KDE-Submenu)=};
+ my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName|Query|ExtraNames|X-TDE-Submenu)=};
while( <FH> )
{