[Pkg-kde-commits] rev 2248 - trunk/packages/kdeutils/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-11-13 18:49:31 +0000 (Sun, 13 Nov 2005)
New Revision: 2248

Modified:
   trunk/packages/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff
   trunk/packages/kdeutils/debian/patches/11_floppy_nodes.diff
Log:
Re-sync kdeutils patches.


Modified: trunk/packages/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff	2005-11-13 18:48:28 UTC (rev 2247)
+++ trunk/packages/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff	2005-11-13 18:49:31 UTC (rev 2248)
@@ -8,8 +8,8 @@
 -		QString str(i18n("The %1 application does not seem to have "
 -					"the same size or checksum as when it was compiled we do NOT recommend "
 -					"you proceed with making it setuid-root without further investigation").arg(helper));
--		int rc = KMessageBox::questionYesNo(0, str, i18n("KLaptopDaemon"), KStdGuiItem::cancel(), KStdGuiItem::cont(), "");
--		if (rc != KMessageBox::No) 
+-		int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless"));
+-		if (rc != KMessageBox::Continue) 
 -			return;
 -	}
  
@@ -25,8 +25,8 @@
 -		QString str(i18n("The %1 application does not seem to have "
 -					"the same size or checksum as when it was compiled we do NOT recommend "
 -					"you proceed with making it setuid-root without further investigation").arg(helper));
--		int rc = KMessageBox::questionYesNo(0, str, i18n("KLaptopDaemon"), KStdGuiItem::cancel(), KStdGuiItem::cont(), "");
--		if (rc != KMessageBox::No) 
+-		int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless"));
+-		if (rc != KMessageBox::Continue) 
 -			return;
 -	}
  

Modified: trunk/packages/kdeutils/debian/patches/11_floppy_nodes.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/11_floppy_nodes.diff	2005-11-13 18:48:28 UTC (rev 2247)
+++ trunk/packages/kdeutils/debian/patches/11_floppy_nodes.diff	2005-11-13 18:49:31 UTC (rev 2248)
@@ -1,6 +1,6 @@
 --- kde.orig/kfloppy/format.cpp
 +++ kde.patched/kfloppy/format.cpp
-@@ -166,15 +166,15 @@
+@@ -165,15 +165,15 @@
  //
  #ifdef ANY_LINUX