[gnome-commander/gcmd-1-3] gnome_cmd_main_win_switch_fs() -> GnomeCmdMainWin::switch_fs()

[Piotr Eljasiak <epiotr src gnome org>]

commit 3bb4eb943709334cde2bfe84f407d9c0f14e01da
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Tue Jul 28 22:42:30 2009 +0200

    gnome_cmd_main_win_switch_fs() -> GnomeCmdMainWin::switch_fs()

 src/gnome-cmd-dir-indicator.cc |    6 +++---
 src/gnome-cmd-file-selector.cc |    6 +++---
 src/gnome-cmd-main-win.cc      |   11 +++++------
 src/gnome-cmd-main-win.h       |    4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/src/gnome-cmd-dir-indicator.cc b/src/gnome-cmd-dir-indicator.cc
index 0368ba6..9db3ca7 100644
--- a/src/gnome-cmd-dir-indicator.cc
+++ b/src/gnome-cmd-dir-indicator.cc
@@ -99,7 +99,7 @@ static gboolean on_dir_indicator_clicked (GnomeCmdDirIndicator *indicator, GdkEv
             {
                 strncpy (chTo, labelText, indicator->priv->slashCharPosition[i]);
                 chTo[indicator->priv->slashCharPosition[i]] = 0x0;
-                gnome_cmd_main_win_switch_fs (main_win, fs);
+                main_win->switch_fs(fs);
                 fs->goto_directory(chTo);
                 g_free (chTo);
                 return TRUE;
@@ -275,7 +275,7 @@ static void on_dir_history_item_selected (GtkMenuItem *item, const gchar *path)
 
     g_return_if_fail (GNOME_CMD_IS_DIR_INDICATOR (indicator));
 
-    gnome_cmd_main_win_switch_fs (main_win, indicator->priv->fs);
+    main_win->switch_fs(indicator->priv->fs);
     indicator->priv->fs->goto_directory(path);
 }
 
@@ -288,7 +288,7 @@ static void on_bookmark_item_selected (GtkMenuItem *item, GnomeCmdBookmark *bm)
 
     g_return_if_fail (GNOME_CMD_IS_DIR_INDICATOR (indicator));
 
-    gnome_cmd_main_win_switch_fs (main_win, indicator->priv->fs);
+    main_win->switch_fs(indicator->priv->fs);
     indicator->priv->fs->goto_directory(bm->path);
 }
 
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index c94d80c..4ae47a7 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -798,7 +798,7 @@ static void on_con_combo_item_selected (GnomeCmdCombo *con_combo, GnomeCmdCon *c
     g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
     g_return_if_fail (GNOME_CMD_IS_CON (con));
 
-    gnome_cmd_main_win_switch_fs (main_win, fs);
+    main_win->switch_fs(fs);
     fs->set_connection(con);
 }
 
@@ -817,7 +817,7 @@ static void on_con_btn_clicked (GtkButton *button, GnomeCmdFileSelector *fs)
 
     g_return_if_fail (GNOME_CMD_IS_CON (con));
 
-    gnome_cmd_main_win_switch_fs (main_win, fs);
+    main_win->switch_fs(fs);
     fs->set_connection(con);
 }
 
@@ -920,7 +920,7 @@ static void on_list_list_clicked (GnomeCmdFileList *fl, GdkEventButton *event, G
         {
             case 1:
             case 3:
-                gnome_cmd_main_win_switch_fs (main_win, fs);
+                main_win->switch_fs(fs);
                 break;
 
             case 2:
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index eccb006..800c4d5 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -1157,7 +1157,7 @@ gboolean GnomeCmdMainWin::key_pressed(GdkEventKey *event)
             case GDK_1:
                 {
                     GnomeCmdFileSelector *fs = this->fs(LEFT);
-                    gnome_cmd_main_win_switch_fs (this, fs);
+                    switch_fs(fs);
                     gnome_cmd_combo_popup_list (GNOME_CMD_COMBO (fs->con_combo));
                 }
                 return TRUE;
@@ -1165,7 +1165,7 @@ gboolean GnomeCmdMainWin::key_pressed(GdkEventKey *event)
             case GDK_2:
                 {
                     GnomeCmdFileSelector *fs = this->fs(RIGHT);
-                    gnome_cmd_main_win_switch_fs (this, fs);
+                    switch_fs(fs);
                     gnome_cmd_combo_popup_list (GNOME_CMD_COMBO (fs->con_combo));
                 }
                 return TRUE;
@@ -1246,7 +1246,7 @@ gboolean GnomeCmdMainWin::key_pressed(GdkEventKey *event)
                 case GDK_Tab:
                     // hack to avoid the default handling of the tab-key
                     clear_event_key (event);
-                    gnome_cmd_main_win_switch_fs (this, fs(INACTIVE));
+                    switch_fs(fs(INACTIVE));
                     return TRUE;
 
                 case GDK_F1:
@@ -1297,12 +1297,11 @@ gboolean GnomeCmdMainWin::key_pressed(GdkEventKey *event)
 }
 
 
-void gnome_cmd_main_win_switch_fs (GnomeCmdMainWin *mw, GnomeCmdFileSelector *fs)
+void GnomeCmdMainWin::switch_fs(GnomeCmdFileSelector *fs)
 {
-    g_return_if_fail (GNOME_CMD_IS_MAIN_WIN (mw));
     g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
 
-    gtk_signal_emit (*mw, signals[SWITCH_FS], fs);
+    gtk_signal_emit (*this, signals[SWITCH_FS], fs);
 }
 
 
diff --git a/src/gnome-cmd-main-win.h b/src/gnome-cmd-main-win.h
index 041d73a..3fc8237 100644
--- a/src/gnome-cmd-main-win.h
+++ b/src/gnome-cmd-main-win.h
@@ -53,6 +53,8 @@ struct GnomeCmdMainWin
 
     gboolean key_pressed (GdkEventKey *event);
 
+    void switch_fs(GnomeCmdFileSelector *fs);
+
     void set_equal_panes();
     GnomeCmdState *get_state();
     void set_cap_state(gboolean state);
@@ -64,8 +66,6 @@ extern GnomeCmdMainWin *main_win;
 
 GtkWidget *gnome_cmd_main_win_new ();
 
-void gnome_cmd_main_win_switch_fs (GnomeCmdMainWin *mw, GnomeCmdFileSelector *fs);
-
 GnomeCmdCmdline *gnome_cmd_main_win_get_cmdline (GnomeCmdMainWin *mw);
 VteTerminal *gnome_cmd_main_win_get_terminal (GnomeCmdMainWin *mw);