From 01af42931b38e0dd67e07d70df3f231ac1134eff67d5c11f8bf8fda01ec1a34f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 10 Sep 2007 11:07:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yakuake?expand=0&rev=4 --- ... => yakuake-fix_Accesskey_handling_v2.diff | 25 ++++++++++--------- yakuake.changes | 7 ++++++ yakuake.spec | 10 +++++--- 3 files changed, 27 insertions(+), 15 deletions(-) rename yakuake-fix_Accesskey_handling.diff => yakuake-fix_Accesskey_handling_v2.diff (73%) diff --git a/yakuake-fix_Accesskey_handling.diff b/yakuake-fix_Accesskey_handling_v2.diff similarity index 73% rename from yakuake-fix_Accesskey_handling.diff rename to yakuake-fix_Accesskey_handling_v2.diff index 15d02e3..1ba6611 100644 --- a/yakuake-fix_Accesskey_handling.diff +++ b/yakuake-fix_Accesskey_handling_v2.diff @@ -1,5 +1,5 @@ ---- yakuake-2.8-beta1/yakuake/src/main_window.cpp 2007-05-06 02:32:58.000000000 +0200 -+++ yakuake-2.8-beta1/yakuake/src/main_window.cpp 2007-05-15 19:35:58.000000000 +0200 +--- yakuake-2.8_beta1/yakuake/src/main_window.cpp 2007-09-07 17:50:14.000000000 +0200 ++++ yakuake-2.8_beta1/yakuake/src/main_window.cpp 2007-09-07 17:50:16.000000000 +0200 @@ -35,6 +35,8 @@ KMainWindow(parent, name, Qt::WStyle_Customize | Qt::WStyle_NoBorder), step(0) @@ -9,23 +9,24 @@ first_run_dialog = 0; about_app = 0; about_kde = 0; -@@ -206,11 +208,18 @@ +@@ -205,12 +207,20 @@ + connect(tab_bar, SIGNAL(itemSelected(int)), this, SLOT(slotSelectSession(int))); connect(&desk_info, SIGNAL(workAreaChanged()), this, SLOT(slotUpdateSize())); ++ // Startup notification popup. - if (Settings::popup() && !Settings::firstrun()) - showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(global_key->shortcut("AccessKey").toString())); -- -+ if (Settings::popup() && !Settings::firstrun()) -+ { ++ if (!Settings::firstrun()) { + QString _key = global_key->shortcut("AccessKey").toString(); -+ if (!_key.isEmpty()) -+ { -+ showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(_key)); -+ haveAccessKey = true; -+ } ++ if (!_key.isEmpty()) { ++ if (Settings::popup()) { ++ showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(_key)); ++ } ++ haveAccessKey = true; ++ } + } -+ + // First run dialog. - if (Settings::firstrun()) + if (Settings::firstrun() || !haveAccessKey) diff --git a/yakuake.changes b/yakuake.changes index d58bd73..dcc7d03 100644 --- a/yakuake.changes +++ b/yakuake.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 7 18:02:30 CEST 2007 - dkukawka@suse.de + +- updated patches: + - yakuake-fix_Accesskey_handling_v2.diff: fix b.n.c #307273, + fixed missplaced check for Settings::popup() + ------------------------------------------------------------------- Tue May 15 19:43:42 CEST 2007 - dkukawka@suse.de diff --git a/yakuake.spec b/yakuake.spec index 43bff4b..fd509fa 100644 --- a/yakuake.spec +++ b/yakuake.spec @@ -12,16 +12,16 @@ Name: yakuake BuildRequires: kdelibs3-devel -License: GNU General Public License (GPL) +License: GPL v2 or later URL: http://kde-apps.org/content/show.php?content=29153 Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: yakuake is a terminal for KDE Version: 2.8_beta1 -Release: 7 +Release: 47 Source: %{name}-%{version}.tar.bz2 Source1: yakuake.desktop -Patch1: yakuake-fix_Accesskey_handling.diff +Patch1: yakuake-fix_Accesskey_handling_v2.diff %description Yakukake is a retractable KDE Terminal Emulator. @@ -72,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT /opt/kde3/share/locale/*/LC_MESSAGES/*.mo %changelog +* Fri Sep 07 2007 - dkukawka@suse.de +- updated patches: + - yakuake-fix_Accesskey_handling_v2.diff: fix b.n.c #307273, + fixed missplaced check for Settings::popup() * Tue May 15 2007 - dkukawka@suse.de - added patches: - yakuake-fix_Accesskey_handling.diff for b.n.c #272147 to change