[Commits] passphrase.c 1.1.2.37 1.1.2.38

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/plugins/pgpcore
In directory srv:/tmp/cvs-serv25974/src/plugins/pgpcore

Modified Files:
      Tag: gtk2
	passphrase.c 
Log Message:
2012-09-12 [colin]	3.8.1cvs51

	* src/compose.c
	* src/mh.c
	* src/common/ssl.c
	* src/plugins/pgpcore/passphrase.c
		Apply patches from bug #1961, "patches for
		a couple of clang warnings":
		- Check return codes
		- Remove dead code

Index: passphrase.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/pgpcore/Attic/passphrase.c,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -d -r1.1.2.37 -r1.1.2.38
--- passphrase.c	27 May 2012 17:31:07 -0000	1.1.2.37
+++ passphrase.c	12 Sep 2012 08:52:47 -0000	1.1.2.38
@@ -58,8 +58,7 @@
 static gboolean passphrase_key_pressed(GtkWidget *widget, GdkEventKey *event,
 				       gpointer data);
 
-static GtkWidget *create_description(const gchar *uid_hint,
-				     const gchar *pass_hint, gint prev_bad, gint new_key);
+static GtkWidget *create_description(const gchar *uid_hint, gint prev_bad, gint new_key);
 
 void
 gpgmegtk_set_passphrase_grab(gint yes)
@@ -102,7 +101,7 @@
 
     if (uid_hint || pass_hint) {
         GtkWidget *label, *icon;
-        label = create_description (uid_hint, pass_hint, prev_bad, new_key);
+        label = create_description (uid_hint, prev_bad, new_key);
 	icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION,
         			GTK_ICON_SIZE_DIALOG); 
 
@@ -244,9 +243,9 @@
 }
 
 static GtkWidget *
-create_description(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gint new_key)
+create_description(const gchar *uid_hint, gint prev_bad, gint new_key)
 {
-    const gchar *uid = NULL, *info = NULL;
+    const gchar *uid = NULL;
     gchar *buf;
     GtkWidget *label;
     gchar *my_uid = NULL;
@@ -254,10 +253,6 @@
         uid = _("[no user id]");
     else
         uid = uid_hint;
-    if (!pass_hint)
-        info = "";
-    else
-        info = pass_hint;
 
     my_uid = g_strdup(uid);
     while (strchr(my_uid, '<'))