diff options
| author | Robert Xu <robxu9@gmail.com> | 2012-03-31 14:28:06 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2012-03-31 14:28:06 -0400 |
| commit | 59dd46ef985a719579132efa6a9aa49bfeeae112 (patch) | |
| tree | 93d8c721ff263e67aaf59e364496862872ded8fb /opensuse/core/tdelibs/flash-player-non-oss.diff | |
| parent | c141f0bc29b6e2eeda5ca08a043d26546a1427f9 (diff) | |
| download | tde-packaging-59dd46ef985a719579132efa6a9aa49bfeeae112.tar.gz tde-packaging-59dd46ef985a719579132efa6a9aa49bfeeae112.zip | |
better late than never, hm...
Diffstat (limited to 'opensuse/core/tdelibs/flash-player-non-oss.diff')
| -rw-r--r-- | opensuse/core/tdelibs/flash-player-non-oss.diff | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/opensuse/core/tdelibs/flash-player-non-oss.diff b/opensuse/core/tdelibs/flash-player-non-oss.diff index e3bcdc3e4..f6b3da259 100644 --- a/opensuse/core/tdelibs/flash-player-non-oss.diff +++ b/opensuse/core/tdelibs/flash-player-non-oss.diff @@ -1,44 +1,42 @@ -Index: khtml/rendering/render_frames.cpp -=================================================================== ---- khtml/rendering/render_frames.cpp.orig -+++ khtml/rendering/render_frames.cpp -@@ -940,14 +940,33 @@ void RenderPartObject::slotPartLoadingEr - // Prepare the URL to show in the question (host only if http, to make it short) - KURL pluginPageURL( embed->pluginPage ); - QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyURL(); -- int res = KMessageBox::questionYesNo( m_view, -- i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg(shortURL), +--- khtml/rendering/render_frames.cpp.orig 2011-12-11 21:10:39.556986274 +0100 ++++ khtml/rendering/render_frames.cpp 2011-12-11 21:19:11.017986213 +0100 +@@ -953,14 +953,33 @@ + // Prepare the URL to show in the question (host only if http, to make it short) + KURL pluginPageURL( embed->pluginPage ); + TQString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyURL(); +- int res = KMessageBox::questionYesNo( m_view, +- i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg(shortURL), + -+ int res; -+ if (mimeName.startsWith("Shockwave Flash",false)) -+ { -+ res = KMessageBox::questionYesNo( m_view, -+ i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg("openSUSE"), - i18n("Missing Plugin"), i18n("Download"), i18n("Do Not Download"), QString("plugin-")+serviceType); -- if ( res == KMessageBox::Yes ) ++ int res; ++ if (mimeName.startsWith("Shockwave Flash",false)) ++ { ++ res = KMessageBox::questionYesNo( m_view, ++ i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg("openSUSE"), + i18n("Missing Plugin"), i18n("Download"), i18n("Do Not Download"), TQString("plugin-")+serviceType); +- if ( res == KMessageBox::Yes ) + -+ if ( res == KMessageBox::Yes ) -+ { ++ if ( res == KMessageBox::Yes ) ++ { + // Open YMP file + KURL ymp_flash ("http://download.opensuse.org/YaST/flash-player.ymp"); + ext->openURLRequest( ymp_flash ); + return; -+ } -+ } -+ else - { -- // Display vendor download page -- ext->createNewWindow( pluginPageURL ); -- return; -+ res = KMessageBox::questionYesNo( m_view, -+ i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg(shortURL), -+ i18n("Missing Plugin"), i18n("Download"), i18n("Do Not Download"), QString("plugin-")+serviceType); -+ if ( res == KMessageBox::Yes ) -+ { ++ } ++ } ++ else + { +- // Display vendor download page +- ext->createNewWindow( pluginPageURL ); +- return; ++ res = KMessageBox::questionYesNo( m_view, ++ i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg(shortURL), ++ i18n("Missing Plugin"), i18n("Download"), i18n("Do Not Download"), TQString("plugin-")+serviceType); ++ if ( res == KMessageBox::Yes ) ++ { + // Display vendor download page + ext->createNewWindow( pluginPageURL ); + return; -+ } ++ } + } } } - } |