gnome-commander r1886 - in branches/gcmd-1-3: . src
- From: epiotr svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-commander r1886 - in branches/gcmd-1-3: . src
- Date: Thu, 17 Jul 2008 21:16:01 +0000 (UTC)
Author: epiotr
Date: Thu Jul 17 21:16:01 2008
New Revision: 1886
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1886&view=rev
Log:
Removed superfluous code for host_port handling
Modified:
branches/gcmd-1-3/ChangeLog
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:16:01 2008
@@ -638,7 +638,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 guint port = gnome_vfs_uri_get_host_port (uri);
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 !!
@@ -650,7 +649,6 @@
con->gnome_auth = conndlg->priv->use_auth;
gnome_cmd_con_ftp_set_host_name (server, host);
- gnome_cmd_con_ftp_set_host_port (server, port);
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);
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:16:01 2008
@@ -31,7 +31,6 @@
struct _GnomeCmdConFtpPrivate
{
gchar *host_name;
- gushort host_port;
gchar *remote_dir;
gchar *user_name;
gchar *pw;
@@ -230,7 +229,6 @@
ftp_con->priv = g_new0 (GnomeCmdConFtpPrivate, 1);
// ftp_con->priv->host_name = NULL;
- // ftp_con->priv->host_port = NULL;
// ftp_con->priv->remote_dir = NULL;
// ftp_con->priv->user_name = NULL;
// ftp_con->priv->pw = NULL;
@@ -274,7 +272,6 @@
const gchar *scheme = gnome_vfs_uri_get_scheme (uri); // do not g_free
const gchar *host = gnome_vfs_uri_get_host_name (uri); // do not g_free
- const guint port = gnome_vfs_uri_get_host_port (uri);
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
@@ -290,7 +287,6 @@
gnome_cmd_con_set_host_name (con, host);
gnome_cmd_con_ftp_set_host_name (server, host);
- gnome_cmd_con_ftp_set_host_port (server, port);
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);
@@ -344,7 +340,6 @@
gnome_cmd_con_set_host_name (con, _host);
gnome_cmd_con_ftp_set_host_name (server, host);
- gnome_cmd_con_ftp_set_host_port (server, port);
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);
@@ -370,15 +365,6 @@
}
-void gnome_cmd_con_ftp_set_host_port (GnomeCmdConFtp *con, gushort host_port)
-{
- g_return_if_fail (con != NULL);
- g_return_if_fail (con->priv != NULL);
-
- con->priv->host_port = host_port;
-}
-
-
void gnome_cmd_con_ftp_set_remote_dir (GnomeCmdConFtp *con, const gchar *remote_dir)
{
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:16:01 2008
@@ -55,8 +55,6 @@
void gnome_cmd_con_ftp_set_host_name (GnomeCmdConFtp *fs, const gchar *host_name);
-void gnome_cmd_con_ftp_set_host_port (GnomeCmdConFtp *fs, gushort host_port);
-
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]