[gnome-commander] Moved ConState enum -> GnomeCmdCon::State

[Piotr Eljasiak <epiotr src gnome org>]

commit 80d1b3963ba1afd51a42095adc03dd34e366bbe2
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Tue Nov 16 20:43:55 2010 +0100

    Moved ConState enum -> GnomeCmdCon::State

 src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc |    2 +-
 src/gnome-cmd-con-device.cc                      |   10 +++++-----
 src/gnome-cmd-con-ftp.cc                         |   14 +++++++-------
 src/gnome-cmd-con-home.cc                        |    2 +-
 src/gnome-cmd-con-smb.cc                         |   18 +++++++++---------
 src/gnome-cmd-con.cc                             |    6 +++---
 src/gnome-cmd-con.h                              |   20 ++++++++++----------
 src/gnome-cmd-file-list.cc                       |    2 +-
 8 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc b/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
index c98b0c6..eb7908c 100644
--- a/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
+++ b/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
@@ -498,7 +498,7 @@ void gnome_cmd_bookmark_goto (GnomeCmdBookmark *bookmark)
     {
         GnomeCmdCon *con = bookmark->group->con;
 
-        if (con->state == CON_STATE_OPEN)
+        if (con->state == GnomeCmdCon::STATE_OPEN)
         {
             GnomeCmdDir *dir = gnome_cmd_dir_new (con, gnome_cmd_con_create_path (con, bookmark->path));
             fs->set_connection(con, dir);
diff --git a/src/gnome-cmd-con-device.cc b/src/gnome-cmd-con-device.cc
index 7be4a99..b987799 100644
--- a/src/gnome-cmd-con-device.cc
+++ b/src/gnome-cmd-con-device.cc
@@ -137,7 +137,7 @@ static void do_mount_thread_func (GnomeCmdCon *con)
         if (emsg != NULL)
         {
             con->open_result = CON_OPEN_FAILED;
-            con->state = CON_STATE_CLOSED;
+            con->state = GnomeCmdCon::STATE_CLOSED;
             con->open_failed_msg = emsg;
             return;
         }
@@ -158,7 +158,7 @@ static void do_mount_thread_func (GnomeCmdCon *con)
 
     if (result == GNOME_VFS_OK)
     {
-        con->state = CON_STATE_OPEN;
+        con->state = GnomeCmdCon::STATE_OPEN;
         con->open_result = CON_OPEN_OK;
     }
     else
@@ -167,7 +167,7 @@ static void do_mount_thread_func (GnomeCmdCon *con)
         con->base_info = NULL;
         con->open_failed_reason = result;
         con->open_result = CON_OPEN_FAILED;
-        con->state = CON_STATE_CLOSED;
+        con->state = GnomeCmdCon::STATE_CLOSED;
     }
 }
 
@@ -184,7 +184,7 @@ static void dev_open (GnomeCmdCon *con)
         gtk_object_ref (GTK_OBJECT (con->base_path));
     }
 
-    con->state = CON_STATE_OPENING;
+    con->state = GnomeCmdCon::STATE_OPENING;
     con->open_result = CON_OPEN_IN_PROGRESS;
 
     g_thread_create ((GThreadFunc) do_mount_thread_func, con, FALSE, NULL);
@@ -256,7 +256,7 @@ static gboolean dev_close (GnomeCmdCon *con)
     }
 
     if (ret == 0)
-        con->state = CON_STATE_CLOSED;
+        con->state = GnomeCmdCon::STATE_CLOSED;
 
     return ret == 0;
 }
diff --git a/src/gnome-cmd-con-ftp.cc b/src/gnome-cmd-con-ftp.cc
index 929753d..69f5bff 100644
--- a/src/gnome-cmd-con-ftp.cc
+++ b/src/gnome-cmd-con-ftp.cc
@@ -46,23 +46,23 @@ static void get_file_info_func (GnomeCmdCon *con)
 
     gnome_vfs_uri_unref (uri);
 
-    if (con->state == CON_STATE_OPENING)
+    if (con->state == GnomeCmdCon::STATE_OPENING)
     {
         DEBUG('m', "State was OPENING, setting flags\n");
         if (res == GNOME_VFS_OK)
         {
-            con->state = CON_STATE_OPEN;
+            con->state = GnomeCmdCon::STATE_OPEN;
             con->open_result = CON_OPEN_OK;
         }
         else
         {
-            con->state = CON_STATE_CLOSED;
+            con->state = GnomeCmdCon::STATE_CLOSED;
             con->open_failed_reason = res;
             con->open_result = CON_OPEN_FAILED;
         }
     }
     else
-        if (con->state == CON_STATE_CANCELLING)
+        if (con->state == GnomeCmdCon::STATE_CANCELLING)
             DEBUG('m', "The open operation was cancelled, doing nothing\n");
         else
             DEBUG('m', "Strange ConState %d\n", con->state);
@@ -87,7 +87,7 @@ static void ftp_open (GnomeCmdCon *con)
         gtk_object_ref (GTK_OBJECT (con->base_path));
     }
 
-    con->state = CON_STATE_OPENING;
+    con->state = GnomeCmdCon::STATE_OPENING;
     con->open_result = CON_OPEN_IN_PROGRESS;
 
     g_timeout_add (1, (GSourceFunc) start_get_file_info, con);
@@ -99,7 +99,7 @@ static gboolean ftp_close (GnomeCmdCon *con)
     gnome_cmd_con_set_default_dir (con, NULL);
     g_object_unref (con->base_path);
     con->base_path = NULL;
-    con->state = CON_STATE_CLOSED;
+    con->state = GnomeCmdCon::STATE_CLOSED;
     con->open_result = CON_OPEN_NOT_STARTED;
 
     return TRUE;
@@ -109,7 +109,7 @@ static gboolean ftp_close (GnomeCmdCon *con)
 static void ftp_cancel_open (GnomeCmdCon *con)
 {
     DEBUG('m', "Setting state CANCELLING\n");
-    con->state = CON_STATE_CANCELLING;
+    con->state = GnomeCmdCon::STATE_CANCELLING;
 }
 
 
diff --git a/src/gnome-cmd-con-home.cc b/src/gnome-cmd-con-home.cc
index 51ce38b..036f5ad 100644
--- a/src/gnome-cmd-con-home.cc
+++ b/src/gnome-cmd-con-home.cc
@@ -109,7 +109,7 @@ static void init (GnomeCmdConHome *home_con)
 
     GnomeCmdCon *con = GNOME_CMD_CON (home_con);
 
-    con->state = CON_STATE_OPEN;
+    con->state = GnomeCmdCon::STATE_OPEN;
     con->alias = g_strdup (_("Home"));
     con->method = CON_LOCAL;
     con->open_msg = g_strdup ("This should not be visible anywhere");
diff --git a/src/gnome-cmd-con-smb.cc b/src/gnome-cmd-con-smb.cc
index 4d9f1ea..165c36e 100644
--- a/src/gnome-cmd-con-smb.cc
+++ b/src/gnome-cmd-con-smb.cc
@@ -42,37 +42,37 @@ get_file_info_callback (GnomeVFSAsyncHandle *handle,
 
     GnomeCmdConSmb *smb_con = GNOME_CMD_CON_SMB (con);
 
-    if (con->state == CON_STATE_OPENING)
+    if (con->state == GnomeCmdCon::STATE_OPENING)
     {
         GnomeVFSGetFileInfoResult *r = (GnomeVFSGetFileInfoResult *) results->data;
 
         if (r && r->result == GNOME_VFS_OK)
         {
             gnome_vfs_file_info_ref (r->file_info);
-            con->state = CON_STATE_OPEN;
+            con->state = GnomeCmdCon::STATE_OPEN;
             con->base_info = r->file_info;
             con->open_result = CON_OPEN_OK;
         }
         else if (r)
         {
-            con->state = CON_STATE_CLOSED;
+            con->state = GnomeCmdCon::STATE_CLOSED;
             con->open_result = CON_OPEN_FAILED;
             con->open_failed_reason = r->result;
         }
         else
         {
             g_warning ("No result at all");
-            con->state = CON_STATE_CLOSED;
+            con->state = GnomeCmdCon::STATE_CLOSED;
             con->open_result = CON_OPEN_FAILED;
         }
     }
     else
     {
-        if (con->state == CON_STATE_CANCELLING)
+        if (con->state == GnomeCmdCon::STATE_CANCELLING)
             DEBUG('m', "The open operation was cancelled, doing nothing\n");
         else
             DEBUG('m', "Strange ConState %d\n", con->state);
-        con->state = CON_STATE_CLOSED;
+        con->state = GnomeCmdCon::STATE_CLOSED;
     }
 }
 
@@ -89,7 +89,7 @@ static void smb_open (GnomeCmdCon *con)
     if (!uri)
     {
         DEBUG('m', "gnome_cmd_con_create_uri returned NULL\n");
-        con->state = CON_STATE_CLOSED;
+        con->state = GnomeCmdCon::STATE_CLOSED;
         con->open_result = CON_OPEN_FAILED;
         con->open_failed_msg = g_strdup (_("Failed to browse the network. Is the SMB module installed?"));
         return;
@@ -98,7 +98,7 @@ static void smb_open (GnomeCmdCon *con)
     DEBUG('l', "Connecting to %s\n", gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE));
     GList *uri_list = g_list_append (NULL, uri);
 
-    con->state = CON_STATE_OPENING;
+    con->state = GnomeCmdCon::STATE_OPENING;
     con->open_result = CON_OPEN_IN_PROGRESS;
 
     GnomeVFSAsyncHandle *handle;
@@ -124,7 +124,7 @@ static gboolean smb_close (GnomeCmdCon *con)
 
 static void smb_cancel_open (GnomeCmdCon *con)
 {
-    con->state = CON_STATE_CANCELLING;
+    con->state = GnomeCmdCon::STATE_CANCELLING;
 }
 
 
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index 9783eed..1e3714c 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -194,7 +194,7 @@ static void init (GnomeCmdCon *con)
     con->close_tooltip = NULL;
     con->close_pixmap = NULL;
 
-    con->state = CON_STATE_CLOSED;
+    con->state = GnomeCmdCon::STATE_CLOSED;
     con->open_result = CON_OPEN_NOT_STARTED;
     con->open_failed_reason = GNOME_VFS_OK;
     con->open_failed_msg = NULL;
@@ -274,7 +274,7 @@ void gnome_cmd_con_open (GnomeCmdCon *con)
 
     GnomeCmdConClass *klass = GNOME_CMD_CON_GET_CLASS (con);
 
-    if (con->state != CON_STATE_OPEN)
+    if (con->state != GnomeCmdCon::STATE_OPEN)
         klass->open (con);
 
     g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) check_con_open_progress, con);
@@ -285,7 +285,7 @@ void gnome_cmd_con_cancel_open (GnomeCmdCon *con)
 {
     g_return_if_fail (GNOME_CMD_IS_CON (con));
 
-    if (con->state == CON_STATE_OPENING)
+    if (con->state == GnomeCmdCon::STATE_OPENING)
     {
         GnomeCmdConClass *klass = GNOME_CMD_CON_GET_CLASS (con);
         klass->cancel_open (con);
diff --git a/src/gnome-cmd-con.h b/src/gnome-cmd-con.h
index 3fc086d..2185ff1 100644
--- a/src/gnome-cmd-con.h
+++ b/src/gnome-cmd-con.h
@@ -40,14 +40,6 @@ struct GnomeCmdConPrivate;
 #include "history.h"
 #include "utils.h"
 
-enum ConState
-{
-    CON_STATE_CLOSED,
-    CON_STATE_OPEN,
-    CON_STATE_OPENING,
-    CON_STATE_CANCELLING
-};
-
 enum ConOpenResult
 {
     CON_OPEN_OK,
@@ -74,6 +66,14 @@ struct GnomeCmdCon
 {
     GtkObject parent;
 
+    enum State
+    {
+        STATE_CLOSED,
+        STATE_OPEN,
+        STATE_OPENING,
+        STATE_CANCELLING
+    };
+
     gchar               *alias;                 // coded as UTF-8
     gchar               *uri;
     ConnectionMethodID  method;
@@ -86,7 +86,7 @@ struct GnomeCmdCon
     gboolean            needs_open_visprog;
     gboolean            needs_list_visprog;
     gboolean            can_show_free_space;
-    ConState            state;
+    State               state;
     gboolean            is_local;
     gboolean            is_closeable;
     gchar               *go_text;
@@ -133,7 +133,7 @@ void gnome_cmd_con_open (GnomeCmdCon *con);
 inline gboolean gnome_cmd_con_is_open (GnomeCmdCon *con)
 {
     g_return_val_if_fail (GNOME_CMD_IS_CON (con), FALSE);
-    return con->state == CON_STATE_OPEN;
+    return con->state == GnomeCmdCon::STATE_OPEN;
 }
 
 void gnome_cmd_con_cancel_open (GnomeCmdCon *con);
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index d99cfa4..aeb3302 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -1453,7 +1453,7 @@ static void on_con_open_cancel (GtkButton *button, GnomeCmdFileList *fl)
 
     g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl));
     g_return_if_fail (fl->priv->con_opening != NULL);
-    g_return_if_fail (fl->priv->con_opening->state == CON_STATE_OPENING);
+    g_return_if_fail (fl->priv->con_opening->state == GnomeCmdCon::STATE_OPENING);
 
     gnome_cmd_con_cancel_open (fl->priv->con_opening);