Changeset 5441:fb0df4ae0836

Timestamp:

2008-07-01 20:06:03 (5 months ago)

Author:

Vincent Lefevre <vincent@…>

Branch:

HEAD

Message:

Clamp timeval math to unsigned int to match progress timestamps.
This is fine since only relative differences matter. Closes #3018.

Files:

• ChangeLog (modified) (1 diff)
• curs_lib.c (modified) (2 diffs)

ChangeLog

@@ -1 @@
-2008-07-01 17:20 -0700  Brendan Cully  <brendan@kublai.com>  (8e2438ec5909)
+2008-07-01 18:29 -0700  Brendan Cully  <brendan@kublai.com>  (f9af0501d2dd)
+
+        * crypt-gpgme.c: Set GPGME locale on first attempt to create context.
+        Closes #2913.
+
+        * crypt-gpgme.c, crypt-gpgme.h, crypt-mod-pgp-gpgme.c: Stub in a
+        gpgme version of extract-keys. It doesn't currently work right
+        because apparently while gpg on the command line can parse a whole
+        message, we'll have to do it for gpgme. I really wonder about the
+        'ME' part of GPGME sometimes.
 
         * crypt-gpgme.c, lib.c, lib.h: Support displaying application/pgp-keys

curs_lib.c

@@ -378 +378 @@
   /* if timestamp is 0 no time-based suppression is done */
   if (TimeInc)
-    progress->timestamp = tv.tv_sec * 1000 + tv.tv_usec / 1000;
+    progress->timestamp = (unsigned int) (tv.tv_sec * 1000)
+        + (unsigned int) (tv.tv_usec / 1000);
   mutt_progress_update (progress, 0, 0);
 }
@@ -401 +402 @@
   /* skip refresh if not enough time has passed */
   if (update && progress->timestamp && !gettimeofday (&tv, NULL)) {
-    now = tv.tv_sec * 1000 + tv.tv_usec / 1000;
+    now = (unsigned int) (tv.tv_sec * 1000)
+          + (unsigned int) (tv.tv_usec / 1000);
     if (now && now - progress->timestamp < TimeInc)
       update = 0;