[svn] GPGol - r90 - trunk/src
svn author twoaday
cvs at cvs.gnupg.org
Wed Sep 7 23:43:04 CEST 2005
Author: twoaday
Date: 2005-09-07 23:43:02 +0200 (Wed, 07 Sep 2005)
New Revision: 90
Removed:
trunk/src/libgpgmedlgs/
Modified:
trunk/src/ChangeLog
trunk/src/HashTable.cpp
trunk/src/HashTable.h
trunk/src/common.c
trunk/src/config-dialog.c
trunk/src/engine-gpgme.c
trunk/src/engine.h
trunk/src/gpgmsg.cpp
trunk/src/intern.h
trunk/src/keycache.c
trunk/src/keycache.h
trunk/src/main.c
trunk/src/olflange.cpp
trunk/src/passphrase-dialog.c
trunk/src/usermap.c
trunk/src/usermap.h
Log:
Removed unused code and changed project name in file comments.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/ChangeLog 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,5 +1,10 @@
2005-09-07 Timo Schulz <ts at g10code.com>
+ * common.c: Removed unused code.
+ * intern.h: Likewise.
+
+2005-09-07 Timo Schulz <ts at g10code.com>
+
* olflange.cpp (ul_release): New. Wrapper with error checking
around UlRelease.
(InstallCommands): Separate test for type and if string is empty.
Modified: trunk/src/HashTable.cpp
===================================================================
--- trunk/src/HashTable.cpp 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/HashTable.cpp 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,20 +1,20 @@
/* HashTable.cpp
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <string.h>
Modified: trunk/src/HashTable.h
===================================================================
--- trunk/src/HashTable.h 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/HashTable.h 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,24 +1,24 @@
/* HashTable.h
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef MAPI_HASHTABLE_H
-#define MAPI_HASHTABLE_H
+#ifndef GPGOL_HASHTABLE_H
+#define GPGOL_HASHTABLE_H
class HashTable
{
@@ -40,4 +40,4 @@
void clear ();
};
-#endif /*MAPI_HASHTABLE_H*/
+#endif /*GPGOL_HASHTABLE_H*/
Modified: trunk/src/common.c
===================================================================
--- trunk/src/common.c 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/common.c 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,27 +1,26 @@
/* common.c
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <windows.h>
#include <time.h>
#include "gpgme.h"
-#include "keycache.h"
#include "intern.h"
HINSTANCE glob_hinst = NULL;
@@ -114,22 +113,6 @@
}
-cache_item_t
-cache_item_new (void)
-{
- return xcalloc (1, sizeof (struct cache_item_s));
-}
-
-void
-cache_item_free (cache_item_t itm)
-{
- if (itm == NULL)
- return;
- xfree (itm->pass);
- itm->pass = NULL;
- xfree (itm);
-}
-
/* This is a helper function to load a Windows function from either of
one DLLs. */
HRESULT
Modified: trunk/src/config-dialog.c
===================================================================
--- trunk/src/config-dialog.c 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/config-dialog.c 2005-09-07 21:43:02 UTC (rev 90)
@@ -31,7 +31,6 @@
#include <gpgme.h>
#include "gpgol-ids.h"
-#include "keycache.h"
#include "intern.h"
/* Registry path to GnuPG */
Modified: trunk/src/engine-gpgme.c
===================================================================
--- trunk/src/engine-gpgme.c 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/engine-gpgme.c 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,20 +1,20 @@
/* engine-gpgme.c - Crypto engine with GPGME
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: trunk/src/engine.h
===================================================================
--- trunk/src/engine.h 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/engine.h 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,25 +1,25 @@
/* engine.h - Crypto engine
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef ENGINE_H
-#define ENGINE_H 1
+#ifndef GPGOL_ENGINE_H
+#define GPGOL_ENGINE_H 1
#ifdef __cplusplus
extern "C" {
@@ -85,4 +85,4 @@
#endif
-#endif /*ENGINE_H*/
+#endif /*GPGOL_ENGINE_H*/
Modified: trunk/src/gpgmsg.cpp
===================================================================
--- trunk/src/gpgmsg.cpp 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/gpgmsg.cpp 2005-09-07 21:43:02 UTC (rev 90)
@@ -87,7 +87,7 @@
/*
- The implementation class of MapiGPGME.
+ The implementation class of GpgMsg.
*/
class GpgMsgImpl : public GpgMsg
{
Modified: trunk/src/intern.h
===================================================================
--- trunk/src/intern.h 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/intern.h 2005-09-07 21:43:02 UTC (rev 90)
@@ -2,24 +2,24 @@
* Copyright (C) 2004 Timo Schulz
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _GPGMEDLGS_INTERN_H_
-#define _GPGMEDLGS_INTERN_H_
+#ifndef GPGOL_INTERN_H
+#define GPGOL_INTERN_H
#include <gpgme.h>
@@ -47,17 +47,6 @@
};
-typedef enum
- {
- GPG_ATTACH_NONE = 0,
- GPG_ATTACH_DECRYPT = 1,
- GPG_ATTACH_ENCRYPT = 2,
- GPG_ATTACH_SIGN = 4,
- GPG_ATTACH_SIGNENCRYPT = GPG_ATTACH_SIGN|GPG_ATTACH_ENCRYPT
- }
-gpgol_attachment_action_t;
-
-
typedef enum
{
GPG_FMT_NONE = 0, /* do not encrypt attachments */
@@ -98,14 +87,6 @@
unsigned int last_was_bad:1;
};
-struct cache_item_s
-{
- char keyid[16+1];
- char *pass;
- unsigned ttl;
-};
-typedef struct cache_item_s *cache_item_t;
-
/* Global options - initialized to default by main.c. */
#ifdef __cplusplus
extern
@@ -138,18 +119,11 @@
void set_global_hinstance (HINSTANCE hinst);
void center_window (HWND childwnd, HWND style);
-cache_item_t cache_item_new (void);
-void cache_item_free (cache_item_t itm);
-
HRESULT w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e);
/*-- olflange.cpp --*/
-/*-- MapiGPGME.cpp --*/
-int initialize_mapi_gpgme (void);
-
-
/*-- recipient-dialog.c --*/
int recipient_dialog_box(gpgme_key_t **ret_rset, int *ret_opts);
int recipient_dialog_box2 (gpgme_key_t *fnd, char **unknown, size_t n,
@@ -175,4 +149,4 @@
}
#endif
-#endif /*_GPGMEDLGS_INTERN_H_*/
+#endif /*GPGOL_INTERN_H*/
Modified: trunk/src/keycache.c
===================================================================
--- trunk/src/keycache.c 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/keycache.c 2005-09-07 21:43:02 UTC (rev 90)
@@ -2,20 +2,20 @@
* Copyright (C) 2004 Timo Schulz
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <windows.h>
Modified: trunk/src/keycache.h
===================================================================
--- trunk/src/keycache.h 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/keycache.h 2005-09-07 21:43:02 UTC (rev 90)
@@ -2,24 +2,24 @@
* Copyright (C) 2004 Timo Schulz
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _GPGMEDLGS_KEYCACHE_H_
-#define _GPGMEDLGS_KEYCACHE_H_
+#ifndef GPGOL_KEYCACHE_H
+#define GPGOL_KEYCACHE_H
#ifdef __cplusplus
extern "C" {
@@ -54,4 +54,4 @@
}
#endif
-#endif /*_GPGMEDLGS_KEYCACHE_H_*/
+#endif /*GPGOL_KEYCACHE_H*/
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/main.c 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,20 +1,20 @@
/* main.c - DLL entry point
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/olflange.cpp 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,4 +1,4 @@
-/* olflange.cpp - Flange between Outlook and the MapiGPGME class
+/* olflange.cpp - Flange between Outlook and the GpgMsg class
* Copyright (C) 2001 G Data Software AG, http://www.gdata.de
* Copyright (C) 2004, 2005 g10 Code GmbH
*
@@ -205,8 +205,7 @@
if (!punk)
return;
res = UlRelease (punk);
- if (res != S_OK)
- log_debug ("%s UlRelease(%p) failed: %lu\n", __func__, punk, res);
+ log_debug ("%s UlRelease(%p) had %lu references\n", __func__, punk, res);
}
Modified: trunk/src/passphrase-dialog.c
===================================================================
--- trunk/src/passphrase-dialog.c 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/passphrase-dialog.c 2005-09-07 21:43:02 UTC (rev 90)
@@ -37,7 +37,7 @@
static char const allhexdigits[] = "1234567890ABCDEFabcdef";
-
+#if 0 /* XXX: left over from old code?? */
static void
add_string_list (HWND hbox, const char **list, int start_idx)
{
@@ -48,6 +48,7 @@
SendMessage (hbox, CB_ADDSTRING, 0, (LPARAM)(const char *)s);
SendMessage (hbox, CB_SETCURSEL, (WPARAM) start_idx, 0);
}
+#endif
static void
Modified: trunk/src/usermap.c
===================================================================
--- trunk/src/usermap.c 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/usermap.c 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,27 +1,26 @@
/* usermap.c - Map keyid's to userid's
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <windows.h>
#include <time.h>
#include "gpgme.h"
-#include "keycache.h"
#include "intern.h"
#include "usermap.h"
Modified: trunk/src/usermap.h
===================================================================
--- trunk/src/usermap.h 2005-09-07 06:53:58 UTC (rev 89)
+++ trunk/src/usermap.h 2005-09-07 21:43:02 UTC (rev 90)
@@ -1,35 +1,33 @@
/* usermap.h - Map keyid's to userid's
* Copyright (C) 2005 g10 Code GmbH
*
- * This file is part of GPGME Dialogs.
+ * This file is part of GPGol.
*
- * GPGME Dialogs is free software; you can redistribute it and/or
+ * GPGol is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
- * GPGME Dialogs is distributed in the hope that it will be useful,
+ * GPGol is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with GPGME Dialogs; if not, write to the Free Software Foundation,
+ * along with GPGol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _GPGMEDLGS_USERMAP_H
-#define _GPGMEDLGS_USERMAP_H
+#ifndef GPGOL_USERMAP_H
+#define GPGOL_USERMAP_H
void* new_usermap (gpgme_recipient_t rset);
void free_usermap (void *ctx);
-/* BEGIN C INTERFACE */
void* HashTable_new (int n);
void HashTable_free (void *ctx);
void HashTable_put (void *ctx, const char *key, void *val);
void* HashTable_get (void *ctx, const char *key);
void* HashTable_get_i (void *ctx, int pos);
int HashTable_size (void *ctx);
-/* END C INTERFACE */
-#endif /*_GPGMEDLGS_USERMAP_H*/
+#endif /*GPGOL_USERMAP_H*/
More information about the Gnupg-commits
mailing list