gnome-commander r1850 - in trunk: . src

[epiotr svn gnome org]

Author: epiotr
Date: Tue Jun 17 19:12:47 2008
New Revision: 1850
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1850&view=rev

Log:
Remote connection GUI: support for SSH+WebDAV in remote connection dlg

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/gnome-cmd-con-dialog.cc
   trunk/src/gnome-cmd-con.h

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Tue Jun 17 19:12:47 2008
@@ -17,7 +17,6 @@
 * advrename & FAM: do not re-sort file list for every single renamed file
 * Bookmark icons for ordinary folders in the device toolbar
 * User defined categories for grouping bookmarks
-* Support for SSH+FTP and WebDAV
 * Editing remote files
 * Optional file deselection after completed action (copy, rename, ...)
 * More plugins:

Modified: trunk/src/gnome-cmd-con-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-con-dialog.cc	(original)
+++ trunk/src/gnome-cmd-con-dialog.cc	Tue Jun 17 19:12:47 2008
@@ -481,14 +481,13 @@
     dialog->priv->type_combo = combo = gtk_combo_box_new_text ();
 
     // Keep this in sync with enum ConnectionMethodID in gnome-cmd-con.h
+    gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("SSH"));
     gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("FTP (with login)"));
     gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Public FTP"));
-    // gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("SSH"));
-    // gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Windows share"));
-    // gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("WebDAV (HTTP)"));
-    // gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Secure WebDAV (HTTPS)"));
-    // gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Custom location"));
-    gtk_combo_box_set_active (GTK_COMBO_BOX (combo), CON_FTP);     // CON_FTP --> CON_SSH
+    gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Windows share"));
+    gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("WebDAV (HTTP)"));
+    gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Secure WebDAV (HTTPS)"));
+    gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Custom location"));
     gtk_widget_show (combo);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
     gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);

Modified: trunk/src/gnome-cmd-con.h
==============================================================================
--- trunk/src/gnome-cmd-con.h	(original)
+++ trunk/src/gnome-cmd-con.h	Tue Jun 17 19:12:47 2008
@@ -59,12 +59,12 @@
     CON_OPEN_NOT_STARTED
 } ConOpenResult;
 
-typedef enum        // Keep this order in sync with strings in gnome-cmd-con-dialog.cc
+typedef enum        // Keep this order in sync with strings in gnome-cmd-con-dialog.cc and gnome-cmd-con.cc
 {
-    CON_FTP,
-    CON_ANON_FTP,
     CON_SSH,
     CON_SFTP = CON_SSH,
+    CON_FTP,
+    CON_ANON_FTP,
     CON_SMB,
     CON_DAV,
     CON_DAVS,