From f1fcc905f2ae6a62d72ea462b2025223e5522686827616136258784c553a940d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 21 Aug 2013 13:11:06 +0000 Subject: [PATCH] Accepting request 195787 from KDE:Distro:Factory fix ksuseinstall does not respect (don't ask again) (bnc# 671578) OBS-URL: https://build.opensuse.org/request/show/195787 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=52 --- kaffeine.changes | 6 ++++++ kaffeine.spec | 2 +- ksuseinstall.diff | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/kaffeine.changes b/kaffeine.changes index 7c4a8e6..df123e6 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 21 08:08:50 UTC 2013 - tittiatcoke@gmail.com + +- fix ksuseinstall does not respect "don't ask again" (bnc# 671578) + fix delivered by amolagodbole@gmail.com + ------------------------------------------------------------------- Thu Apr 19 09:46:10 UTC 2012 - dmueller@suse.com diff --git a/kaffeine.spec b/kaffeine.spec index 1a3c9ec..ccbed62 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,7 +1,7 @@ # # spec file for package kaffeine # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/ksuseinstall.diff b/ksuseinstall.diff index 446b309..31fed8d 100644 --- a/ksuseinstall.diff +++ b/ksuseinstall.diff @@ -92,10 +92,10 @@ +{ + KGuiItem installGuiItem( KStandardGuiItem::yes()); + installGuiItem.setText( i18nc( "@action:button", "Install" )); -+ if( KMessageBox::warningContinueCancel( window(), ++ if( KMessageBox::warningYesNo( window(), + i18n( "Kaffeine currently cannot play some file formats. Do you want to install additional support?" ), + i18n( "Install Additional Codecs" ), -+ installGuiItem, KStandardGuiItem::no(), "suse_additional_codecs" ) != KMessageBox::Continue ) ++ installGuiItem, KStandardGuiItem::no(), "suse_additional_codecs" ) != KMessageBox::Yes ) + { + return; + }