diff lib/bookmark.c @ 84:7ef60ce2bdb2

2002-12-29 Brian Masney <[e-mail]> * lib/ssh.c lib/config_file.c lib/Makefile.am lib/gftp.h lib/options.h - removed old legacy SSH protocol and option to enable this protocol * lib/gftp.h - added GFTP_ERETRYABLE and GFTP_EFATAL error codes * lib/bookmark.c lib/local.c lib/protocols.c lib/rfc959.c lib/rfc2068.c lib/sshv2.c - return new error codes instead of -1 or -2 * lib/misc.c (gftp_*_sort_function_ds) - changed return values * src/gtk/transfer.c (connect_thread) - if return value of gftp_connect() is GFTP_EFATAL, don't attempt to retry the connection

--- a/lib/bookmark.c	Fri Dec 27 14:59:50 2002 +0000
+++ b/lib/bookmark.c	Sun Dec 29 15:16:27 2002 +0000
@@ -28,8 +28,8 @@
   const char * pos;
   int i;
 
-  g_return_val_if_fail (request != NULL, -2);
-  g_return_val_if_fail (url != NULL, -2);
+  g_return_val_if_fail (request != NULL, GFTP_EFATAL);
+  g_return_val_if_fail (url != NULL, GFTP_EFATAL);
   
   if ((pos = strstr (url, "://")) != NULL)
     pos += 3;
@@ -40,14 +40,14 @@
     {
       request->logging_function (gftp_logging_error, request->user_data,
                                  _("Error: Could not find bookmark %s\n"), pos);
-      return (-2);
+      return (GFTP_EFATAL);
     }
   else if (tempentry->hostname == NULL || *tempentry->hostname == '\0' ||
            tempentry->user == NULL || *tempentry->user == '\0')
     {
       request->logging_function (gftp_logging_error, request->user_data,
                                  _("Bookmarks Error: There are some missing entries in this bookmark. Make sure you have a hostname and username\n"));
-      return (-2);
+      return (GFTP_EFATAL);
     }
 
   gftp_set_username (request, tempentry->user);