gnus integration cleanup work

2 files changed, 26 insertions, 22 deletions

diff --git a/rt-liberation-gnus.el b/rt-liberation-gnus.el
index fdb6988..802d1fb 100644
--- a/rt-liberation-gnus.el
+++ b/rt-liberation-gnus.el
@@ -65,6 +65,16 @@ line of an email. For example: \\[company.com #\\([0-9].+?\\)\\]"
   :type 'string
   :group 'rt-liber-gnus)
 
+(defcustom rt-liber-gnus-comment-address "no comment address set"
+  "*Email address for adding a comment."
+  :type 'string
+  :group 'rt-liber-gnus)
+
+(defcustom rt-liber-gnus-address "no reply address set"
+  "*Email address for replying to requestor."
+  :type 'string
+  :group 'rt-liber-gnus)
+
 
 (defvar rt-liber-gnus-p nil
   "Non-nil when rt-liberation-gnus is composing a Gnus buffer.")
@@ -114,6 +124,12 @@ OPTIONS association list of options.
     (save-excursion
       (insert message-text))))
 
+(defun rt-liber-gnus-compose-answer (ticket-alist options)
+  (rt-liber-gnus-compose rt-liber-gnus-address ticket-alist options))
+  
+;; (defun rt-liber-gnus-compose-comment (ticket-alist options)
+;;   (rt-liber-gnus-compose rt-liber-gnus-comment-address ticket-alist options))
+
 (defmacro rt-liber-gnus-with-ticket-buffer (&rest body)
   `(progn
      (when (not (boundp 'rt-liber-ticket-local))
diff --git a/rt-liberation.el b/rt-liberation.el
index f06b75b..898ae7c 100644
--- a/rt-liberation.el
+++ b/rt-liberation.el
@@ -50,14 +50,14 @@
 (declare-function rt-liber-get-ancillary-text "rt-liberation-storage.el")
 (declare-function rt-liber-ticket-marked-p "rt-liberation-multi.el")
 (declare-function rt-liber-set-ancillary-text "rt-liberation-storage.el")
-(declare-function rt-liber-gnus-compose "rt-liberation-gnus.el")
-(declare-function rt-liber-gnus-compose-reply-to-requestor "rt-liberation-gnus.el")
-(declare-function rt-liber-gnus-compose-reply-to-requestor-to-this "rt-liberation-gnus.el")
-(declare-function rt-liber-gnus-compose-reply-to-requestor-verbatim-this "rt-liberation-gnus.el")
-(declare-function rt-liber-gnus-compose-provisional "rt-liberation-gnus.el")
-(declare-function rt-liber-gnus-compose-provisional-to-this "rt-liberation-gnus.el")
-(declare-function rt-liber-gnus-compose-comment "rt-liberation-gnus.el")
-(declare-function rt-liber-gnus-compose-comment-this "rt-liberation-gnus.el")
+;; (declare-function rt-liber-gnus-compose "rt-liberation-gnus.el")
+;; (declare-function rt-liber-gnus-compose-reply-to-requestor "rt-liberation-gnus.el")
+;; (declare-function rt-liber-gnus-compose-reply-to-requestor-to-this "rt-liberation-gnus.el")
+;; (declare-function rt-liber-gnus-compose-reply-to-requestor-verbatim-this "rt-liberation-gnus.el")
+;; (declare-function rt-liber-gnus-compose-provisional "rt-liberation-gnus.el")
+;; (declare-function rt-liber-gnus-compose-provisional-to-this "rt-liberation-gnus.el")
+;; (declare-function rt-liber-gnus-compose-comment "rt-liberation-gnus.el")
+;; (declare-function rt-liber-gnus-compose-comment-this "rt-liberation-gnus.el")
 
 
 (defgroup rt-liber nil
@@ -70,16 +70,6 @@
   :type 'string
   :group 'rt-liber)
 
-(defcustom rt-liber-gnus-comment-address "no comment address set"
-  "*Email address for adding a comment."
-  :type 'string
-  :group 'rt-liber-gnus)
-
-(defcustom rt-liber-gnus-address "no reply address set"
-  "*Email address for replying to requestor."
-  :type 'string
-  :group 'rt-liber-gnus)
-
 
 (defface rt-liber-ticket-face
   '((((class color) (background dark))
@@ -1101,8 +1091,7 @@ ASSOC-BROWSER if non-nil should be a ticket browser."
       (error "no section found"))
     (if (not (featurep 'rt-liberation-gnus))
 	(error "rt-liberation-gnus feature not found")
-      (rt-liber-gnus-compose
-       rt-liber-gnus-address
+      (rt-liber-gnus-compose-answer
        rt-liber-ticket-local
        `((contents . ,(rt-liber-viewer-clean-content section)))))))
 
@@ -1113,8 +1102,7 @@ ASSOC-BROWSER if non-nil should be a ticket browser."
       (error "no section found"))
     (if (not (featurep 'rt-liberation-gnus))
 	(error "rt-liberation-gnus feature not found")
-      (rt-liber-gnus-compose
-       rt-liber-gnus-comment-address
+      (rt-liber-gnus-compose-comment
        rt-liber-ticket-local
        `((contents . ,(rt-liber-viewer-clean-content section)))))))