[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/certmanager/lib/ui
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-10-17 21:06:49
Message-ID: 20041017210649.249A516BD9 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Fix --enable-final


  M +0 -1      Makefile.am   1.13
  M +3 -0      keyrequester.cpp   1.18
  M +3 -0      keyselectiondialog.cpp   1.27


--- kdepim/certmanager/lib/ui/Makefile.am  #1.12:1.13
@@ -1,3 +1,2 @@
-KDE_OPTIONS = nofinal
 
 INCLUDES = -I$(top_srcdir)/libkdenetwork \

--- kdepim/certmanager/lib/ui/keyrequester.cpp  #1.17:1.18
@@ -224,4 +224,6 @@ void Kleo::KeyRequester::updateKeys() {
 }
 
+#ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
+#define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
 static void showKeyListError( QWidget * parent, const GpgME::Error & err ) {
   assert( err );
@@ -233,4 +235,5 @@ static void showKeyListError( QWidget * 
   KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
 }
+#endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
 
 void Kleo::KeyRequester::startKeyListJob( const QStringList & fingerprints ) {

--- kdepim/certmanager/lib/ui/keyselectiondialog.cpp  #1.26:1.27
@@ -484,4 +484,6 @@ void Kleo::KeySelectionDialog::slotRerea
 }
 
+#ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
+#define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
 static void showKeyListError( QWidget * parent, const GpgME::Error & err ) {
   assert( err );
@@ -493,4 +495,5 @@ static void showKeyListError( QWidget * 
   KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
 }
+#endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
 
 namespace {


[prev in list] [next in list] [prev in thread] [next in thread]