gnome-commander r1888 - branches/gcmd-1-3/src

[epiotr svn gnome org]

Author: epiotr
Date: Thu Jul 17 21:32:05 2008
New Revision: 1888
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1888&view=rev

Log:
Removed superfluous code for user_name handling

Modified:
   branches/gcmd-1-3/src/gnome-cmd-con-dialog.cc
   branches/gcmd-1-3/src/gnome-cmd-con-ftp.cc
   branches/gcmd-1-3/src/gnome-cmd-con-ftp.h

Modified: branches/gcmd-1-3/src/gnome-cmd-con-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-con-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-con-dialog.cc	Thu Jul 17 21:32:05 2008
@@ -639,7 +639,6 @@
         const gchar *alias = conndlg->priv->alias ? conndlg->priv->alias->c_str() : NULL;
         const gchar *host = gnome_vfs_uri_get_host_name (uri);      // do not g_free !!
         const gchar *remote_dir = gnome_vfs_uri_get_path (uri);     // do not g_free !!
-        const gchar *user = gnome_vfs_uri_get_user_name (uri);      // do not g_free !!
         const gchar *password = gnome_vfs_uri_get_password (uri);   // do not g_free !!
 
         gnome_cmd_con_set_alias (con, alias);
@@ -650,7 +649,6 @@
 
         gnome_cmd_con_ftp_set_host_name (server, host);
         gnome_cmd_con_ftp_set_remote_dir (server, remote_dir);
-        gnome_cmd_con_ftp_set_user_name (server, user);
         gnome_cmd_con_ftp_set_pw (server, password);
 
         gnome_vfs_uri_unref (uri);

Modified: branches/gcmd-1-3/src/gnome-cmd-con-ftp.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-con-ftp.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-con-ftp.cc	Thu Jul 17 21:32:05 2008
@@ -32,7 +32,6 @@
 {
     gchar *host_name;
     gchar *remote_dir;
-    gchar *user_name;
     gchar *pw;
 };
 
@@ -155,7 +154,6 @@
     GnomeCmdConFtp *con = GNOME_CMD_CON_FTP (object);
 
     g_free (con->priv->host_name);
-    g_free (con->priv->user_name);
     g_free (con->priv->pw);
     g_free (con->priv->remote_dir);
 
@@ -230,7 +228,6 @@
 
     // ftp_con->priv->host_name = NULL;
     // ftp_con->priv->remote_dir = NULL;
-    // ftp_con->priv->user_name = NULL;
     // ftp_con->priv->pw = NULL;
 }
 
@@ -288,7 +285,6 @@
 
     gnome_cmd_con_ftp_set_host_name (server, host);
     gnome_cmd_con_ftp_set_remote_dir (server, remote_dir);
-    gnome_cmd_con_ftp_set_user_name (server, user);
     gnome_cmd_con_ftp_set_pw (server, password);
 
     con->method = gnome_vfs_uri_is_local (uri) ? CON_LOCAL :
@@ -341,7 +337,6 @@
 
     gnome_cmd_con_ftp_set_host_name (server, host);
     gnome_cmd_con_ftp_set_remote_dir (server, remote_dir);
-    gnome_cmd_con_ftp_set_user_name (server, user);
     gnome_cmd_con_ftp_set_pw (server, password);
 
     con->gnome_auth = !password && con->method!=CON_ANON_FTP;          // ?????????
@@ -376,18 +371,6 @@
 }
 
 
-void gnome_cmd_con_ftp_set_user_name (GnomeCmdConFtp *con, const gchar *user_name)
-{
-    g_return_if_fail (con != NULL);
-    g_return_if_fail (con->priv != NULL);
-    g_return_if_fail (user_name != NULL);
-
-    g_free (con->priv->user_name);
-
-    con->priv->user_name = g_strdup (user_name);
-}
-
-
 void gnome_cmd_con_ftp_set_pw (GnomeCmdConFtp *con, const gchar *pw)
 {
     g_return_if_fail (con != NULL);

Modified: branches/gcmd-1-3/src/gnome-cmd-con-ftp.h
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-con-ftp.h	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-con-ftp.h	Thu Jul 17 21:32:05 2008
@@ -57,8 +57,6 @@
 
 void gnome_cmd_con_ftp_set_remote_dir (GnomeCmdConFtp *fs, const gchar *pw);
 
-void gnome_cmd_con_ftp_set_user_name (GnomeCmdConFtp *fs, const gchar *user_name);
-
 void gnome_cmd_con_ftp_set_pw (GnomeCmdConFtp *fs, const gchar *pw);
 
 #endif // __GNOME_CMD_CON_FTP_H__