From d25f029311a8973df3b94c905bc0289d9446a133b36c8f06cc8e4874a840370b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 17 May 2007 10:01:20 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/yakuake?expand=0&rev=3

---
 yakuake-fix_Accesskey_handling.diff | 60 +++++++++++++++++++++++++++++
 yakuake.changes                     | 10 ++++-
 yakuake.spec                        | 11 +++++-
 3 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 yakuake-fix_Accesskey_handling.diff

diff --git a/yakuake-fix_Accesskey_handling.diff b/yakuake-fix_Accesskey_handling.diff
new file mode 100644
index 0000000..15d02e3
--- /dev/null
+++ b/yakuake-fix_Accesskey_handling.diff
@@ -0,0 +1,60 @@
+--- 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
+@@ -35,6 +35,8 @@
+         KMainWindow(parent, name, Qt::WStyle_Customize | Qt::WStyle_NoBorder),
+         step(0)
+ {
++    bool haveAccessKey = false;
++
+     first_run_dialog = 0;
+     about_app = 0;
+     about_kde = 0;
+@@ -206,11 +208,18 @@
+     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()) 
++    {
++	QString _key = global_key->shortcut("AccessKey").toString();
++	if (!_key.isEmpty()) 
++        {
++	    showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(_key));
++            haveAccessKey = true;
++        }
++    }
++    
+     // First run dialog.
+-    if (Settings::firstrun())
++    if (Settings::firstrun() || !haveAccessKey)
+     {
+         QTimer::singleShot(0, this, SLOT(slotToggleState()));
+         QTimer::singleShot(0, this, SLOT(slotOpenFirstRunDialog()));
+@@ -1051,6 +1060,8 @@
+     global_key->updateConnections();
+     global_key->writeSettings(&config);
+ 
++    config.sync();
++
+     slotDialogFinished();
+ }
+ 
+@@ -1066,6 +1077,8 @@
+ 
+     actionCollection()->writeShortcutSettings("Shortcuts", &config);
+ 
++    config.sync();
++
+     slotDialogFinished();
+ }
+ 
+@@ -1179,6 +1192,7 @@
+         global_key->setShortcut("AccessKey", first_run_dialog_page->shortcut());
+         global_key->updateConnections();
+         global_key->writeSettings(&config);
++    	config.sync();
+     }
+ 
+     Settings::setFirstrun(false);
diff --git a/yakuake.changes b/yakuake.changes
index e5e283f..d58bd73 100644
--- a/yakuake.changes
+++ b/yakuake.changes
@@ -1,8 +1,16 @@
+-------------------------------------------------------------------
+Tue May 15 19:43:42 CEST 2007 - dkukawka@suse.de
+
+- added patches:
+  - yakuake-fix_Accesskey_handling.diff for b.n.c #272147 to change
+    handling of Accesskey settings. Ask always for input key if
+    there is no key set and added some KConfig::sync() calls.
+
 -------------------------------------------------------------------
 Sun May  6 12:53:26 CEST 2007 - dkukawka@suse.de
 
 - updated to new upstream beta version 2.8-beta1:
-  * changelog too long please check ChangeLog file 
+  * changelog to long please check ChangeLog file 
 
 -------------------------------------------------------------------
 Wed May 24 19:21:21 CEST 2006 - adrian@suse.de
diff --git a/yakuake.spec b/yakuake.spec
index 042c6ab..43bff4b 100644
--- a/yakuake.spec
+++ b/yakuake.spec
@@ -18,9 +18,10 @@ Group:          System/GUI/KDE
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        yakuake is a terminal for KDE
 Version:        2.8_beta1
-Release:        1
+Release:        7
 Source:         %{name}-%{version}.tar.bz2
 Source1:        yakuake.desktop
+Patch1:         yakuake-fix_Accesskey_handling.diff
 
 %description
 Yakukake is a retractable KDE Terminal Emulator.
@@ -33,6 +34,7 @@ Authors:
 
 %prep
 %setup -n %{name}-%{version} -q
+%patch1 -p1
 . /etc/opt/kde3/common_options
 update_admin
 
@@ -70,9 +72,14 @@ rm -rf $RPM_BUILD_ROOT
 /opt/kde3/share/locale/*/LC_MESSAGES/*.mo
 
 %changelog
+* Tue May 15 2007 - dkukawka@suse.de
+- added patches:
+  - yakuake-fix_Accesskey_handling.diff for b.n.c #272147 to change
+  handling of Accesskey settings. Ask always for input key if
+  there is no key set and added some KConfig::sync() calls.
 * Sun May 06 2007 - dkukawka@suse.de
 - updated to new upstream beta version 2.8-beta1:
-  * changelog too long please check ChangeLog file
+  * changelog to long please check ChangeLog file
 * Wed May 24 2006 - adrian@suse.de
 - fix build for < 10.1
 * Mon Mar 27 2006 - dkukawka@suse.de