[gnome-commander] Handle con->open_result in switch, not in sequential if-else



commit 15c0b71322947fc0978f88cb2c8159d44ac8ed74
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Wed Feb 2 19:17:58 2011 +0100

    Handle con->open_result in switch, not in sequential if-else

 src/gnome-cmd-con.cc |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index 654a717..ba75eb8 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -245,25 +245,35 @@ 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 != GnomeCmdCon::OPEN_NOT_STARTED, FALSE);
 
-    if (con->open_result == GnomeCmdCon::OPEN_OK)
+    switch (con->open_result)
     {
-        DEBUG('m', "GnomeCmdCon::OPEN_OK detected\n");
+        case GnomeCmdCon::OPEN_IN_PROGRESS:
+            return TRUE;
 
-        GnomeCmdDir *dir = gnome_cmd_dir_new_with_con (con->base_info, con->base_path, con);
+        case GnomeCmdCon::OPEN_OK:
+            {
+                DEBUG('m', "GnomeCmdCon::OPEN_OK detected\n");
 
-        gnome_cmd_con_set_default_dir (con, dir);
+                GnomeCmdDir *dir = gnome_cmd_dir_new_with_con (con->base_info, con->base_path, con);
 
-        DEBUG ('m', "Emitting 'open-done' signal\n");
-        gtk_signal_emit (GTK_OBJECT (con), signals[OPEN_DONE]);
-    }
-    else if (con->open_result == GnomeCmdCon::OPEN_FAILED)
-    {
-        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);
-    }
+                gnome_cmd_con_set_default_dir (con, dir);
 
-    return con->open_result == GnomeCmdCon::OPEN_IN_PROGRESS;
+                DEBUG ('m', "Emitting 'open-done' signal\n");
+                gtk_signal_emit (GTK_OBJECT (con), signals[OPEN_DONE]);
+            }
+            return FALSE;
+
+        case GnomeCmdCon::OPEN_FAILED:
+            {
+                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 FALSE;
+
+        default:
+            return FALSE;
+    }
 }
 
 



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