[gnome-commander] Moved ConOpenResult enum -> GnomeCmdCon::OpenResult

[Piotr Eljasiak <epiotr src gnome org>]

commit ff05650e1d1eefb498725b129ce58e818e345f96
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Tue Nov 16 20:49:40 2010 +0100

    Moved ConOpenResult enum -> GnomeCmdCon::OpenResult

 src/gnome-cmd-con-device.cc |    8 ++++----
 src/gnome-cmd-con-ftp.cc    |    8 ++++----
 src/gnome-cmd-con-smb.cc    |   10 +++++-----
 src/gnome-cmd-con.cc        |   14 +++++++-------
 src/gnome-cmd-con.h         |   20 ++++++++++----------
 5 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/src/gnome-cmd-con-device.cc b/src/gnome-cmd-con-device.cc
index b987799..d785ea6 100644
--- a/src/gnome-cmd-con-device.cc
+++ b/src/gnome-cmd-con-device.cc
@@ -136,7 +136,7 @@ static void do_mount_thread_func (GnomeCmdCon *con)
 
         if (emsg != NULL)
         {
-            con->open_result = CON_OPEN_FAILED;
+            con->open_result = GnomeCmdCon::OPEN_FAILED;
             con->state = GnomeCmdCon::STATE_CLOSED;
             con->open_failed_msg = emsg;
             return;
@@ -159,14 +159,14 @@ static void do_mount_thread_func (GnomeCmdCon *con)
     if (result == GNOME_VFS_OK)
     {
         con->state = GnomeCmdCon::STATE_OPEN;
-        con->open_result = CON_OPEN_OK;
+        con->open_result = GnomeCmdCon::OPEN_OK;
     }
     else
     {
         gnome_vfs_file_info_unref (con->base_info);
         con->base_info = NULL;
         con->open_failed_reason = result;
-        con->open_result = CON_OPEN_FAILED;
+        con->open_result = GnomeCmdCon::OPEN_FAILED;
         con->state = GnomeCmdCon::STATE_CLOSED;
     }
 }
@@ -185,7 +185,7 @@ static void dev_open (GnomeCmdCon *con)
     }
 
     con->state = GnomeCmdCon::STATE_OPENING;
-    con->open_result = CON_OPEN_IN_PROGRESS;
+    con->open_result = GnomeCmdCon::OPEN_IN_PROGRESS;
 
     g_thread_create ((GThreadFunc) do_mount_thread_func, con, FALSE, NULL);
 }
diff --git a/src/gnome-cmd-con-ftp.cc b/src/gnome-cmd-con-ftp.cc
index 69f5bff..4fda50e 100644
--- a/src/gnome-cmd-con-ftp.cc
+++ b/src/gnome-cmd-con-ftp.cc
@@ -52,13 +52,13 @@ static void get_file_info_func (GnomeCmdCon *con)
         if (res == GNOME_VFS_OK)
         {
             con->state = GnomeCmdCon::STATE_OPEN;
-            con->open_result = CON_OPEN_OK;
+            con->open_result = GnomeCmdCon::OPEN_OK;
         }
         else
         {
             con->state = GnomeCmdCon::STATE_CLOSED;
             con->open_failed_reason = res;
-            con->open_result = CON_OPEN_FAILED;
+            con->open_result = GnomeCmdCon::OPEN_FAILED;
         }
     }
     else
@@ -88,7 +88,7 @@ static void ftp_open (GnomeCmdCon *con)
     }
 
     con->state = GnomeCmdCon::STATE_OPENING;
-    con->open_result = CON_OPEN_IN_PROGRESS;
+    con->open_result = GnomeCmdCon::OPEN_IN_PROGRESS;
 
     g_timeout_add (1, (GSourceFunc) start_get_file_info, con);
 }
@@ -100,7 +100,7 @@ static gboolean ftp_close (GnomeCmdCon *con)
     g_object_unref (con->base_path);
     con->base_path = NULL;
     con->state = GnomeCmdCon::STATE_CLOSED;
-    con->open_result = CON_OPEN_NOT_STARTED;
+    con->open_result = GnomeCmdCon::OPEN_NOT_STARTED;
 
     return TRUE;
 }
diff --git a/src/gnome-cmd-con-smb.cc b/src/gnome-cmd-con-smb.cc
index 165c36e..191bbb8 100644
--- a/src/gnome-cmd-con-smb.cc
+++ b/src/gnome-cmd-con-smb.cc
@@ -51,19 +51,19 @@ get_file_info_callback (GnomeVFSAsyncHandle *handle,
             gnome_vfs_file_info_ref (r->file_info);
             con->state = GnomeCmdCon::STATE_OPEN;
             con->base_info = r->file_info;
-            con->open_result = CON_OPEN_OK;
+            con->open_result = GnomeCmdCon::OPEN_OK;
         }
         else if (r)
         {
             con->state = GnomeCmdCon::STATE_CLOSED;
-            con->open_result = CON_OPEN_FAILED;
+            con->open_result = GnomeCmdCon::OPEN_FAILED;
             con->open_failed_reason = r->result;
         }
         else
         {
             g_warning ("No result at all");
             con->state = GnomeCmdCon::STATE_CLOSED;
-            con->open_result = CON_OPEN_FAILED;
+            con->open_result = GnomeCmdCon::OPEN_FAILED;
         }
     }
     else
@@ -90,7 +90,7 @@ static void smb_open (GnomeCmdCon *con)
     {
         DEBUG('m', "gnome_cmd_con_create_uri returned NULL\n");
         con->state = GnomeCmdCon::STATE_CLOSED;
-        con->open_result = CON_OPEN_FAILED;
+        con->open_result = GnomeCmdCon::OPEN_FAILED;
         con->open_failed_msg = g_strdup (_("Failed to browse the network. Is the SMB module installed?"));
         return;
     }
@@ -99,7 +99,7 @@ static void smb_open (GnomeCmdCon *con)
     GList *uri_list = g_list_append (NULL, uri);
 
     con->state = GnomeCmdCon::STATE_OPENING;
-    con->open_result = CON_OPEN_IN_PROGRESS;
+    con->open_result = GnomeCmdCon::OPEN_IN_PROGRESS;
 
     GnomeVFSAsyncHandle *handle;
     GnomeVFSFileInfoOptions infoOpts = (GnomeVFSFileInfoOptions) (GNOME_VFS_FILE_INFO_FOLLOW_LINKS |
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index 1e3714c..3007255 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -195,7 +195,7 @@ static void init (GnomeCmdCon *con)
     con->close_pixmap = NULL;
 
     con->state = GnomeCmdCon::STATE_CLOSED;
-    con->open_result = CON_OPEN_NOT_STARTED;
+    con->open_result = GnomeCmdCon::OPEN_NOT_STARTED;
     con->open_failed_reason = GNOME_VFS_OK;
     con->open_failed_msg = NULL;
 
@@ -243,11 +243,11 @@ GtkType gnome_cmd_con_get_type ()
 static gboolean check_con_open_progress (GnomeCmdCon *con)
 {
     g_return_val_if_fail (GNOME_CMD_IS_CON (con), FALSE);
-    g_return_val_if_fail (con->open_result != CON_OPEN_NOT_STARTED, FALSE);
+    g_return_val_if_fail (con->open_result != GnomeCmdCon::OPEN_NOT_STARTED, FALSE);
 
-    if (con->open_result == CON_OPEN_OK)
+    if (con->open_result == GnomeCmdCon::OPEN_OK)
     {
-        DEBUG('m', "CON_OPEN_OK detected\n");
+        DEBUG('m', "GnomeCmdCon::OPEN_OK detected\n");
 
         GnomeCmdDir *dir = gnome_cmd_dir_new_with_con (con->base_info, con->base_path, con);
 
@@ -256,14 +256,14 @@ static gboolean check_con_open_progress (GnomeCmdCon *con)
         DEBUG ('m', "Emitting 'open-done' signal\n");
         gtk_signal_emit (GTK_OBJECT (con), signals[OPEN_DONE]);
     }
-    else if (con->open_result == CON_OPEN_FAILED)
+    else if (con->open_result == GnomeCmdCon::OPEN_FAILED)
     {
-        DEBUG ('m', "CON_OPEN_FAILED detected\n");
+        DEBUG ('m', "GnomeCmdCon::OPEN_FAILED detected\n");
         DEBUG ('m', "Emitting 'open-failed' signal\n");
         gtk_signal_emit (GTK_OBJECT (con), signals[OPEN_FAILED], con->open_failed_msg, con->open_failed_reason);
     }
 
-    return con->open_result == CON_OPEN_IN_PROGRESS;
+    return con->open_result == GnomeCmdCon::OPEN_IN_PROGRESS;
 }
 
 
diff --git a/src/gnome-cmd-con.h b/src/gnome-cmd-con.h
index 2185ff1..d854bb9 100644
--- a/src/gnome-cmd-con.h
+++ b/src/gnome-cmd-con.h
@@ -40,15 +40,6 @@ struct GnomeCmdConPrivate;
 #include "history.h"
 #include "utils.h"
 
-enum ConOpenResult
-{
-    CON_OPEN_OK,
-    CON_OPEN_FAILED,
-    CON_OPEN_CANCELLED,
-    CON_OPEN_IN_PROGRESS,
-    CON_OPEN_NOT_STARTED
-};
-
 enum ConnectionMethodID        // Keep this order in sync with strings in gnome-cmd-con-dialog.cc and gnome-cmd-con.cc
 {
     CON_SSH,
@@ -74,6 +65,15 @@ struct GnomeCmdCon
         STATE_CANCELLING
     };
 
+    enum OpenResult
+    {
+        OPEN_OK,
+        OPEN_FAILED,
+        OPEN_CANCELLED,
+        OPEN_IN_PROGRESS,
+        OPEN_NOT_STARTED
+    };
+
     gchar               *alias;                 // coded as UTF-8
     gchar               *uri;
     ConnectionMethodID  method;
@@ -99,7 +99,7 @@ struct GnomeCmdCon
     gchar               *close_tooltip;
     GnomeCmdPixmap      *close_pixmap;
 
-    ConOpenResult    open_result;
+    OpenResult       open_result;
     GnomeVFSResult   open_failed_reason;
     gchar            *open_failed_msg;