rpms/kdesdk/F-10 kdesdk-4.1.2-quit.patch, NONE, 1.1 kdesdk.spec, 1.118, 1.119 kdesdk-4.1.1-quit.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17001

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.1.2-quit.patch 
Removed Files:
	kdesdk-4.1.1-quit.patch 
Log Message:
- check if the document has been saved, if not ask the user
  to save the change or close without saving



kdesdk-4.1.2-quit.patch:

--- NEW FILE kdesdk-4.1.2-quit.patch ---
diff -up kdesdk-4.1.2/lokalize/src/kaider.cpp.quit kdesdk-4.1.2/lokalize/src/kaider.cpp
--- kdesdk-4.1.2/lokalize/src/kaider.cpp.quit	2008-08-28 10:07:29.000000000 +0200
+++ kdesdk-4.1.2/lokalize/src/kaider.cpp	2008-10-22 23:13:27.000000000 +0200
@@ -225,7 +225,7 @@ void KAider::setupActions()
     //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);
 
 
 //Settings
@@ -820,6 +820,11 @@ bool KAider::queryClose()
     }
 }
 
+void KAider::slotFileQuit()
+{
+    if (queryClose())
+       qApp->quit();
+}
 
 void KAider::undo()
 {
diff -up kdesdk-4.1.2/lokalize/src/kaider.h.quit kdesdk-4.1.2/lokalize/src/kaider.h
--- kdesdk-4.1.2/lokalize/src/kaider.h.quit	2008-10-22 22:50:18.000000000 +0200
+++ kdesdk-4.1.2/lokalize/src/kaider.h	2008-10-22 22:51:48.000000000 +0200
@@ -115,6 +115,7 @@ private slots:
     bool fileSave(const KUrl& url = KUrl());
     bool fileSaveAs();
 
+    void slotFileQuit();
 
     void undo();
     void redo();


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdesdk.spec	22 Oct 2008 16:03:48 -0000	1.118
+++ kdesdk.spec	22 Oct 2008 21:42:18 -0000	1.119
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
 Version:        4.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
-Patch100:       kdesdk-4.1.1-quit.patch
+Patch100:       kdesdk-4.1.2-quit.patch
 # http://bugzilla.redhat.com/467984
 Patch101:       kdesdk-4.1.2-kdecore.patch
 
@@ -223,6 +223,10 @@
 
 
 %changelog
+* Wed Oct 22 2008 Than Ngo <than at redhat.com> 4.1.2-4
+- check if the document has been saved, if not ask the user
+  to save the change or close without saving
+
 * Wed Oct 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
 - -utils should not depend on kdelibs etc (#467984)
 


--- kdesdk-4.1.1-quit.patch DELETED ---