branch: elpa/jabber
commit 4bd598fdd1bc4df9c2c3611f8c7b0c8b7156ba9a
Author: Thanos Apollo <[email protected]>
Commit: Thanos Apollo <[email protected]>
deps: Use explicit module dependencies
---
lisp/jabber-activity.el | 2 +-
lisp/jabber-blocking.el | 5 -----
lisp/jabber-bookmarks.el | 2 +-
lisp/jabber-chat.el | 14 +-------------
lisp/jabber-chatbuffer.el | 1 -
lisp/jabber-conn.el | 2 +-
lisp/jabber-core.el | 11 ++---------
lisp/jabber-keepalive.el | 11 +++--------
lisp/jabber-notifications.el | 10 ++--------
lisp/jabber-openpgp-legacy.el | 7 ++-----
lisp/jabber-openpgp.el | 3 +--
lisp/jabber-reactions.el | 5 -----
lisp/jabber.el | 1 +
13 files changed, 15 insertions(+), 59 deletions(-)
diff --git a/lisp/jabber-activity.el b/lisp/jabber-activity.el
index 7b192b4e9f..27c73ea9d2 100644
--- a/lisp/jabber-activity.el
+++ b/lisp/jabber-activity.el
@@ -30,6 +30,7 @@
;;; Code:
(require 'cl-lib)
+(require 'fsm)
(require 'seq)
(require 'jabber-core)
(require 'jabber-util)
@@ -166,7 +167,6 @@ Invalidated when `jabber-activity-make-name-alist'
rebuilds.")
(declare-function jabber-chat-find-buffer "jabber-chat.el" (chat-with))
(declare-function jabber-chat-with "jabber-chat.el" (jc jid &optional
other-window))
-(declare-function fsm-get-state-data "fsm" (fsm))
(declare-function jabber-muc-looks-like-personal-p
"jabber-muc-nick-completion.el" (message &optional group))
(defvar jabber-buffer-connection) ; jabber-chatbuffer.el
diff --git a/lisp/jabber-blocking.el b/lisp/jabber-blocking.el
index 4a6719a0b4..d977ec724a 100644
--- a/lisp/jabber-blocking.el
+++ b/lisp/jabber-blocking.el
@@ -36,11 +36,6 @@
(defconst jabber-blocking-xmlns "urn:xmpp:blocking"
"XML namespace for XEP-0191 Blocking Command.")
-(declare-function jabber-connection-bare-jid "jabber-util" (jc))
-(declare-function jabber-read-jid-completing "jabber-util"
- (prompt &optional subset require-match
- default resource fulljids))
-
(defvar jabber-buffer-connection) ; jabber-chatbuffer.el
(defvar jabber-chatting-with) ; jabber-chat.el
diff --git a/lisp/jabber-bookmarks.el b/lisp/jabber-bookmarks.el
index 3e45d110b5..c2ff67e3cb 100644
--- a/lisp/jabber-bookmarks.el
+++ b/lisp/jabber-bookmarks.el
@@ -27,6 +27,7 @@
;;; Code:
(require 'cl-lib)
+(require 'fsm)
(require 'jabber-private)
(require 'jabber-pubsub)
@@ -63,7 +64,6 @@
(declare-function jabber-muc-join "jabber-muc" (jc group nickname &optional
popup))
(declare-function jabber-muc-leave "jabber-muc" (jc group))
(declare-function jabber-muc-get-buffer "jabber-muc" (group &optional jc))
-(declare-function fsm-get-state-data "fsm" (fsm))
;; Disco feature: request PubSub notifications for bookmarks
(jabber-disco-advertise-feature (concat jabber-bookmarks2-xmlns "+notify"))
diff --git a/lisp/jabber-chat.el b/lisp/jabber-chat.el
index f3308d1d94..c26ebf54f7 100644
--- a/lisp/jabber-chat.el
+++ b/lisp/jabber-chat.el
@@ -29,6 +29,7 @@
(require 'jabber-core)
(require 'jabber-alert)
(require 'jabber-chatbuffer)
+(require 'jabber-db)
(require 'jabber-reactions)
(require 'ewoc)
(require 'goto-addr)
@@ -258,7 +259,6 @@ holding state for the next composed message stay inert."
;; Global reference declarations
(declare-function jabber-compose "jabber-compose.el" (jc &optional recipient))
-(declare-function jabber-chat-buffer-recenter-input "jabber-chatbuffer.el" ())
(declare-function jabber-omemo--send-chat "jabber-omemo" (jc body &optional
extra-elements))
(declare-function jabber-openpgp--send-chat "jabber-openpgp" (jc body
&optional extra-elements))
(declare-function jabber-openpgp-legacy--send-chat "jabber-openpgp-legacy" (jc
body &optional extra-elements))
@@ -280,18 +280,6 @@ holding state for the next composed message stay inert."
(key iv ciphertext-with-tag))
(defvar jabber-backlog-days)
(defvar jabber-backlog-number)
-(declare-function jabber-db-backlog "jabber-db.el"
- (account peer &optional count start-time resource msg-type))
-(declare-function jabber-db--store-outgoing "jabber-db.el"
- (jc to body type))
-(declare-function jabber-db-store-message "jabber-db.el"
- (account peer direction type body timestamp
- &optional resource stanza-id
- server-id occupant-id oob-entries
- encrypted reply))
-(declare-function jabber-db-reply-target-body "jabber-db.el"
- (account peer reply-id muc-p))
-(declare-function jabber-db--extract-occupant-id "jabber-db.el" (xml-data))
(declare-function jabber-message-correct--replace-id "jabber-message-correct"
(xml-data))
(declare-function jabber-message-correct--apply "jabber-message-correct"
diff --git a/lisp/jabber-chatbuffer.el b/lisp/jabber-chatbuffer.el
index 6fb3be98ca..2dfba43121 100644
--- a/lisp/jabber-chatbuffer.el
+++ b/lisp/jabber-chatbuffer.el
@@ -118,7 +118,6 @@ previous sequence detect the mismatch and stop.")
(declare-function jabber-omemo--muc-participant-jids "jabber-omemo"
(group participants))
(declare-function jabber-omemo-fingerprints "jabber-omemo" ())
-(declare-function jabber-connection-bare-jid "jabber-util" (jc))
(declare-function jabber-blocking-toggle-chat-peer "jabber-blocking" (jc))
(declare-function jabber-get-info "jabber-info" (jc to))
(declare-function jabber-roster-change "jabber-presence" (jc jid name groups))
diff --git a/lisp/jabber-conn.el b/lisp/jabber-conn.el
index 794e98368e..449d1b19c4 100644
--- a/lisp/jabber-conn.el
+++ b/lisp/jabber-conn.el
@@ -32,8 +32,8 @@
;;; Code:
(eval-when-compile (require 'cl-lib))
-(require 'jabber-core)
(require 'fsm)
+(require 'jabber-util)
(require 'gnutls)
(require 'jabber-srv)
diff --git a/lisp/jabber-core.el b/lisp/jabber-core.el
index e114d26ee6..945bd8f152 100644
--- a/lisp/jabber-core.el
+++ b/lisp/jabber-core.el
@@ -34,9 +34,10 @@
(require 'fsm)
(require 'jabber-util)
(require 'jabber-xml)
+(require 'jabber-conn)
+(require 'jabber-iq)
(require 'jabber-sasl)
(require 'jabber-console)
-(require 'jabber-keepalive)
(require 'jabber-sm)
@@ -130,9 +131,6 @@ problems."
;; Global reference declarations
-(declare-function jabber-send-iq "jabber-iq.el"
- (jc to type query success-callback success-closure-data
- error-callback error-closure-data &optional result-id))
(declare-function jabber-muc-connection-closed "jabber-muc.el" (bare-jid))
(declare-function jabber-roster-update "jabber-roster.el"
(jc new-items changed-items deleted-items))
@@ -141,11 +139,6 @@ problems."
(declare-function jabber-initial-roster-failure "jabber-presence.el"
(jc xml-data _closure-data))
(declare-function jabber-get-register "jabber-register.el" (jc to))
-(declare-function jabber-get-connect-function "jabber-conn.el" (type))
-(declare-function jabber-get-send-function "jabber-conn.el" (type))
-(declare-function jabber-starttls-process-input "jabber-conn.el"
- (fsm xml-data))
-(declare-function jabber-starttls-initiate "jabber-conn.el" (fsm))
(declare-function jabber-mode-line-presence-update "jabber-modeline.el" (&rest
_))
(declare-function jabber-get-bookmarks "jabber-bookmarks.el" (jc cont
&optional refresh))
(defvar jabber-debug-keep-process-buffers) ; jabber.el
diff --git a/lisp/jabber-keepalive.el b/lisp/jabber-keepalive.el
index 92f54f9c73..ca12790773 100644
--- a/lisp/jabber-keepalive.el
+++ b/lisp/jabber-keepalive.el
@@ -31,6 +31,8 @@
;;; Code:
+(require 'fsm)
+(require 'jabber-core)
(require 'jabber-ping)
;;;###autoload
@@ -60,13 +62,6 @@
;; Global reference declarations
-(declare-function jabber-disconnect-one "jabber-core.el"
- (jc &optional dont-redisplay interactivep))
-(declare-function fsm-get-state-data "fsm" (fsm))
-(declare-function fsm-send "fsm" (fsm event &optional callback))
-
-;;
-
;;;###autoload
(defun jabber-keepalive-start (&optional _jc)
"Activate keepalive.
@@ -205,4 +200,4 @@ accounts."
(provide 'jabber-keepalive)
-;;; jabber-keepalive.el ends here
\ No newline at end of file
+;;; jabber-keepalive.el ends here
diff --git a/lisp/jabber-notifications.el b/lisp/jabber-notifications.el
index d0486d676c..c6e72032a0 100644
--- a/lisp/jabber-notifications.el
+++ b/lisp/jabber-notifications.el
@@ -30,6 +30,8 @@
(eval-when-compile (require 'jabber-alert))
(require 'notifications)
+(require 'jabber-avatar)
+(require 'jabber-muc-nick-completion)
(require 'jabber-xml)
(require 'jabber-util)
@@ -59,14 +61,6 @@ nil disables MUC notifications entirely."
(const :tag "Disabled" nil))
:group 'jabber-alerts)
-;; Global reference declarations
-
-(declare-function jabber-muc-looks-like-personal-p
"jabber-muc-nick-completion.el"
- (message &optional group))
-(declare-function jabber-avatar-find-cached "jabber-avatar.el" (sha1-sum))
-
-;;
-
(defun jabber-notifications--remove-action-callback (callback)
"Remove CALLBACK from the pending notification actions."
(setq notifications-on-action-map
diff --git a/lisp/jabber-openpgp-legacy.el b/lisp/jabber-openpgp-legacy.el
index 0668c25b5e..ead8a50a47 100644
--- a/lisp/jabber-openpgp-legacy.el
+++ b/lisp/jabber-openpgp-legacy.el
@@ -40,14 +40,11 @@
(require 'jabber-xml)
(require 'jabber-hints)
(require 'jabber-chat)
+(require 'jabber-disco)
+(require 'jabber-openpgp)
(eval-when-compile (require 'cl-lib))
-(declare-function jabber-openpgp--our-key "jabber-openpgp" (jc))
-(declare-function jabber-openpgp--our-key-safe "jabber-openpgp" (jc))
-(declare-function jabber-openpgp--recipient-key "jabber-openpgp" (jid))
-(declare-function jabber-disco-advertise-feature "jabber-disco" (feature))
-
(defvar jabber-chatting-with) ; jabber-chat.el
(defvar jabber-group) ; jabber-muc.el
(defvar jabber-chat-ewoc) ; jabber-chatbuffer.el
diff --git a/lisp/jabber-openpgp.el b/lisp/jabber-openpgp.el
index 2993cc8d93..e005b578a3 100644
--- a/lisp/jabber-openpgp.el
+++ b/lisp/jabber-openpgp.el
@@ -35,11 +35,10 @@
(require 'jabber-hints)
(require 'jabber-eme)
(require 'jabber-chat)
+(require 'jabber-disco)
(eval-when-compile (require 'pcase))
-(declare-function jabber-disco-advertise-feature "jabber-disco" (feature))
-
(defvar jabber-chatting-with) ; jabber-chat.el
(defvar jabber-group) ; jabber-muc.el
(defvar jabber-chat-ewoc) ; jabber-chatbuffer.el
diff --git a/lisp/jabber-reactions.el b/lisp/jabber-reactions.el
index 98aa765c8f..846b936946 100644
--- a/lisp/jabber-reactions.el
+++ b/lisp/jabber-reactions.el
@@ -66,11 +66,6 @@ are not filtered against it."
(defvar jabber-group)
(defvar jabber-point-insert)
-(declare-function jabber-db-reaction-stale-p
- "jabber-db" (account peer type target-id sender updated-at))
-(declare-function jabber-db-replace-reactions
- "jabber-db" (account peer type target-id sender reactions
- &optional updated-at))
(declare-function jabber-chat--unwrap-carbon "jabber-chat" (jc xml-data))
(declare-function jabber-chat-ewoc-find-by-id "jabber-chatbuffer" (stanza-id))
(declare-function jabber-chat-ewoc-invalidate "jabber-chatbuffer" (node))
diff --git a/lisp/jabber.el b/lisp/jabber.el
index 1cd41043a0..852e82fc0a 100644
--- a/lisp/jabber.el
+++ b/lisp/jabber.el
@@ -158,6 +158,7 @@ One disabled account with a non-standard port:
(require 'jabber-xml)
(require 'jabber-conn)
(require 'jabber-core)
+(require 'jabber-keepalive)
(require 'jabber-roster)
(require 'jabber-presence)
(require 'jabber-alert)
