X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-offline.el;h=f9bc3eb2c49135812c806f950f1600df555bf3cd;hb=2aabdd9c278509a918f59aa9d011c43a7c4918e9;hp=117c5363ea92583780b7829ef43009f993540499;hpb=99cdc842e77b7a8d11f967044ebbaacab748ff0c;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 117c536..f9bc3eb 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -1,5 +1,4 @@
 ;;; gnus-offline.el --- To process mail & news at offline environment.
-;;; $Id: gnus-offline.el,v 1.1.2.5.2.36.4.8 1999-10-24 10:26:31 czkmt Exp $
 
 ;;; Copyright (C) 1998 Tatsuya Ichikawa
 ;;;                    Yukihiro Ito
@@ -78,14 +77,17 @@
 
 (eval '(run-hooks 'gnus-offline-load-hook))
 
-(require 'cl)
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'gnus-clfns))
+
+(eval-when-compile
+  (require 'static)
+  (require 'gnus-agent)
+  (require 'gnus-group))
 (require 'custom)
 (require 'easymenu)
 (provide 'gnus-offline)
 
-(eval-after-load "eword-decode"
-  '(mime-set-field-decoder 'X-Gnus-Offline-Backend nil nil))
-
 (defgroup gnus-offline nil
   "Offline backend utility for Gnus."
   :prefix "gnus-offline-"
@@ -120,17 +122,19 @@
      miee-popup-menu
      gnus-group-toolbar)))
 
-(put 'gnus-offline-set-unplugged-state 'menu-enable 'gnus-offline-connected)
-(if (eq system-type 'windows-nt)
+(if (featurep 'meadow)
     (define-process-argument-editing "/hang\\.exe\\'"
       (lambda (x)
 	(general-process-argument-editing-function
 	 x nil t t nil t t))))
 
-(defcustom gnus-offline-auto-hangup t
-  "*Whether dialup-network automatically hang up when all online jobs has done."
+(defcustom gnus-offline-auto-ppp '(connect disconnect)
+  "*This variable decides whether to connect and/or disconnect automatically."
   :group 'gnus-offline
-  :type 'boolean)
+  :type '(choice
+	  (const :tag "Connection and Disconnection" (connect disconnect))
+	  (const :tag "Connection Only" (connect))
+	  (const :tag "Do Everything Manually" nil)))
 
 (defcustom gnus-offline-load-hook nil
   "*Hook to be run after the gnus-offline package has been loaded."
@@ -188,7 +192,7 @@ If mail , gnus-offline only fetch mail articles.
   :group 'gnus-offline
   :type 'function)
 
-(defcustom gnus-offline-agent-automatic-expire t
+(defcustom gnus-offline-auto-expire t
   "*Non-nil means expire articles on every session."
   :group 'gnus-offline
   :type 'boolean)
@@ -255,9 +259,12 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
     (hangup-line-1 . "Hang up line ... ")
     (hangup-line-2 . "Hang up line ... done.")
     (after-jobs-done-1 . "All online jobs has done.")
-    (toggle-auto-hangup-1 . "Auto hang up logic")
-    (toggle-auto-hangup-2 . "disabled.")
-    (toggle-auto-hangup-3 . "enabled.")
+    (set-auto-ppp-1 . "Connect and disconnect automatically.")
+    (set-auto-ppp-2 . "Connect automatically.")
+    (set-auto-ppp-3 . "Connect and disconnect manually.")
+    (set-auto-ppp-menu-1 . "Automatically Connect/Disconnect")
+    (set-auto-ppp-menu-2 . "Automatically Connect")
+    (set-auto-ppp-menu-3 . "Manually Connect/Disconnect")
     (toggle-on/off-send-mail-1 . "Sending mail immidiately.")
     (toggle-on/off-send-mail-2 . "Sending mail temporary to spool directory.")
     (toggle-articles-to-fetch-1 . "Articles fetch from server.")
@@ -279,7 +286,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
     (menu-miee-4 . "Message Online")
     (menu-1 . "Toggle articles to fetch")
     (menu-2 . "Toggle online/offline send mail")
-    (menu-3 . "Toggle auto hangup")
+    (menu-3 . "Set auto PPP")
     (menu-4 . "Expire articles")
     (menu-5 . "Set interval time")
     (menu-6 . "Hang up Line.")
@@ -291,15 +298,15 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 .emacs または .gnus.el の gnus-agent の設定を正しくしてください。")
     (error-check-2 ."警告!!: nnspool.el がロードされていません。
 .emacs または .gnus.el の nnspool の設定を正しくしてください。")
-    (connect-server-1 . "ダイヤルしています...")
-    (connect-server-2 . "ダイヤルしています...完了。")
+    (connect-server-1 . "接続しています...")
+    (connect-server-2 . "接続しています...完了。")
     (get-new-news-function-1 . "オンライン状態です。")
+    (set-auto-ppp-1 . "自動的に PPP 接続・切断します。")
+    (set-auto-ppp-2 . "自動的に PPP 接続します。")
+    (set-auto-ppp-3 . "手動で PPP 接続・切断します。")
     (hangup-line-1 . "切断しています...")
     (hangup-line-2 . "切断しています...完了。")
     (after-jobs-done-1 . "全てのオンライン処理を完了しました。")
-    (toggle-auto-hangup-1 . "自動切断機能を ")
-    (toggle-auto-hangup-2 . "オフ にしました。")
-    (toggle-auto-hangup-3 . "オン にしました。")
     (toggle-on/off-send-mail-1 . "メールを直接送信します。")
     (toggle-on/off-send-mail-2 . "メールはキューに送られます。")
     (toggle-articles-to-fetch-1 . "受信するメッセージは... ")
@@ -325,37 +332,128 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
      (menu-miee-4 . "Online 状態へ")
      (menu-1 . "取得記事種類の変更")
      (menu-2 . "Mail 送信方法(On/Off)の切替え")
-     (menu-3 . "自動切断の切替え")
+     (menu-3 . "自動 PPP 制御の設定")
      (menu-4 . "取得済記事を消す")
      (menu-5 . "記事取得間隔時間の設定")
      (menu-6 . "回線の切断")
-     (menu-7 . "プロパティ..."))))
+     (menu-7 . "プロパティ...")
+     (set-auto-ppp-menu-1 . "自動的に PPP 接続・切断")
+     (set-auto-ppp-menu-2 . "自動的に PPP 接続")
+     (set-auto-ppp-menu-3 . "手動で PPP 接続・切断"))))
 
 ;;; Functions
 
-(defun gnus-offline-get-message (symbol &optional lang)
+;; Inline functions.
+(defsubst gnus-offline-gettext (symbol &optional lang)
   (setq lang (or lang gnus-offline-lang))
   (or
    (cdr (assq symbol (symbol-value
 		      (intern (format "gnus-offline-resource-%s" lang)))))
    (cdr (assq symbol gnus-offline-resource-en))))
 
+(defsubst gnus-offline-set-online-sendmail-function ()
+  "*Initialize sendmail-function when plugged status."
+  (if (eq gnus-offline-MTA-type 'smtp)
+      (setq message-send-mail-function 'message-send-mail-with-smtp)
+    (setq message-send-mail-function 'message-send-mail-with-sendmail)))
+
+(defsubst gnus-offline-set-offline-sendmail-function ()
+  "*Initialize sendmail-function when unplugged status."
+  (cond ((eq gnus-offline-drafts-queue-type 'miee)
+	 (if (eq gnus-offline-news-fetch-method 'nnagent)
+	     (setq gnus-agent-send-mail-function
+		   'sendmail-to-spool-in-gnspool-format))
+	 (setq message-send-mail-function 'sendmail-to-spool-in-gnspool-format))
+	(t
+	 (setq gnus-agent-send-mail-function
+	       (gnus-offline-set-online-sendmail-function)
+	       message-send-mail-function 'gnus-agent-send-mail))))
+
+(defsubst gnus-offline-set-offline-post-news-function ()
+  "*Initialize sendnews-function when unplugged status."
+  (if (eq gnus-offline-drafts-queue-type 'miee)
+      (setq message-send-news-function 'gnspool-request-post)))
+
+(defsubst gnus-offline-set-online-post-news-function ()
+  "*Initialize sendnews-function when plugged status."
+  (setq message-send-news-function 'message-send-news-with-gnus))
+
+(defsubst gnus-offline-disable-fetch-mail ()
+  "*Set do not fetch mail."
+  (setq mail-sources nil
+	nnmail-spool-file nil))
+
+(defsubst gnus-offline-enable-fetch-mail ()
+  "*Set to fetch mail."
+  (setq gnus-offline-mail-fetch-method 'nnmail)
+  (setq mail-sources gnus-offline-mail-source))
+
+(defsubst gnus-offline-enable-fetch-news ()
+  "*Set to fetch news."
+  (if (eq gnus-offline-news-fetch-method 'nnagent)
+      (progn
+	(setq gnus-agent-handle-level gnus-level-subscribed)
+	(gnus-agent-toggle-plugged t))))
+
+;; Advice to Gnus functions.
+(defadvice gnus-group-get-new-news (before gnus-offline-advice
+					   activate preactivate)
+  "When called interactively, dial up and get online automatically."
+  (when (interactive-p)
+    (run-hooks 'gnus-offline-before-online-hook)
+    (if (and (memq 'connect gnus-offline-auto-ppp)
+	     (functionp gnus-offline-dialup-function))
+	(funcall gnus-offline-dialup-function))
+    (gnus-offline-get-new-news-function)))
+
+(defadvice gnus-agent-toggle-plugged (around gnus-offline-advice
+					     activate preactivate)
+  "Also toggle gnus-offline `connected--disconnected' status."
+  (interactive (list (not gnus-offline-connected)))
+  (cond ((ad-get-arg 0)
+	 (setq gnus-offline-connected (ad-get-arg 0))
+	 ad-do-it
+	 ;; Set send mail/news function to offline functions.
+	 (gnus-offline-set-online-sendmail-function)
+	 (gnus-offline-set-online-post-news-function))
+	(t
+	 ;; Set to offline status
+	 (gnus-offline-set-unplugged-state))))
+
+(defadvice gnus-agent-expire (around gnus-offline-advice activate preactivate)
+  "Advice not to delete new articles."
+  (cond ((eq 0 gnus-agent-expire-days)
+	 (let (gnus-agent-expire-all)
+	   ad-do-it))
+	(t
+	 ad-do-it)))
+
+(defadvice gnus-agent-mode (around gnus-offline-advice activate preactivate)
+  "Advice not to close PPP connection."
+  (let (gnus-offline-hangup-function)
+    ad-do-it))
+
 ;;
 ;; Setting up...
 ;;
 (defun gnus-offline-setup ()
   "*Initialize gnus-offline function"
 
-  ;; Menu and keymap
-  (gnus-offline-define-menu-and-key)
-  
+  (when (eq gnus-offline-drafts-queue-type 'agent)
+    (setq gnus-offline-connected gnus-plugged))
+
+  (gnus-offline-processed-by-timer)
+  (gnus-offline-error-check)
+
   ;; To transfer Mail/News function.
-  (cond ((eq gnus-offline-mail-treat-environ 'offline)
+  (cond	((or (and (eq 'gnus-offline-drafts-queue-type 'agent)
+		  gnus-offline-connected)
+	     (eq gnus-offline-mail-treat-environ 'online))
 	 ;; send mail under offline environ.
-	 (gnus-offline-set-offline-sendmail-function))
-	((eq gnus-offline-mail-treat-environ 'online)
+	 (gnus-offline-set-online-sendmail-function))
+	(t
 	 ;; send mail under offline environ.
-	 (gnus-offline-set-online-sendmail-function))))
+	 (gnus-offline-set-offline-sendmail-function))))
 
 ;;
 ;; Setting Error check.
@@ -368,56 +466,17 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 			(featurep 'nnagent))
 	     (set-buffer (gnus-get-buffer-create buffer))
 	     (erase-buffer)
-	     (insert (gnus-offline-get-message 'error-check-1))
+	     (insert (gnus-offline-gettext 'error-check-1))
 	     (pop-to-buffer buffer)))
-	
+
 	  ((eq gnus-offline-news-fetch-method 'nnspool)
 	   (unless (featurep 'nnspool)
 	     (set-buffer (gnus-get-buffer-create buffer))
 	     (erase-buffer)
-	     (insert (gnus-offline-get-message 'error-check-2))
+	     (insert (gnus-offline-gettext 'error-check-2))
 	     (pop-to-buffer buffer)))
 	  (t
 	   nil))))
-;;
-;;
-(defun gnus-offline-set-offline-sendmail-function ()
-  "*Initialize sendmail-function when unplugged status."
-  (cond ((eq gnus-offline-drafts-queue-type 'miee)
-	 (if (eq gnus-offline-news-fetch-method 'nnagent)
-	     (setq gnus-agent-send-mail-function
-		   'sendmail-to-spool-in-gnspool-format))
-	 (setq message-send-mail-function 'sendmail-to-spool-in-gnspool-format))
-	(t
-	 (setq gnus-agent-send-mail-function
-	       (gnus-offline-set-online-sendmail-function)
-	       message-send-mail-function 'gnus-agent-send-mail))))
-;;
-(defun gnus-offline-set-online-sendmail-function ()
-  "*Initialize sendmail-function when plugged status."
-  (if (eq gnus-offline-MTA-type 'smtp)
-      (setq message-send-mail-function 'message-send-mail-with-smtp)
-    (setq message-send-mail-function 'message-send-mail-with-sendmail)))
-;;
-(defun gnus-offline-set-offline-post-news-function ()
-  "*Initialize sendnews-function when unplugged status."
-  (if (eq gnus-offline-drafts-queue-type 'miee)
-      (setq message-send-news-function 'gnspool-request-post)))
-;;
-(defun gnus-offline-set-online-post-news-function ()
-  "*Initialize sendnews-function when plugged status."
-  (setq message-send-news-function 'message-send-news-with-gnus))
-;;
-;; Get new news jobs. (gnus-agent and nnspool)
-;;
-(defun gnus-offline-gnus-get-new-news (&optional arg)
-  "*Override function \"gnus-group-get-new-news\"."
-  (interactive "P")
-  (run-hooks 'gnus-offline-before-online-hook)
-  (if (functionp gnus-offline-dialup-function)
-      (funcall gnus-offline-dialup-function))
-  (gnus-offline-get-new-news-function)
-  (gnus-group-get-new-news arg))
 
 ;;
 ;; dialup...
@@ -427,11 +486,11 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   ;; Dialup if gnus-offline-dialup-program is specified
   (if (stringp gnus-offline-dialup-program)
       (progn
-	(message (gnus-offline-get-message 'connect-server-1))
+	(message (gnus-offline-gettext 'connect-server-1))
 	(apply 'call-process gnus-offline-dialup-program nil nil nil
 	       gnus-offline-dialup-program-arguments)
 	(sleep-for 1)
-	(message (gnus-offline-get-message 'connect-server-2)))))
+	(message (gnus-offline-gettext 'connect-server-2)))))
 
 ;;
 ;; Jobs before get new news , send mail and post news.
@@ -448,7 +507,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   ;; Set send mail/news functions to online functions.
   (gnus-offline-set-online-sendmail-function)
   (gnus-offline-set-online-post-news-function)
-  (message (gnus-offline-get-message 'get-new-news-function-1))
+  (message (gnus-offline-gettext 'get-new-news-function-1))
 
   ;; fetch only news
   (if (eq gnus-offline-articles-to-fetch 'news)
@@ -471,7 +530,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   "*Set nnm* group level."
   (switch-to-buffer gnus-group-buffer)
   (goto-char (point-min))
-  
+
   ;; Save current level
   (if (not gnus-offline-stored-group-level)
       (while (re-search-forward " nnm" nil t)
@@ -505,66 +564,35 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 ;;
 (defun gnus-offline-after-get-new-news ()
   "*After getting news and mail jobs."
-  (if (memq gnus-offline-articles-to-fetch '(both mail))
-      (progn
-	;; Mail/both
-	;; send mail/news in spool
-	(gnus-offline-empting-spool)
-	(if (eq gnus-offline-articles-to-fetch 'mail)
-	    (progn
-	      ;; Send only mail and hang up...
-	      (if (and gnus-offline-connected
-		       gnus-offline-auto-hangup)
-		  (gnus-offline-set-unplugged-state))
-	      ;; Disable fetch mail.
-	      (gnus-offline-disable-fetch-mail)
-	      (gnus-offline-after-jobs-done)))))
-  
-  ;; News/Both
-  (if (memq gnus-offline-articles-to-fetch '(both news))
-      (progn
-	(if gnus-offline-connected
-	    (cond ((eq gnus-offline-news-fetch-method 'nnagent)
-		   ;; Get New News (gnus-agent)
-		   (gnus-agent-toggle-plugged t)
-		  
-		   ;; fetch articles
-		   (gnus-agent-fetch-session)
-		  
-		   ;; Hang Up line. then set to offline status.
-		   (if (and gnus-offline-connected
-			    gnus-offline-auto-hangup)
-		       (gnus-offline-set-unplugged-state))
-		   
-		   ;; All online jobs has done.
-		   (gnus-offline-after-jobs-done))
-		  (t
-		   (if (eq gnus-offline-news-fetch-method 'nnspool)
-		       ;; Get New News (nnspool)
-		       (gnspool-get-news))))))))
-;;
-;; Disable fetch mail
-;;
-(defun gnus-offline-disable-fetch-mail ()
-  "*Set do not fetch mail."
-  (setq mail-sources nil
-	nnmail-spool-file nil))
-;;
-;; Enable fetch mail
-;;
-(defun gnus-offline-enable-fetch-mail ()
-  "*Set to fetch mail."
-  (setq gnus-offline-mail-fetch-method 'nnmail)
-  (setq mail-sources gnus-offline-mail-source))
-;;
-;; Enable fetch news
-;;
-(defun gnus-offline-enable-fetch-news ()
-  "*Set to fetch news."
-  (if (eq gnus-offline-news-fetch-method 'nnagent)
-      (progn
-	(setq gnus-agent-handle-level gnus-level-subscribed)
-	(gnus-agent-toggle-plugged t))))
+  (cond (gnus-offline-connected
+	 (when (memq gnus-offline-articles-to-fetch '(both mail))
+	   ;; Mail/both
+	   ;; send mail/news in spool
+	   (gnus-offline-empting-spool)
+	   (when (eq gnus-offline-articles-to-fetch 'mail)
+	     ;; Send only mail and hang up...
+	     (if gnus-offline-connected
+		 (gnus-offline-set-unplugged-state))
+	     ;; Disable fetch mail.
+	     (gnus-offline-disable-fetch-mail)
+	     (gnus-offline-after-jobs-done)))
+	 (when (memq gnus-offline-articles-to-fetch '(both news))
+	   ;; News/Both
+	   (cond ((eq gnus-offline-news-fetch-method 'nnagent)
+		  ;; Get New News (gnus-agent)
+		  (gnus-agent-toggle-plugged t)
+		  ;; fetch articles
+		  (gnus-agent-fetch-session)
+		  ;; Hang Up line. then set to offline status.
+		  (gnus-offline-set-unplugged-state)
+		  ;; All online jobs has done.
+		  (gnus-offline-after-jobs-done))
+		 (t
+		  (if (eq gnus-offline-news-fetch-method 'nnspool)
+		      ;; Get New News (nnspool)
+		      (gnspool-get-news))))))
+	(t
+	 nil)))
 
 ;;
 ;; Add your custom header.
@@ -601,32 +629,18 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 
 
 ;;
-;; Toggle plugged/unplugged
-;;
-(defun gnus-offline-toggle-plugged (plugged)
-  "*Override function \"Jj\" - gnus-agent-toggle-plugged."
-  (interactive (list (not gnus-offline-connected)))
-  (if plugged
-      (progn
-	(setq gnus-offline-connected plugged)
-	(gnus-agent-toggle-plugged plugged)
-	;; Set send mail/news function to offline functions.
-	(gnus-offline-set-online-sendmail-function)
-	(gnus-offline-set-online-post-news-function))
-    ;; Set to offline status
-    (gnus-offline-set-unplugged-state)))
-;;
 ;; Function of hang up line.
 ;;
 (defun gnus-offline-set-unplugged-state ()
   "*Set to unplugged state."
   (interactive)
   ;; Hang Up Line.
-  (if (functionp gnus-offline-hangup-function)
+  (if (and (memq 'disconnect gnus-offline-auto-ppp)
+	   (functionp gnus-offline-hangup-function))
       (funcall gnus-offline-hangup-function))
   (setq gnus-offline-connected nil)
   (if (eq gnus-offline-news-fetch-method 'nnagent)
-      (gnus-agent-toggle-plugged nil))
+      (ad-Orig-gnus-agent-toggle-plugged nil))
 
   ;; Set send mail/news function to offline functions.
   (gnus-offline-set-offline-sendmail-function)
@@ -638,17 +652,16 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 ;;
 (defun gnus-offline-hangup-line ()
   "*Hangup line function."
-  (message (gnus-offline-get-message 'hangup-line-1))
+  (message (gnus-offline-gettext 'hangup-line-1))
   (if (stringp gnus-offline-hangup-program)
       (apply 'start-process "hup" nil gnus-offline-hangup-program
 	     gnus-offline-hangup-program-arguments))
-  (message (gnus-offline-get-message 'hangup-line-2)))
+  (message (gnus-offline-gettext 'hangup-line-2)))
 ;;
 ;; Hang Up line routine whe using nnspool
 ;;
 (defun gnus-offline-nnspool-hangup-line ()
-  (if (and gnus-offline-connected
-	   gnus-offline-auto-hangup)
+  (if gnus-offline-connected
       (gnus-offline-set-unplugged-state))
   (gnus-offline-after-jobs-done))
 ;;
@@ -659,30 +672,63 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   (run-hooks 'gnus-offline-after-online-hook)
   (if (eq gnus-offline-articles-to-fetch 'mail)
       (gnus-offline-restore-mail-group-level))
-  (if (eq gnus-offline-news-fetch-method 'nnagent)
-      (gnus-offline-agent-expire))
+  (if (and (eq gnus-offline-news-fetch-method 'nnagent)
+	   gnus-offline-auto-expire)
+      (gnus-agent-expire))
   (if (and (featurep 'xemacs)
 	   (fboundp 'play-sound-file))
       (ding nil 'drum)
     (ding))
   (gnus-group-save-newsrc)
-  (message (gnus-offline-get-message 'after-jobs-done-1)))
+  (message (gnus-offline-gettext 'after-jobs-done-1)))
 
 
 ;;
-;; Toggle auto hang up
+;; Set auto PPP
 ;;
-(defun gnus-offline-toggle-auto-hangup ()
-  "*Toggle auto hangup flag."
+(defun gnus-offline-set-auto-ppp ()
+  "*Decide whether to connect and/or disconnect automatically."
   (interactive)
-  (let ((string (gnus-offline-get-message 'toggle-auto-hangup-1)) str)
-    (if gnus-offline-auto-hangup
-	(progn
-	  (setq gnus-offline-auto-hangup nil
-		str (gnus-offline-get-message 'toggle-auto-hangup-2)))
-      (setq gnus-offline-auto-hangup t
-	    str (gnus-offline-get-message 'toggle-auto-hangup-3)))
-    (message (format "%s %s" string str))))
+  (let ((keys (key-description (this-command-keys)))
+	menu title str)
+    (cond ((or (string= "misc-user" keys)
+	       (string= "S-mouse-2" keys)
+	       (string-match "^menu-bar" keys)
+	       (string-match "^mouse" keys))
+	   (setq title (gnus-offline-gettext 'menu-3))
+	   (setq menu
+		 (cons title
+		       (gnus-offline-get-menu-items
+			'((set-auto-ppp-menu-1
+			   (progn
+			     (setq gnus-offline-auto-ppp '(connect disconnect))
+			     (message (gnus-offline-gettext 'set-auto-ppp-1)))
+			   t)
+			  (set-auto-ppp-menu-2
+			   (progn
+			     (setq gnus-offline-auto-ppp '(connect))
+			     (message (gnus-offline-gettext 'set-auto-ppp-2)))
+			   t)
+			  (set-auto-ppp-menu-3
+			   (progn
+			     (setq gnus-offline-auto-ppp nil)
+			     (message (gnus-offline-gettext 'set-auto-ppp-3)))
+			   t)))))
+	   (gnus-offline-popup menu title))
+	  (t
+	   (cond ((eq gnus-offline-auto-ppp nil)
+		  (setq gnus-offline-auto-ppp '(connect disconnect))
+		  (setq str (gnus-offline-gettext 'set-auto-ppp-1)))
+		 ((memq 'connect gnus-offline-auto-ppp)
+		  (cond ((memq 'disconnect gnus-offline-auto-ppp)
+			 (setq gnus-offline-auto-ppp '(connect))
+			 (setq str
+			       (gnus-offline-gettext 'set-auto-ppp-2)))
+			(t
+			 (setq gnus-offline-auto-ppp nil)
+			 (setq str
+			       (gnus-offline-gettext 'set-auto-ppp-3))))))
+	   (message str)))))
 ;;
 ;; Toggle offline/online to send mail.
 ;;
@@ -694,28 +740,28 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 	;; Sending mail under online environ.
 	(gnus-offline-set-online-sendmail-function)
 	(setq gnus-offline-mail-treat-environ 'online)
-	(message (gnus-offline-get-message 'toggle-on/off-send-mail-1)))
+	(message (gnus-offline-gettext 'toggle-on/off-send-mail-1)))
     ;; Sending mail under offline environ.
     (gnus-offline-set-offline-sendmail-function)
     (setq gnus-offline-mail-treat-environ 'offline)
-    (message (gnus-offline-get-message 'toggle-on/off-send-mail-2))))
+    (message (gnus-offline-gettext 'toggle-on/off-send-mail-2))))
 ;;
 ;; Toggle articles to fetch ... both -> mail -> news -> both
 ;;
 (defun gnus-offline-toggle-articles-to-fetch ()
   "*Set articles to fetch... both(Mail/News) -> mail only -> News only -> both"
   (interactive)
-  (let ((string (gnus-offline-get-message 'toggle-articles-to-fetch-1))
+  (let ((string (gnus-offline-gettext 'toggle-articles-to-fetch-1))
 	str)
     (cond ((eq gnus-offline-articles-to-fetch 'both)
 	   (setq gnus-offline-articles-to-fetch 'mail
-		 str (gnus-offline-get-message 'toggle-articles-to-fetch-2)))
+		 str (gnus-offline-gettext 'toggle-articles-to-fetch-2)))
 	  ((eq gnus-offline-articles-to-fetch 'mail)
 	   (setq gnus-offline-articles-to-fetch 'news
-		 str (gnus-offline-get-message 'toggle-articles-to-fetch-3)))
+		 str (gnus-offline-gettext 'toggle-articles-to-fetch-3)))
 	  (t
 	   (setq gnus-offline-articles-to-fetch 'both
-		 str (gnus-offline-get-message 'toggle-articles-to-fetch-4))))
+		 str (gnus-offline-gettext 'toggle-articles-to-fetch-4))))
     (message (format "%s %s" string str))))
 ;;
 ;; Send mail and Post news using Miee or gnus-agent.
@@ -728,11 +774,11 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
       (progn
 	(if (eq gnus-offline-mail-treat-environ 'offline)
 	    (progn
-	      (message (gnus-offline-get-message 'empting-spool-1))
+	      (message (gnus-offline-gettext 'empting-spool-1))
 	      ;; Using miee to send mail.
 	      (mail-spool-send)
-	      (message (gnus-offline-get-message 'empting-spool-2))))
-	(message (gnus-offline-get-message 'empting-spool-3))
+	      (message (gnus-offline-gettext 'empting-spool-2))))
+	(message (gnus-offline-gettext 'empting-spool-3))
 	;; Using miee to post news.
 	(if (and (not (stringp msspool-news-server))
 		 (not msspool-news-service))
@@ -740,11 +786,11 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 	      (setq msspool-news-server (nth 1 gnus-select-method))
 	      (setq msspool-news-service 119)))
 	(news-spool-post)
-	(message (gnus-offline-get-message 'empting-spool-4)))
+	(message (gnus-offline-gettext 'empting-spool-4)))
     ;; Send queued message by gnus-agent
-    (message (gnus-offline-get-message 'empting-spool-5))
+    (message (gnus-offline-gettext 'empting-spool-5))
     (gnus-group-send-drafts)
-    (message (gnus-offline-get-message 'empting-spool-6)))
+    (message (gnus-offline-gettext 'empting-spool-6)))
   ;;
   (run-hooks 'gnus-offline-after-empting-spool-hook))
 ;;
@@ -755,82 +801,94 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   (interactive)
   (setq gnus-offline-interval-time
 	(string-to-int (read-from-minibuffer
-			(format (gnus-offline-get-message 'interval-time-1)
+			(format (gnus-offline-gettext 'interval-time-1)
 				gnus-offline-interval-time)
 			nil)))
   (if (< gnus-offline-interval-time 2)
       (progn
-	(message (gnus-offline-get-message 'interval-time-2))
+	(message (gnus-offline-gettext 'interval-time-2))
 	(setq gnus-offline-interval-time 0))
     (message
-     (format (gnus-offline-get-message 'interval-time-3)
+     (format (gnus-offline-gettext 'interval-time-3)
 	     gnus-offline-interval-time)))
   (gnus-offline-processed-by-timer))
-;;
-;; Expire articles using gnus-agent.
-;;
-(defun gnus-offline-agent-expire ()
-  "*Expire expirable article on News group."
-  (interactive)
-  (and gnus-offline-agent-automatic-expire
-       (if (eq 0 gnus-agent-expire-days)
-	   (let (gnus-agent-expire-all)
-	     (gnus-agent-expire))
-	 (gnus-agent-expire))))
+
 ;;
 ;; Menu.
 ;;
 (defun gnus-offline-define-menu-and-key ()
   "*Set key and menu."
-  (if (eq gnus-offline-drafts-queue-type 'miee)
-      (if (featurep 'xemacs)
-	  (add-hook 'gnus-group-mode-hook 'gnus-offline-define-menu-on-miee)
-	(gnus-offline-define-menu-on-miee))
-    (add-hook 'gnus-group-mode-hook 'gnus-offline-define-menu-on-agent))
+  (cond ((eq gnus-offline-drafts-queue-type 'miee)
+	 (static-cond
+	  ((featurep 'xemacs)
+	   (add-hook 'gnus-group-mode-hook 'gnus-offline-define-menu-on-miee))
+	  (t
+	   (gnus-offline-define-menu-on-miee))))
+	(t
+	 (add-hook 'gnus-group-mode-hook 'gnus-offline-define-menu-on-agent)))
+  ;;
   (add-hook 'gnus-group-mode-hook
-	    '(lambda ()
-	       (local-set-key "\C-coh" 'gnus-offline-set-unplugged-state)
-	       (local-set-key "\C-cof" 'gnus-offline-toggle-articles-to-fetch)
-	       (local-set-key "\C-coo" 'gnus-offline-toggle-on/off-send-mail)
-	       (local-set-key "\C-cox" 'gnus-offline-toggle-auto-hangup)
-	       (local-set-key "\C-cos" 'gnus-offline-set-interval-time)
-	       (substitute-key-definition
-		'gnus-group-get-new-news 'gnus-offline-gnus-get-new-news
-		gnus-group-mode-map)
-	       (if (eq gnus-offline-news-fetch-method 'nnagent)
-		   (progn
-		     (substitute-key-definition
-		      'gnus-agent-toggle-plugged 'gnus-offline-toggle-plugged
-		      gnus-agent-group-mode-map)
-		     (local-set-key "\C-coe" 'gnus-offline-agent-expire)))
-	       (or (featurep 'xemacs)
-		   (define-key gnus-group-mode-map 
-		     (if (eq system-type 'windows-nt) [S-mouse-2] [mouse-3])
-		     'gnus-offline-popup-menu))))
-  (if (eq gnus-offline-news-fetch-method 'nnagent)
-      (add-hook 'gnus-summary-mode-hook
-		'(lambda ()
-		   (substitute-key-definition
-		    'gnus-agent-toggle-plugged 'gnus-offline-toggle-plugged
-		    gnus-agent-summary-mode-map))))
-  (if (featurep 'xemacs)
-      ;; Overwrite the toolbar spec for gnus-group-mode.
-      (add-hook 'gnus-startup-hook
-		#'(lambda ()
-		    (catch 'tag
-		      (mapc (lambda (but)
-			      (when (eq 'gnus-group-get-new-news (aref but 1))
-				(aset but 1 'gnus-offline-gnus-get-new-news)
-				(throw 'tag nil)))
-			    gnus-group-toolbar))))))
-;;
-;;
+	    #'(lambda ()
+		(local-set-key "\C-coh" 'gnus-offline-set-unplugged-state)
+		(local-set-key "\C-cof" 'gnus-offline-toggle-articles-to-fetch)
+		(local-set-key "\C-coo" 'gnus-offline-toggle-on/off-send-mail)
+		(local-set-key "\C-cox" 'gnus-offline-set-auto-ppp)
+		(local-set-key "\C-cos" 'gnus-offline-set-interval-time)
+		(if (eq gnus-offline-news-fetch-method 'nnagent)
+		    (local-set-key "\C-coe" 'gnus-agent-expire))
+		(static-unless (featurep 'xemacs)
+		  (local-set-key
+		   (if (eq system-type 'windows-nt) [S-mouse-2] [mouse-3])
+		   'gnus-offline-popup-menu)))))
+
+;;
+;;
+(defun gnus-offline-popup (menu &optional title)
+  (static-cond
+   ((featurep 'xemacs)
+    (popup-menu menu))
+   (t
+    (let ((menu-func (or (and (fboundp 'easy-menu-create-menu)
+			      'easy-menu-create-menu)
+			 'easy-menu-create-keymaps))
+	  keymap pop func)
+      (static-cond ((< emacs-major-version 20)
+		    ;; For Emacsen from 19.34 down to 19.28.
+		    ;; Seems the first item in MENU will be ignored.
+		    (or (keymapp menu)
+			(setq menu
+			      (append (list ""  ;; This will be ignored.
+					    (or title "Popup Menu")
+					    "-----"
+					    "-----")
+				      (cdr menu))))
+		    (setq keymap
+			  (if (keymapp menu)
+			      (append (list 'keymap
+					    (if title
+						`(nil ,title)
+					      '(nil "Popup Menu"))
+					    '(nil "")
+					    '(nil ""))
+				      (cdr menu))
+			    (funcall menu-func (car menu) (cdr menu)))))
+		   (t
+		    (setq keymap
+			  (if (keymapp menu)
+			      menu
+			    (funcall menu-func (car menu) (cdr menu))))))
+      ;; Display the popup menu.
+      (if (and (setq pop (x-popup-menu t keymap))
+	       (setq func (lookup-key keymap
+				      (apply 'vector pop))))
+	  (funcall func))))))
+
 (defun gnus-offline-get-menu-items (list)
   (mapcar
    #'(lambda (el)
        (if (listp el)
 	   (apply 'vector
-		  (cons (gnus-offline-get-message (car el)) (cdr el)))
+		  (cons (gnus-offline-gettext (car el)) (cdr el)))
 	 el))
    list))
 
@@ -838,9 +896,9 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   (gnus-offline-get-menu-items
    '((menu-1 gnus-offline-toggle-articles-to-fetch t)
      (menu-2 gnus-offline-toggle-on/off-send-mail t)
-     (menu-3 gnus-offline-toggle-auto-hangup t)
+     (menu-3 gnus-offline-set-auto-ppp t)
      "----"
-     (menu-4 gnus-offline-agent-expire
+     (menu-4 gnus-agent-expire
 	     (eq gnus-offline-news-fetch-method 'nnagent))
      (menu-5 gnus-offline-set-interval-time t)
      "----"
@@ -864,8 +922,8 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 	   nil "Miee"
 	   (append miee-menu
 		   (list (cons "Gnus Offline" gnus-offline-menu)))))
-    (and (featurep 'xemacs)
-	 (easy-menu-add menu))))
+    (static-if (featurep 'xemacs)
+	(easy-menu-add menu))))
 ;;
 ;; define menu without miee.
 ;;
@@ -874,49 +932,46 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   (easy-menu-define
    gnus-offline-menu-on-agent gnus-group-mode-map "Gnus offline Menu"
    (cons "Offline" gnus-offline-menu))
-  (and (featurep 'xemacs)
-       (easy-menu-add gnus-offline-menu-on-agent)))
+  (static-if (featurep 'xemacs)
+      (easy-menu-add gnus-offline-menu-on-agent)))
 ;;
 ;; Popup menu within the group buffer (under Emacs).
 ;;
-(defvar gnus-offline-popup-menu nil)
-(defun gnus-offline-popup-menu (event)
-  "Popup menu for Gnus Offline."
-  (interactive "e")
-  (unless gnus-offline-popup-menu
-    (setq gnus-offline-popup-menu
-	  (let ((menu
-		 (if (boundp 'miee-popup-menu)
-		     (or (assq 'keymap
-				(assq 'Miee (assq 'menu-bar global-map)))
+(static-unless (featurep 'xemacs)
+  (defun gnus-offline-popup-menu (event)
+    "Popup menu for Gnus Offline."
+    (interactive "e")
+    (apply 'gnus-offline-popup
+	   (if (boundp 'miee-popup-menu)
+	       (list (or (assq 'keymap
+			       (assq 'Miee (assq 'menu-bar global-map)))
 			 miee-popup-menu)
-		   (symbol-value 'gnus-offline-menu-on-agent))))
-	    (if (string< emacs-version "20")
-		(append (list 'keymap
-			      (if (boundp 'miee-popup-menu)
-				  '(nil "Miee")
-				'(nil "Offline"))
-			      '(nil "")
-			      '(nil ""))
-			(cdr menu))
-	      menu))))
-  (let* ((pop (x-popup-menu t gnus-offline-popup-menu))
-	 (func (and pop (lookup-key gnus-offline-popup-menu
-				    (apply 'vector pop)))))
-    (and pop func (funcall func))))
+		     "Miee")
+	     (list (symbol-value 'gnus-offline-menu-on-agent)
+		   "Offline")))))
 
 ;;
 ;; Timer Function
 (defun gnus-offline-processed-by-timer ()
   "*Set timer interval."
-  (if (and (> gnus-offline-interval-time 0)
-	   (not gnus-offline-connected))
-      ;; Timer call
-      (gnus-demon-add-handler 'gnus-offline-gnus-get-new-news
-			      gnus-offline-interval-time
-			      gnus-offline-interval-time))
-  (if (= gnus-offline-interval-time 0)
-      (gnus-demon-remove-handler 'gnus-offline-gnus-get-new-news t)))
+  (let ((func (lambda () (call-interactively 'gnus-group-get-new-news)))
+	(time gnus-offline-interval-time))
+    (cond ((and (> time 0) (not gnus-offline-connected))
+	   ;; Timer call
+	   (gnus-demon-add-handler func time time))
+	  ((= gnus-offline-interval-time 0)
+	   (gnus-demon-remove-handler func t)))))
+;;
+;; Code for making Gnus and Gnus Offline cooperate with each other.
+;;
+
+;; Display `X-Gnus-Offline-Backend' message header aesthetically.
+(eval-after-load "eword-decode"
+  '(mime-set-field-decoder 'X-Gnus-Offline-Backend nil nil))
+
+;; Enable key and menu definitions here.
+(eval '(funcall 'gnus-offline-define-menu-and-key))
+
 ;;
 ;;
 ;;; gnus-offline.el ends here