6 files changed, 83 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad300b10f47..27515f767fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-12  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa.el (epa-progress-callback-function): Fix the logic of
+        displaying progress.
+        * epa-file.el (epa-file-insert-file-contents): Make progress
+        display more user-friendly.
+        (epa-file-write-region): Ditto.
+
 2011-08-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * subr.el (string-mark-left-to-right): New function.
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index aa9915d8cfa..118f44854cf 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -137,8 +137,10 @@ encryption is used."
      context
      (cons #'epa-file-passphrase-callback-function
            local-file))
-    (epg-context-set-progress-callback context
-                                       #'epa-progress-callback-function)
+    (epg-context-set-progress-callback
+     context
+     (cons #'epa-progress-callback-function
+           (format "Decrypting %s" file)))
     (unwind-protect
         (progn
           (if replace
@@ -211,8 +213,10 @@ encryption is used."
      context
      (cons #'epa-file-passphrase-callback-function
            file))
-    (epg-context-set-progress-callback context
-                                       #'epa-progress-callback-function)
+    (epg-context-set-progress-callback
+     context
+     (cons #'epa-progress-callback-function
+           (format "Encrypting %s" file)))
     (epg-context-set-armor context epa-armor)
     (condition-case error
         (setq string
diff --git a/lisp/epa.el b/lisp/epa.el
index d4f4fab2eed..e2fafc753d7 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -651,10 +651,17 @@ If SECRET is non-nil, list secret keys instead of public keys."
 
 (defun epa-progress-callback-function (_context what _char current total
                                                handback)
-  (message "%s%d%% (%d/%d)" (or handback
-                                (concat what ": "))
-           (if (> total 0) (floor (* (/ current (float total)) 100)) 0)
-           current total))
+  (let ((prompt (or handback
+                    (format "Processing %s: " what))))
+    ;; According to gnupg/doc/DETAIL: a "total" of 0 indicates that
+    ;; the total amount is not known. The condition TOTAL && CUR ==
+    ;; TOTAL may be used to detect the end of an operation.
+    (if (> total 0)
+        (if (= current total)
+            (message "%s...done" prompt)
+          (message "%s...%d%%" prompt
+                   (floor (* (/ current (float total)) 100))))
+      (message "%s..." prompt))))
 
 ;;;###autoload
 (defun epa-decrypt-file (file)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e13d2d594ca..7f4116d6636 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-11  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnimap.el (nnimap-transform-headers): BODYSTRUCTURE for messages of
+        type MESSAGE and subtype RFC822 is slightly different from those of
+        type TEXT.
+
 2011-08-05  Andrew Cohen  <cohen@andy.bu.edu>
 
         * gnus-sum.el (gnus-summary-refer-article): Warp to article. This
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index f41f4af71b4..c940e06fbb6 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -218,7 +218,11 @@ textual parts.")
             (while (and (consp structure)
                         (not (stringp (car structure))))
               (setq structure (car structure)))
-            (setq lines (nth 7 structure))))
+            (setq lines (if (and
+                             (equal (upcase (nth 0 structure)) "MESSAGE")
+                             (equal (upcase (nth 1 structure)) "RFC822"))
+                            (nth 9 structure)
+                          (nth 7 structure)))))
         (delete-region (line-beginning-position) (line-end-position))
         (insert (format "211 %s Article retrieved." article))
         (forward-line 1)
diff --git a/src/xwidget.c b/src/xwidget.c
index 89cd859fdfc..7f78ffed5e7 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -734,7 +734,51 @@ void                gtk_window_get_position             (GtkWindow *window,
   *root_y = 0;
 }
 
+DEFUN ("xwidget-webkit-dom-dump", Fxwidget_webkit_dom_dump,  Sxwidget_webkit_dom_dump, 1, 1, 0,
+       doc:     /* webkit dom dump*/
+       )
+  (Lisp_Object xwidget)
+{
+  struct xwidget* xw = XXWIDGET(xwidget);
+  xwidget_webkit_dom_dump(webkit_web_view_get_dom_document(xw->widget_osr));
+  return Qnil;
+}
 
+void
+xwidget_webkit_dom_dump(WebKitDOMNode* parent){
+  WebKitDOMNodeList* list;
+  int i;
+  int length;
+  WebKitDOMNode* attribute;
+  WebKitDOMNamedNodeMap* attrs;
+  printf("node:%d type:%d name:%s content:%s\n",
+         parent,
+         webkit_dom_node_get_node_type(parent),//1 element 3 text 8 comment 2 attribute
+         webkit_dom_node_get_local_name(parent),
+         webkit_dom_node_get_text_content(parent));
+
+  if(webkit_dom_node_has_attributes(parent)){
+    attrs = webkit_dom_node_get_attributes(parent);
+
+    length = webkit_dom_named_node_map_get_length(attrs);
+    for (int i = 0; i < length; i++) {
+      attribute = webkit_dom_named_node_map_item(attrs,i);
+      printf(" attr node:%d type:%d name:%s content:%s\n",
+             attribute,
+             webkit_dom_node_get_node_type(attribute),//1 element 3 text 8 comment
+             webkit_dom_node_get_local_name(attribute),
+             webkit_dom_node_get_text_content(attribute));
+    }
+  }
+  list = webkit_dom_node_get_child_nodes(parent);
+  length = webkit_dom_node_list_get_length(list);
+  WebKitDOMNode* child;
+  for (int i = 0; i < length; i++) {
+    child = webkit_dom_node_list_item(list, i);
+    //if(webkit_dom_node_has_child_nodes(child))
+    xwidget_webkit_dom_dump(child);
+  }
+}
 
 
 #endif
@@ -912,6 +956,7 @@ syms_of_xwidget (void)
   defsubr (&Sxwidget_disable_plugin_for_mime);
 
   defsubr (&Sxwidget_send_keyboard_event);
+  defsubr (&Sxwidget_webkit_dom_dump);
   DEFSYM (Qxwidget ,"xwidget");
 
   DEFSYM (Qcxwidget ,":xwidget");