[gnome-commander] Remove the ConnectionMethodID CON_INVALID again, we actually don't need it



commit 29fa959c4101ac3c898db88d95248f28749ef368
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Sun Sep 26 23:21:33 2021 +0200

    Remove the ConnectionMethodID CON_INVALID again, we actually don't need it

 src/gnome-cmd-con.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/src/gnome-cmd-con.h b/src/gnome-cmd-con.h
index b98c8fcc..880e9056 100644
--- a/src/gnome-cmd-con.h
+++ b/src/gnome-cmd-con.h
@@ -51,8 +51,7 @@ enum ConnectionMethodID        // Keep this order in sync with strings in gnome-
     CON_DAV,
     CON_DAVS,
     CON_URI,
-    CON_FILE,
-    CON_INVALID
+    CON_FILE
 };
 
 struct GnomeCmdCon
@@ -442,10 +441,10 @@ inline ConnectionMethodID gnome_cmd_con_get_scheme (const gchar *uriString)
     {
         g_warning("gnome_cmd_con_get_scheme - g_uri_split_with_user error: %s", error->message);
         g_error_free(error);
-        return CON_INVALID;
+        return CON_SSH;
     }
 
-    ConnectionMethodID retValue = scheme == nullptr ? CON_INVALID :
+    ConnectionMethodID retValue = scheme == nullptr ? CON_FILE :
            g_str_equal (scheme, "file") ? CON_FILE :
            g_str_equal (scheme, "ftp")  ? (user && g_str_equal (user, "anonymous") ? CON_ANON_FTP : CON_FTP) 
:
            g_str_equal (scheme, "ftp")  ? CON_FTP :
@@ -523,9 +522,6 @@ inline std::string &gnome_cmd_con_make_uri (std::string &s, ConnectionMethodID m
 
         case CON_URI:       return gnome_cmd_con_make_custom_uri (s, uri);
 
-        // ToDo: Check if this is valid!
-        case CON_INVALID:   return s;
-
         case CON_FILE:
         default:            return s;
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]