src/gemini/client.lisp

@@ -441,7 +441,7 @@
            (usocket:socket-connect hostname
                                    port
                                    :element-type '(unsigned-byte 8))))
-    #+sbcl (sb-ext:with-timeout +open-socket-response-deadline+
+    #+sbcl (sb-sys:with-deadline (:seconds +open-socket-response-deadline+)
              (open-socket (idn:host-unicode->ascii host)))
     #-sbcl (open-socket (idn:host-unicode->ascii host))))
 

src/gui/client/gemlog-window.lisp

@@ -110,28 +110,22 @@
       (let ((new-rows (all-rows)))
         (resync-rows gemlog-frame new-rows)))))
 
-(defun subscribe-gemlog-or-notify-error (iri)
-  (handler-case
-      (progn
-        (comm:make-request :gemini-gemlog-subscribe 1 iri)
-        t)
-    (error (e)
-      (gui-goodies:notify-request-error e)
-      nil)))
-
 (defun subscribe-gemlog-clsr (gemlog-frame)
   (lambda ()
-    (let* ((iri             (trim-blanks (gui-mw:text-input-dialog gemlog-frame
-                                                                   (_ "Info request")
-                                                                   (_ "Please, type the gemlog's address")
-                                                                   :text "gemini://")))
-           (subscription-ok (subscribe-gemlog-or-notify-error iri)))
-      (if subscription-ok
-          (let ((new-rows (all-rows)))
-            (resync-rows gemlog-frame new-rows))
-          (gui-goodies:notify-request-error (format nil
-                                                    (_ "Unable to subscribe to ~s")
-                                                    iri))))))
+    (handler-case
+        (let* ((iri             (trim-blanks (gui-mw:text-input-dialog gemlog-frame
+                                                                       (_ "Info request")
+                                                                       (_ "Please, type the gemlog's address")
+                                                                       :text "gemini://")))
+               (subscription-ok (comm:make-request :gemini-gemlog-subscribe 1 iri)))
+          (if subscription-ok
+              (let ((new-rows (all-rows)))
+                (resync-rows gemlog-frame new-rows))
+              (gui-goodies:notify-request-error (format nil
+                                                        (_ "Unable to subscribe to ~s")
+                                                        iri))))
+      (error (e)
+        (gui-goodies:notify-request-error e)))))
 
 (defun open-gemlog-clsr (main-window treeview-gemlogs)
   (lambda (e)

src/gui/client/main-window.lisp

@@ -676,8 +676,10 @@ local file paths."
                                              (slurp-iri main-window link-value)))))
                (fs:copy-a-file input-file output-file :overwrite t)))
            (subscribe-as-gemlog ()
-             (let ((subscribed (client-gemlog-window:subscribe-gemlog-or-notify-error link-value)))
-               (if subscribed
+             (let ((subscription-ok (comm:make-request :gemini-gemlog-subscribe
+                                                       1
+                                                       link-value)))
+               (if subscription-ok
                    (gui-goodies:info-operation-completed main-window)
                    (gui-goodies:notify-request-error (format nil
                                                              (_ "Unable to subscribe to ~s")
@@ -1493,8 +1495,8 @@ local file paths."
                 (progn
                   (comm:make-request :gemini-gemlog-unsubscribe 1 iri)
                   (set-subscribe-button-unsubscribed main-window))
-                (let ((subscribed (client-gemlog-window:subscribe-gemlog-or-notify-error iri)))
-                  (if subscribed
+                (let ((subscription-ok (comm:make-request :gemini-gemlog-subscribe 1 iri)))
+                  (if subscription-ok
                       (set-subscribe-button-subscribed main-window)
                       (gui-goodies:notify-request-error (format nil
                                                                 (_ "Unable to subscribe to ~s")

src/json-rpc2.lisp

@@ -416,7 +416,7 @@
 (defun maybe-log-message (m)
   (declare (ignorable m))
   #+debug-json-rpc
-  (misc:dbg "~a" m))
+  (misc:dbg m))
 
 (defun elaborate-single-request (request)
   (flet ((make-rpc-error (e id &optional (data nil))
@@ -457,9 +457,6 @@
                 (make-response elaborated id :error-object nil)))
           (json-rpc-error (e)
             (make-rpc-error e id request))
-          (condition (c)
-            (maybe-log-message (format nil "jsonrpc request signalled a condition: ~a" c))
-            (make-failed-function-error c id request))
           (error (e)
             (maybe-log-message (format nil "jsonrpc request failed: ~a" e))
             (make-failed-function-error e id request))))

src/package.lisp

@@ -3728,7 +3728,6 @@
                     (:gui-shapes :nodgui.shapes)
                     (:menu       :client-menu-command))
   (:export
-   :subscribe-gemlog-or-notify-error
    :init-window))
 
 (defpackage :client-search-frame