0.9.6claws53
authorChristoph Hohmann <reboot@gmx.ch>
Sun, 26 Oct 2003 16:20:11 +0000 (16:20 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Sun, 26 Oct 2003 16:20:11 +0000 (16:20 +0000)
* src/pgpmime.c
* src/sgpgme.c
        change display of signature info to use only name of
        signer, otherwise the text gets too long.

* src/procmime.c
        don't use MimeInfo's filename to generate tmp filename

ChangeLog.claws
configure.ac
src/pgpmime.c
src/procmime.c
src/sgpgme.c

index 4e8e5bd..f176325 100644 (file)
@@ -1,3 +1,13 @@
+2003-10-26 [christoph] 0.9.6claws53
+
+       * src/pgpmime.c
+       * src/sgpgme.c
+               change display of signature info to use only name of
+               signer, otherwise the text gets too long.
+
+       * src/procmime.c
+               don't use MimeInfo's filename to generate tmp filename
+
 2003-10-25 [christoph] 0.9.6claws52
 
        * src/procmime.c
 2003-10-25 [christoph] 0.9.6claws52
 
        * src/procmime.c
index 13b8c88..7ce5aae 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=52
+EXTRA_VERSION=53
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index b1c76d0..c4d6f44 100644 (file)
@@ -172,8 +172,6 @@ static gint pgpmime_check_signature(MimeInfo *mimeinfo)
        gpgme_data_release(textdata);
        g_string_free(textstr, TRUE);
        
        gpgme_data_release(textdata);
        g_string_free(textstr, TRUE);
        
-       printf("result: %d\n", data->sigstatus);
-       
        return 0;
 }
 
        return 0;
 }
 
index 7a22ac8..6ac5a5a 100644 (file)
@@ -677,8 +677,7 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
        if ((mimeinfo->type == MIMETYPE_TEXT) && !g_strcasecmp(mimeinfo->subtype, "html"))
                base = "mimetmp.html";
        else {
        if ((mimeinfo->type == MIMETYPE_TEXT) && !g_strcasecmp(mimeinfo->subtype, "html"))
                base = "mimetmp.html";
        else {
-               base = mimeinfo->filename ? mimeinfo->filename
-                       : mimeinfo->name ? mimeinfo->name : "mimetmp";
+               base = mimeinfo->name ? mimeinfo->name : "mimetmp";
                base = g_basename(base);
                if (*base == '\0') base = "mimetmp";
                Xstrdup_a(base, base, return NULL);
                base = g_basename(base);
                if (*base == '\0') base = "mimetmp";
                Xstrdup_a(base, base, return NULL);
index 179fff7..5098be0 100644 (file)
@@ -113,7 +113,7 @@ gchar *sgpgme_sigstat_info_short(GpgmeCtx ctx, GpgmeSigStat status)
                        GPGME_ATTR_VALIDITY, 0);
                
                return g_strdup_printf(_("Valid signature by %s (Trust: %s)"),
                        GPGME_ATTR_VALIDITY, 0);
                
                return g_strdup_printf(_("Valid signature by %s (Trust: %s)"),
-                       gpgme_key_get_string_attr(key, GPGME_ATTR_USERID, NULL, 0),
+                       gpgme_key_get_string_attr(key, GPGME_ATTR_NAME, NULL, 0),
                        get_validity_str(validity));
        }
        case GPGME_SIG_STAT_GOOD_EXP:
                        get_validity_str(validity));
        }
        case GPGME_SIG_STAT_GOOD_EXP: