gmime r1435 - in trunk: . gmime

[fejj svn gnome org]

Author: fejj
Date: Sun Sep  7 16:58:39 2008
New Revision: 1435
URL: http://svn.gnome.org/viewvc/gmime?rev=1435&view=rev

Log:
2008-09-07  Jeffrey Stedfast  <fejj novell com>

	* gmime/gmime-gpg-context.c: Use g_hash_table_new_full() so that
	we don't have to g_hash_table_foreach() to remove all user-id
	hints before destroying the user-id hint hashtable.



Modified:
   trunk/ChangeLog
   trunk/gmime/gmime-gpg-context.c

Modified: trunk/gmime/gmime-gpg-context.c
==============================================================================
--- trunk/gmime/gmime-gpg-context.c	(original)
+++ trunk/gmime/gmime-gpg-context.c	Sun Sep  7 16:58:39 2008
@@ -313,7 +313,7 @@
 	gpg->mode = GPG_CTX_MODE_SIGN;
 	gpg->session = session;
 	g_object_ref (session);
-	gpg->userid_hint = g_hash_table_new (g_str_hash, g_str_equal);
+	gpg->userid_hint = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	gpg->complete = FALSE;
 	gpg->seen_eof1 = TRUE;
 	gpg->seen_eof2 = FALSE;
@@ -470,13 +470,6 @@
 }
 
 static void
-userid_hint_free (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	g_free (value);
-}
-
-static void
 gpg_ctx_free (struct _GpgCtx *gpg)
 {
 	GMimeSigner *signer, *next;
@@ -485,7 +478,6 @@
 	if (gpg->session)
 		g_object_unref (gpg->session);
 	
-	g_hash_table_foreach (gpg->userid_hint, userid_hint_free, NULL);
 	g_hash_table_destroy (gpg->userid_hint);
 	
 	g_free (gpg->path);