[gnome-commander] Don't store username and password in connections, this is handled by gio allone
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Don't store username and password in connections, this is handled by gio allone
- Date: Thu, 6 Jan 2022 22:27:52 +0000 (UTC)
commit 7a475d9fc14d102b06b7cc175b6d73f5cc9deabb
Author: Uwe Scholz <u scholz83 gmx de>
Date: Tue Dec 14 23:46:48 2021 +0100
Don't store username and password in connections, this is handled by gio allone
src/dialogs/gnome-cmd-con-dialog.cc | 79 +++++++++++-----------------------
src/dialogs/gnome-cmd-remote-dialog.cc | 13 +-----
src/gnome-cmd-con.cc | 35 ++-------------
src/gnome-cmd-con.h | 37 +++++++---------
src/gnome-cmd-data.cc | 34 ---------------
src/gnome-cmd-data.h | 4 --
6 files changed, 46 insertions(+), 156 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-con-dialog.cc b/src/dialogs/gnome-cmd-con-dialog.cc
index 725a0677..a7ed0ff0 100644
--- a/src/dialogs/gnome-cmd-con-dialog.cc
+++ b/src/dialogs/gnome-cmd-con-dialog.cc
@@ -74,7 +74,6 @@ struct GnomeCmdConnectDialog::Private
GtkWidget *port_entry;
GtkWidget *folder_entry;
GtkWidget *domain_entry;
- GtkWidget *user_entry;
Private();
~Private();
@@ -93,7 +92,6 @@ inline GnomeCmdConnectDialog::Private::Private()
port_entry = gtk_entry_new ();
folder_entry = gtk_entry_new ();
domain_entry = gtk_entry_new ();
- user_entry = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (alias_entry), TRUE);
gtk_entry_set_activates_default (GTK_ENTRY (uri_entry), TRUE);
@@ -101,7 +99,6 @@ inline GnomeCmdConnectDialog::Private::Private()
gtk_entry_set_activates_default (GTK_ENTRY (share_entry), TRUE);
gtk_entry_set_activates_default (GTK_ENTRY (port_entry), TRUE);
gtk_entry_set_activates_default (GTK_ENTRY (folder_entry), TRUE);
- gtk_entry_set_activates_default (GTK_ENTRY (user_entry), TRUE);
// We need an extra ref so we can remove them from the table
g_object_ref (alias_entry);
@@ -111,7 +108,6 @@ inline GnomeCmdConnectDialog::Private::Private()
g_object_ref (port_entry);
g_object_ref (folder_entry);
g_object_ref (domain_entry);
- g_object_ref (user_entry);
}
@@ -124,7 +120,6 @@ inline GnomeCmdConnectDialog::Private::~Private()
g_object_unref (port_entry);
g_object_unref (folder_entry);
g_object_unref (domain_entry);
- g_object_unref (user_entry);
delete alias;
}
@@ -152,9 +147,6 @@ void GnomeCmdConnectDialog::Private::setup_for_type()
if (folder_entry->parent)
gtk_container_remove (GTK_CONTAINER (optional_table), folder_entry);
- if (user_entry->parent)
- gtk_container_remove (GTK_CONTAINER (optional_table), user_entry);
-
if (domain_entry->parent)
gtk_container_remove (GTK_CONTAINER (optional_table), domain_entry);
@@ -164,7 +156,7 @@ void GnomeCmdConnectDialog::Private::setup_for_type()
gint i = 1;
GtkWidget *table = required_table;
- gboolean show_share, show_port, show_user, show_domain;
+ gboolean show_share, show_port, show_domain;
show_entry (table, alias_entry, _("_Alias:"), i);
@@ -181,14 +173,12 @@ void GnomeCmdConnectDialog::Private::setup_for_type()
case CON_DAVS:
show_share = FALSE;
show_port = TRUE;
- show_user = TRUE;
show_domain = FALSE;
break;
case CON_ANON_FTP:
show_share = FALSE;
show_port = TRUE;
- show_user = FALSE;
show_domain = FALSE;
break;
@@ -196,7 +186,6 @@ void GnomeCmdConnectDialog::Private::setup_for_type()
case CON_SMB:
show_share = TRUE;
show_port = FALSE;
- show_user = TRUE;
show_domain = TRUE;
break;
#endif
@@ -244,9 +233,6 @@ void GnomeCmdConnectDialog::Private::setup_for_type()
show_entry (table, folder_entry, _("_Folder:"), i);
- if (show_user)
- show_entry (table, user_entry, _("_User name:"), i);
-
if (show_domain)
show_entry (table, domain_entry, _("_Domain name:"), i);
}
@@ -277,8 +263,6 @@ gboolean GnomeCmdConnectDialog::verify_uri()
string port;
string folder;
string domain;
- string user;
- string password;
if (priv->uri_entry->parent)
stringify (uri, gtk_editable_get_chars (GTK_EDITABLE (priv->uri_entry), 0, -1));
@@ -298,9 +282,6 @@ gboolean GnomeCmdConnectDialog::verify_uri()
if (priv->domain_entry->parent)
stringify (domain, gtk_editable_get_chars (GTK_EDITABLE (priv->domain_entry), 0, -1));
- if (priv->user_entry->parent)
- stringify (user, gtk_editable_get_chars (GTK_EDITABLE (priv->user_entry), 0, -1));
-
int type = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->type_combo));
if (type!=CON_URI && server.empty())
@@ -310,10 +291,7 @@ gboolean GnomeCmdConnectDialog::verify_uri()
return FALSE;
}
- if (type==CON_ANON_FTP)
- user = "anonymous";
-
- gnome_cmd_con_make_uri (uri, (ConnectionMethodID) type, uri, server, share, port, folder, domain, user,
password);
+ gnome_cmd_con_make_uri (uri, (ConnectionMethodID) type, uri, server, share, port, folder, domain);
if (type==CON_URI && !uri_is_valid(uri.c_str()))
{
@@ -553,7 +531,6 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server)
auto host = g_strdup(gnome_cmd_con_get_host_name(con));
gint port = gnome_cmd_con_get_port (con);
auto path = gnome_cmd_con_get_root_path(con);
- auto user_name = g_strdup(gnome_cmd_con_get_user_name (con));
if (con->uri)
{
@@ -577,29 +554,12 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server)
gtk_entry_set_text (GTK_ENTRY (dialog->priv->folder_entry), path);
g_strfreev (a);
-
- if (user_name)
- {
- a = g_strsplit (user_name, ";", 2);
- if (g_strv_length (a) > 1)
- {
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->domain_entry), a[0]);
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), a[1]);
- }
- else
- {
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), user_name);
- }
- g_strfreev (a);
- }
}
else
{
#endif
if (path)
gtk_entry_set_text (GTK_ENTRY (dialog->priv->folder_entry), path);
- if (user_name)
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), user_name);
#ifdef HAVE_SAMBA
}
#endif
@@ -612,7 +572,6 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server)
if (response == GTK_RESPONSE_OK)
{
- g_free(user_name);
g_free(host);
gchar *scheme;
@@ -620,12 +579,10 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server)
if (dialog->priv->uri_str.c_str())
{
- g_uri_split_with_user (
+ g_uri_split (
dialog->priv->uri_str.c_str(),
- G_URI_FLAGS_HAS_PASSWORD,
+ G_URI_FLAGS_NONE,
&scheme,
- &user_name,
- nullptr, //password
nullptr, //auth_params
&host, //host
&port, //port
@@ -636,16 +593,33 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server)
);
if (error)
{
- g_warning("gnome_cmd_connect_dialog_edit - g_uri_split_with_user error: %s", error->message);
+ g_warning("gnome_cmd_connect_dialog_edit - g_uri_split error: %s", error->message);
g_error_free(error);
return FALSE;
}
-
- gnome_cmd_con_set_uri (con, dialog->priv->uri_str);
+#ifdef HAVE_SAMBA
+ if (!strcmp(scheme, "smb"))
+ {
+ auto uriString = path
+ ? g_strdup_printf("%s://%s/%s/", scheme, host, path)
+ : g_strdup_printf("%s://%s/", scheme, host);
+ gnome_cmd_con_set_uri (con, uriString);
+ g_free(uriString);
+ }
+ else
+ {
+#endif
+ auto uriString = port != -1
+ ? g_strdup_printf("%s://%s:%d/", scheme, host, port)
+ : g_strdup_printf("%s://%s/", scheme, host);
+ gnome_cmd_con_set_uri (con, uriString);
+ g_free(uriString);
+#ifdef HAVE_SAMBA
+ }
+#endif
}
else
{
- user_name = g_strdup(gtk_entry_get_text (GTK_ENTRY (dialog->priv->user_entry)));
host = g_strdup(gtk_entry_get_text (GTK_ENTRY (dialog->priv->server_entry)));
path = g_strdup(gtk_entry_get_text (GTK_ENTRY (dialog->priv->folder_entry)));
auto portChar = gtk_entry_get_text (GTK_ENTRY (dialog->priv->port_entry));
@@ -655,8 +629,6 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server)
auto alias = dialog->priv->alias ? dialog->priv->alias->c_str() : nullptr;
gnome_cmd_con_set_alias (con, alias);
- gnome_cmd_con_set_user_name (con, user_name);
- gnome_cmd_con_set_host_name (con, host);
gnome_cmd_con_set_scheme(con, scheme);
gnome_cmd_con_set_root_path(con, path);
if (port != -1)
@@ -667,7 +639,6 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server)
gnome_cmd_con_remote_set_tooltips (server, host);
- g_free(user_name);
g_free(host);
g_free(path);
g_free(scheme);
diff --git a/src/dialogs/gnome-cmd-remote-dialog.cc b/src/dialogs/gnome-cmd-remote-dialog.cc
index 37ee72f5..3735decb 100644
--- a/src/dialogs/gnome-cmd-remote-dialog.cc
+++ b/src/dialogs/gnome-cmd-remote-dialog.cc
@@ -38,7 +38,6 @@ using namespace std;
struct GnomeCmdRemoteDialog::Private
{
GtkWidget *connection_list;
- GtkWidget *anonymous_pw_entry;
GtkWidget *connect_button;
};
@@ -138,10 +137,6 @@ inline void GnomeCmdRemoteDialog::do_connect(GnomeCmdConRemote *server)
if (!server) // exit as there is no server selected
return;
- // store the anonymous ftp password as the user might have changed it
- const gchar *anon_pw = gtk_entry_get_text (GTK_ENTRY (priv->anonymous_pw_entry));
- gnome_cmd_data_set_ftp_anonymous_password (anon_pw);
-
gtk_widget_destroy (*this);
g_timeout_add (1, (GtkFunction) do_connect_real, server);
@@ -405,7 +400,7 @@ static void gnome_cmd_remote_dialog_class_init (GnomeCmdRemoteDialogClass *klass
static void gnome_cmd_remote_dialog_init (GnomeCmdRemoteDialog *dialog)
{
- GtkWidget *cat_box, *table, *cat, *sw, *label, *button, *bbox;
+ GtkWidget *cat_box, *table, *cat, *sw, *button, *bbox;
dialog->priv = g_new0 (GnomeCmdRemoteDialog::Private, 1);
@@ -447,12 +442,6 @@ static void gnome_cmd_remote_dialog_init (GnomeCmdRemoteDialog *dialog)
cat = create_category (*dialog, table, _("Options"));
gnome_cmd_dialog_add_category (*dialog, cat);
- label = create_label (*dialog, _("Anonymous FTP password:"));
- table_add (table, label, 0, 0, (GtkAttachOptions) 0);
-
- dialog->priv->anonymous_pw_entry = create_entry (*dialog, "anonymous_pw_entry",
gnome_cmd_data_get_ftp_anonymous_password ());
- table_add (table, dialog->priv->anonymous_pw_entry, 1, 0, GTK_FILL);
-
gnome_cmd_dialog_add_button (*dialog, GTK_STOCK_HELP, GTK_SIGNAL_FUNC (on_help_btn_clicked), dialog);
gnome_cmd_dialog_add_button (*dialog, GTK_STOCK_CLOSE, GTK_SIGNAL_FUNC (on_close_btn_clicked), dialog);
button = gnome_cmd_dialog_add_button (*dialog, GTK_STOCK_CONNECT, GTK_SIGNAL_FUNC
(on_connect_btn_clicked), dialog);
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index 2822a4e6..f61157fe 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -610,24 +610,12 @@ const gchar *gnome_cmd_con_get_icon_name (ConnectionMethodID method)
}
-string &__gnome_cmd_con_make_uri (string &s, const gchar *method, string &server, string &port, string
&folder, string &user, string &password)
+string &__gnome_cmd_con_make_uri (string &s, const gchar *method, string &server, string &port, string
&folder)
{
- user = stringify (g_strescape (user.c_str(), nullptr));
- password = stringify (g_strescape (password.c_str(), nullptr));
-
- if (!password.empty())
- {
- user += ':';
- user += password;
- }
-
folder = stringify (g_uri_escape_string (folder.c_str(), nullptr, true));
s = method;
- if (!user.empty())
- s += user + '@';
-
s += server;
if (!port.empty())
@@ -646,20 +634,8 @@ string &__gnome_cmd_con_make_uri (string &s, const gchar *method, string &server
}
#ifdef HAVE_SAMBA
-std::string &gnome_cmd_con_make_smb_uri (std::string &uriString, std::string &server, string &port,
std::string &share, std::string &folder, std::string &domain, std::string &user, std::string &password)
+std::string &gnome_cmd_con_make_smb_uri (std::string &uriString, std::string &server, std::string &share,
std::string &folder, std::string &domain)
{
- user = stringify (g_strescape (user.c_str(), nullptr));
- password = stringify (g_strescape (password.c_str(), nullptr));
-
- if (!password.empty())
- {
- user += ':';
- user += password;
- }
-
- if (!domain.empty())
- user = domain + ';' + user;
-
const gchar *joinSign = !folder.empty() && folder[0] != '/' ? "/" : "";
folder = share + joinSign + folder;
@@ -671,14 +647,11 @@ std::string &gnome_cmd_con_make_smb_uri (std::string &uriString, std::string &se
uriString = "smb://";
- if (!user.empty())
- uriString += user + '@';
+ if (!domain.empty())
+ uriString = domain + ';';
uriString += server;
- if (!port.empty())
- uriString += ':' + port;
-
uriString += "/";
uriString += folder;
diff --git a/src/gnome-cmd-con.h b/src/gnome-cmd-con.h
index 576f327f..b0c2ced1 100644
--- a/src/gnome-cmd-con.h
+++ b/src/gnome-cmd-con.h
@@ -472,7 +472,7 @@ inline ConnectionMethodID gnome_cmd_con_get_scheme (const gchar *uriString)
return retValue;
}
-std::string &__gnome_cmd_con_make_uri (std::string &s, const gchar *method, std::string &server, std::string
&port, std::string &folder, std::string &user, std::string &password);
+std::string &__gnome_cmd_con_make_uri (std::string &s, const gchar *method, std::string &server, std::string
&port, std::string &folder);
inline std::string &gnome_cmd_con_make_custom_uri (std::string &s, const std::string &uri)
{
@@ -491,51 +491,46 @@ inline std::string &gnome_cmd_con_make_custom_uri (std::string &s, const std::st
return s;
}
-inline std::string &gnome_cmd_con_make_ssh_uri (std::string &s, std::string &server, std::string &port,
std::string &folder, std::string &user, std::string &password)
+inline std::string &gnome_cmd_con_make_ssh_uri (std::string &s, std::string &server, std::string &port,
std::string &folder)
{
- return __gnome_cmd_con_make_uri (s, "sftp://", server, port, folder, user, password);
+ return __gnome_cmd_con_make_uri (s, "sftp://", server, port, folder);
}
-inline std::string &gnome_cmd_con_make_ftp_uri (std::string &s, std::string &server, std::string &port,
std::string &folder, std::string &user, std::string &password)
+inline std::string &gnome_cmd_con_make_ftp_uri (std::string &s, std::string &server, std::string &port,
std::string &folder)
{
- if (user=="anonymous")
- {
- password = gnome_cmd_data_get_ftp_anonymous_password ();
- }
-
- return __gnome_cmd_con_make_uri (s, "ftp://", server, port, folder, user, password);
+ return __gnome_cmd_con_make_uri (s, "ftp://", server, port, folder);
}
#ifdef HAVE_SAMBA
-std::string &gnome_cmd_con_make_smb_uri (std::string &s, std::string &server, std::string &port, std::string
&share, std::string &folder, std::string &domain, std::string &user, std::string &password);
+std::string &gnome_cmd_con_make_smb_uri (std::string &s, std::string &server, std::string &share,
std::string &folder, std::string &domain);
#endif
-inline std::string &gnome_cmd_con_make_dav_uri (std::string &s, std::string &server, std::string &port,
std::string &folder, std::string &user, std::string &password)
+inline std::string &gnome_cmd_con_make_dav_uri (std::string &s, std::string &server, std::string &port,
std::string &folder)
{
- return __gnome_cmd_con_make_uri (s, "dav://", server, port, folder, user, password);
+ return __gnome_cmd_con_make_uri (s, "dav://", server, port, folder);
}
-inline std::string &gnome_cmd_con_make_davs_uri (std::string &s, std::string &server, std::string &port,
std::string &folder, std::string &user, std::string &password)
+inline std::string &gnome_cmd_con_make_davs_uri (std::string &s, std::string &server, std::string &port,
std::string &folder)
{
- return __gnome_cmd_con_make_uri (s, "davs://", server, port, folder, user, password);
+ return __gnome_cmd_con_make_uri (s, "davs://", server, port, folder);
}
-inline std::string &gnome_cmd_con_make_uri (std::string &s, ConnectionMethodID method, std::string &uri,
std::string &server, std::string &share, std::string &port, std::string &folder, std::string &domain,
std::string &user, std::string &password)
+inline std::string &gnome_cmd_con_make_uri (std::string &s, ConnectionMethodID method, std::string &uri,
std::string &server, std::string &share, std::string &port, std::string &folder, std::string &domain)
{
switch (method)
{
case CON_FTP:
- case CON_ANON_FTP: return gnome_cmd_con_make_ftp_uri (s, server, port, folder, user, password);
+ case CON_ANON_FTP: return gnome_cmd_con_make_ftp_uri (s, server, port, folder);
- case CON_SSH: return gnome_cmd_con_make_ssh_uri (s, server, port, folder, user, password);
+ case CON_SSH: return gnome_cmd_con_make_ssh_uri (s, server, port, folder);
#ifdef HAVE_SAMBA
- case CON_SMB: return gnome_cmd_con_make_smb_uri (s, server, port, share, folder, domain, user,
password);
+ case CON_SMB: return gnome_cmd_con_make_smb_uri (s, server, share, folder, domain);
#endif
- case CON_DAV: return gnome_cmd_con_make_dav_uri (s, server, port, folder, user, password);
+ case CON_DAV: return gnome_cmd_con_make_dav_uri (s, server, port, folder);
- case CON_DAVS: return gnome_cmd_con_make_davs_uri (s, server, port, folder, user, password);
+ case CON_DAVS: return gnome_cmd_con_make_davs_uri (s, server, port, folder);
case CON_URI: return gnome_cmd_con_make_custom_uri (s, uri);
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index ae257382..236741f8 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -53,8 +53,6 @@ struct GnomeCmdData::Private
{
GnomeCmdConList *con_list;
GList *auto_load_plugins;
-
- gchar *ftp_anonymous_password;
};
GSettingsSchemaSource* GnomeCmdData::GetGlobalSchemaSource()
@@ -902,12 +900,6 @@ static void on_terminal_exec_cmd_changed()
gnome_cmd_data.options.termexec = terminal_exec_cmd;
}
-static void on_ftp_anonymous_password_changed()
-{
- g_free(gnome_cmd_data.priv->ftp_anonymous_password);
- gnome_cmd_data.priv->ftp_anonymous_password = g_settings_get_string
(gnome_cmd_data.options.gcmd_settings->network, GCMD_SETTINGS_FTP_ANONYMOUS_PASSWORD);
-}
-
static void on_use_gcmd_block_changed()
{
gnome_cmd_data.use_gcmd_block = g_settings_get_boolean (gnome_cmd_data.options.gcmd_settings->programs,
GCMD_SETTINGS_USE_GCMD_BLOCK);
@@ -1336,11 +1328,6 @@ static void gcmd_connect_gsettings_signals(GcmdSettings *gs)
G_CALLBACK (on_use_gcmd_block_changed),
nullptr);
- g_signal_connect (gs->network,
- "changed::ftp-anonymous-password",
- G_CALLBACK (on_ftp_anonymous_password_changed),
- nullptr);
-
}
@@ -2710,9 +2697,6 @@ GnomeCmdData::~GnomeCmdData()
// gtk_object_destroy (GTK_OBJECT (quick_connect));
}
- // free the anonymous password string
- g_free (priv->ftp_anonymous_password);
-
g_free (priv);
}
}
@@ -3240,8 +3224,6 @@ void GnomeCmdData::load()
main_win_state = (GdkWindowState) g_settings_get_uint (options.gcmd_settings->general,
GCMD_SETTINGS_MAIN_WIN_STATE);
- priv->ftp_anonymous_password = g_settings_get_string (options.gcmd_settings->network,
GCMD_SETTINGS_FTP_ANONYMOUS_PASSWORD);
-
advrename_defaults.width = g_settings_get_uint (options.gcmd_settings->general,
GCMD_SETTINGS_ADVRENAME_TOOL_WIDTH);
advrename_defaults.height = g_settings_get_uint (options.gcmd_settings->general,
GCMD_SETTINGS_ADVRENAME_TOOL_HEIGHT);
advrename_defaults.templates.ents = get_list_from_gsettings_string_array
(options.gcmd_settings->general, GCMD_SETTINGS_ADVRENAME_TOOL_TEMPLATE_HISTORY);
@@ -3639,8 +3621,6 @@ void GnomeCmdData::save()
set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_MAIN_WIN_STATE,
&(main_win_state));
- set_gsettings_when_changed (options.gcmd_settings->network, GCMD_SETTINGS_FTP_ANONYMOUS_PASSWORD,
priv->ftp_anonymous_password);
-
set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_ADVRENAME_TOOL_WIDTH,
&(advrename_defaults.width));
set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_ADVRENAME_TOOL_HEIGHT,
&(advrename_defaults.height));
set_gsettings_string_array_from_glist(options.gcmd_settings->general,
GCMD_SETTINGS_ADVRENAME_TOOL_TEMPLATE_HISTORY, advrename_defaults.templates.ents);
@@ -3865,20 +3845,6 @@ gpointer gnome_cmd_data_get_con_list ()
}
-const gchar *gnome_cmd_data_get_ftp_anonymous_password ()
-{
- return gnome_cmd_data.priv->ftp_anonymous_password;
-}
-
-
-void gnome_cmd_data_set_ftp_anonymous_password (const gchar *pw)
-{
- g_free (gnome_cmd_data.priv->ftp_anonymous_password);
-
- gnome_cmd_data.priv->ftp_anonymous_password = g_strdup (pw);
-}
-
-
GList *gnome_cmd_data_get_auto_load_plugins ()
{
return gnome_cmd_data.priv->auto_load_plugins;
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index cef02213..ece7e5c3 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -208,7 +208,6 @@ GcmdSettings *gcmd_settings_new (void);
#define GCMD_PREF_NETWORK "org.gnome.gnome-commander.preferences.network"
#define GCMD_SETTINGS_QUICK_CONNECT_URI "quick-connect-uri"
-#define GCMD_SETTINGS_FTP_ANONYMOUS_PASSWORD "ftp-anonymous-password"
#define GCMD_PREF_INTERNAL_VIEWER "org.gnome.gnome-commander.preferences.internal-viewer"
#define GCMD_SETTINGS_IV_CASE_SENSITIVE "case-sensitive-search"
@@ -751,9 +750,6 @@ struct GnomeCmdData
gpointer gnome_cmd_data_get_con_list ();
-const gchar *gnome_cmd_data_get_ftp_anonymous_password ();
-void gnome_cmd_data_set_ftp_anonymous_password (const gchar *pw);
-
GList *gnome_cmd_data_get_auto_load_plugins ();
void gnome_cmd_data_set_auto_load_plugins (GList *plugins);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]