[gnome-commander] GnomeCmdCon: rename gnome_auth -> auth



commit 1551101f37ef9fb0d898df42a22a8904e40c2bf4
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Fri Sep 16 22:51:03 2011 +0200

    GnomeCmdCon: rename gnome_auth -> auth

 src/dialogs/gnome-cmd-remote-dialog.cc |    4 ++--
 src/gnome-cmd-con-dialog.cc            |    8 ++++----
 src/gnome-cmd-con-ftp.cc               |    2 +-
 src/gnome-cmd-con.cc                   |    4 ++--
 src/gnome-cmd-con.h                    |    2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-remote-dialog.cc b/src/dialogs/gnome-cmd-remote-dialog.cc
index a430cb6..3a9ccee 100644
--- a/src/dialogs/gnome-cmd-remote-dialog.cc
+++ b/src/dialogs/gnome-cmd-remote-dialog.cc
@@ -102,8 +102,8 @@ inline void set_server (GtkListStore *store, GtkTreeIter *iter, GnomeCmdConFtp *
 
     gtk_list_store_set (store, iter,
                         COL_METHOD, gnome_cmd_con_get_icon_name (con->method),
-                        COL_LOCK, con->gnome_auth ? GTK_STOCK_DIALOG_AUTHENTICATION : NULL,
-                        COL_AUTH, con->gnome_auth,
+                        COL_LOCK, con->auth ? GTK_STOCK_DIALOG_AUTHENTICATION : NULL,
+                        COL_AUTH, con->auth,
                         COL_NAME, gnome_cmd_con_get_alias (con),
                         COL_CON, con,
                         COL_FTP_CON, server,                // FIXME: to be removed
diff --git a/src/gnome-cmd-con-dialog.cc b/src/gnome-cmd-con-dialog.cc
index cf564a7..dba4751 100644
--- a/src/gnome-cmd-con-dialog.cc
+++ b/src/gnome-cmd-con-dialog.cc
@@ -574,7 +574,7 @@ GnomeCmdConFtp *gnome_cmd_connect_dialog_new (gboolean has_alias)
         GnomeCmdCon *con = GNOME_CMD_CON (server);
 
         con->method = (ConnectionMethodID) gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->type_combo));
-        con->gnome_auth = dialog->priv->use_auth;
+        con->auth = dialog->priv->use_auth;
     }
 
     gtk_widget_destroy (*dialog);
@@ -597,8 +597,8 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConFtp *server)
     gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), con->method);
 
     // Use GNOME Keyring Manager for authentication
-    dialog->priv->use_auth = con->gnome_auth;
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->auth_check), con->gnome_auth);
+    dialog->priv->use_auth = con->auth;
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->auth_check), con->auth);
 
     // Alias
     if (con->alias)
@@ -681,7 +681,7 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConFtp *server)
         gnome_cmd_con_set_uri (con, dialog->priv->uri_str);
         gnome_cmd_con_set_host_name (con, host);
         con->method = (ConnectionMethodID) gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->type_combo));
-        con->gnome_auth = dialog->priv->use_auth;
+        con->auth = dialog->priv->use_auth;
 
         gnome_cmd_con_ftp_set_host_name (server, host);
 
diff --git a/src/gnome-cmd-con-ftp.cc b/src/gnome-cmd-con-ftp.cc
index 4dda10d..77e6b2e 100644
--- a/src/gnome-cmd-con-ftp.cc
+++ b/src/gnome-cmd-con-ftp.cc
@@ -261,7 +261,7 @@ GnomeCmdConFtp *gnome_cmd_con_ftp_new (const gchar *alias, const string &text_ur
     gnome_cmd_con_ftp_set_host_name (server, host);
 
     con->method = gnome_cmd_con_get_scheme (uri);
-    con->gnome_auth = !password && con->method!=CON_ANON_FTP;          // ?????????
+    con->auth = !password && con->method!=CON_ANON_FTP;          // ?????????
 
     g_free (path);
     gnome_vfs_uri_unref (uri);
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index d0e085a..2377c1c 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -168,7 +168,7 @@ static void init (GnomeCmdCon *con)
     con->alias = NULL;
     con->uri = NULL;
     con->method = CON_URI;
-    con->gnome_auth = FALSE;
+    con->auth = FALSE;
 
     con->base_path = NULL;
     con->base_info = NULL;
@@ -539,7 +539,7 @@ XML::xstream &operator << (XML::xstream &xml, GnomeCmdCon &con)
 
     xml << XML::attr("name") << XML::escape(con.alias);
     xml << XML::attr("uri") << XML::escape(con.uri);
-    xml << XML::attr("auth") << con.gnome_auth;
+    xml << XML::attr("auth") << con.auth;
 
     return xml << XML::endtag();
 }
diff --git a/src/gnome-cmd-con.h b/src/gnome-cmd-con.h
index b49b4b1..03e505c 100644
--- a/src/gnome-cmd-con.h
+++ b/src/gnome-cmd-con.h
@@ -82,7 +82,7 @@ struct GnomeCmdCon
     gchar               *alias;                 // coded as UTF-8
     gchar               *uri;
     ConnectionMethodID  method;
-    gboolean            gnome_auth;
+    gboolean            auth;
 
     gchar               *open_msg;
     GnomeCmdPath        *base_path;



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