[gnome-commander/gcmd-1-3] Make sure that DEBUG() will be executed even when g_return_* macro is triggered



commit 9b70dc982a4476b8125ab2fcaf54990906348555
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Wed Jul 15 00:13:45 2009 +0200

    Make sure that DEBUG() will be executed even when g_return_* macro is triggered

 src/gnome-cmd-file-selector.cc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index d6e87db..62f93ab 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -1418,11 +1418,12 @@ void GnomeCmdFileSelector::set_active(gboolean value)
 
 static void on_con_open_cancel (GtkButton *button, GnomeCmdFileSelector *fs)
 {
+    DEBUG('m', "on_con_open_cancel\n");
+
     g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
     g_return_if_fail (fs->priv->con_opening != NULL);
     g_return_if_fail (fs->priv->con_opening->state == CON_STATE_OPENING);
 
-    DEBUG('m', "on_con_open_cancel\n");
     gnome_cmd_con_cancel_open (fs->priv->con_opening);
 
     gtk_widget_destroy (fs->priv->con_open_dialog);
@@ -1446,12 +1447,13 @@ static gboolean update_con_open_progress (GnomeCmdFileSelector *fs)
 
 static void on_con_open_done (GnomeCmdCon *con, GnomeCmdFileSelector *fs)
 {
+    DEBUG('m', "on_con_open_done\n");
+
     g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
     g_return_if_fail (fs->priv->con_opening != NULL);
     g_return_if_fail (fs->priv->con_opening == con);
     g_return_if_fail (fs->priv->con_open_dialog != NULL);
 
-    DEBUG('m', "on_con_open_done\n");
     gtk_signal_disconnect_by_data (GTK_OBJECT (con), fs);
 
     set_connection (fs, con);
@@ -1464,12 +1466,13 @@ static void on_con_open_done (GnomeCmdCon *con, GnomeCmdFileSelector *fs)
 
 static void on_con_open_failed (GnomeCmdCon *con, const gchar *msg, GnomeVFSResult result, GnomeCmdFileSelector *fs)
 {
+    DEBUG('m', "on_con_open_failed\n");
+
     g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
     g_return_if_fail (fs->priv->con_opening != NULL);
     g_return_if_fail (fs->priv->con_opening == con);
     g_return_if_fail (fs->priv->con_open_dialog != NULL);
 
-    DEBUG('m', "on_con_open_failed\n");
     gtk_signal_disconnect_by_data (GTK_OBJECT (con), fs);
 
     if (msg)



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