rpms/kdesdk/devel kdesdk-4.1.80-quit.patch, NONE, 1.1 kdesdk.spec, 1.124, 1.125 kdesdk-4.1.2-quit.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23524/devel

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.1.80-quit.patch 
Removed Files:
	kdesdk-4.1.2-quit.patch 
Log Message:
- rebase Lokalize quit menu patch

kdesdk-4.1.80-quit.patch:

--- NEW FILE kdesdk-4.1.80-quit.patch ---
diff -ur kdesdk-4.1.80/lokalize/src/kaider.cpp kdesdk-4.1.80-quit/lokalize/src/kaider.cpp
--- kdesdk-4.1.80/lokalize/src/kaider.cpp	2008-11-12 17:37:37.000000000 +0100
+++ kdesdk-4.1.80-quit/lokalize/src/kaider.cpp	2008-12-02 00:46:02.000000000 +0100
@@ -393,7 +393,7 @@
     //action->setText(i18nc("@action:inmenu","Close all Lokalize windows"));
 
     //KStandardAction::quit(kapp, SLOT(quit()), ac);
-    //KStandardAction::quit(this, SLOT(deleteLater()), ac);
+    KStandardAction::quit(this, SLOT(slotFileQuit()), ac);
 
 
 #define ADD_ACTION_ICON(_name,_text,_shortcut,_icon)\
@@ -862,6 +862,12 @@
 }
 
 
+void EditorWindow::slotFileQuit()
+{
+    if (queryClose())
+        qApp->quit();
+}
+
 void EditorWindow::undo()
 {
     gotoEntry(_catalog->undo(),0);
diff -ur kdesdk-4.1.80/lokalize/src/kaider.h kdesdk-4.1.80-quit/lokalize/src/kaider.h
--- kdesdk-4.1.80/lokalize/src/kaider.h	2008-10-17 13:01:05.000000000 +0200
+++ kdesdk-4.1.80-quit/lokalize/src/kaider.h	2008-12-02 00:43:45.000000000 +0100
@@ -185,6 +185,8 @@
     //gui
     void switchForm(int);
 
+    void slotFileQuit();
+
     void undo();
     void redo();
     void findNext();


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kdesdk.spec	1 Dec 2008 23:12:57 -0000	1.124
+++ kdesdk.spec	1 Dec 2008 23:48:24 -0000	1.125
@@ -1,5 +1,3 @@
-%define _default_patch_fuzz 2
-
 Name:           kdesdk
 Version:        4.1.80
 Release:        3%{?dist}
@@ -10,7 +8,7 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0:         kdesdk-4.1.2-quit.patch
+Patch0:         kdesdk-4.1.80-quit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -217,6 +215,7 @@
 * Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
 - BR plasma-devel instead of kdebase-workspace-devel
 - don't require kdebase-workspace
+- rebase Lokalize quit menu patch
 
 * Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
 - merged
@@ -225,7 +224,6 @@
 - 4.1.80
 - BR cmake >= 2.6.2
 - make install/fast
-- rebase lokalize quit menu patch
 - kdesdk-4.1.2-kdecore.patch upstreamed, dropped
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1


--- kdesdk-4.1.2-quit.patch DELETED ---