[gnome-commander/gcmd-1-3] noop: code cleanup

[Piotr Eljasiak <epiotr src gnome org>]

commit 2a44c6b806a5cd77194fbe1bd27791d82c02464e
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Mon Jul 27 18:32:53 2009 +0200

    noop: code cleanup

 src/gnome-cmd-con.cc           |    4 ++--
 src/gnome-cmd-dir.cc           |    4 ++--
 src/gnome-cmd-file-list.cc     |   23 +++++++++++------------
 src/gnome-cmd-file-selector.cc |   25 ++++++++++++-------------
 4 files changed, 27 insertions(+), 29 deletions(-)
---
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index a1bd6c2..a18c128 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -253,13 +253,13 @@ static gboolean check_con_open_progress (GnomeCmdCon *con)
 
         gnome_cmd_con_set_default_dir (con, dir);
 
-        DEBUG ('m', "Emitting open_done signal\n");
+        DEBUG ('m', "Emitting 'open-done' signal\n");
         gtk_signal_emit (GTK_OBJECT (con), signals[OPEN_DONE]);
     }
     else if (con->open_result == CON_OPEN_FAILED)
     {
         DEBUG ('m', "CON_OPEN_FAILED detected\n");
-        DEBUG ('m', "Emitting open_failed signal\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);
     }
 
diff --git a/src/gnome-cmd-dir.cc b/src/gnome-cmd-dir.cc
index e6c93c3..6dd1666 100644
--- a/src/gnome-cmd-dir.cc
+++ b/src/gnome-cmd-dir.cc
@@ -486,7 +486,7 @@ static void on_list_done (GnomeCmdDir *dir, GList *infolist, GnomeVFSResult resu
         dir->priv->lock = FALSE;
         dir->priv->last_result = GNOME_VFS_OK;
 
-        DEBUG('l', "Emitting list_ok signal\n");
+        DEBUG('l', "Emitting 'list-ok' signal\n");
         gtk_signal_emit (GTK_OBJECT (dir), dir_signals[LIST_OK], dir->priv->files);
     }
     else if (dir->state == DIR_STATE_EMPTY)
@@ -502,7 +502,7 @@ static void on_list_done (GnomeCmdDir *dir, GList *infolist, GnomeVFSResult resu
         dir->priv->last_result = result;
         dir->priv->lock = FALSE;
 
-        DEBUG('l', "Emitting list_failed signal\n");
+        DEBUG('l', "Emitting 'list-failed' signal\n");
         gtk_signal_emit (GTK_OBJECT (dir), dir_signals[LIST_FAILED], result);
     }
 }
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 8a516af..8aad67f 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -1113,8 +1113,6 @@ static gboolean on_button_press (GtkCList *clist, GdkEventButton *event, GnomeCm
 
 inline gboolean mime_exec_file (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (GNOME_CMD_IS_FILE (f), FALSE);
-
     if (f->info->type == GNOME_VFS_FILE_TYPE_REGULAR)
     {
         mime_exec_single (f);
@@ -1128,7 +1126,7 @@ inline gboolean mime_exec_file (GnomeCmdFile *f)
 static void on_file_clicked (GnomeCmdFileList *fl, GnomeCmdFile *f, GdkEventButton *event, gpointer data)
 {
     g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl));
-    g_return_if_fail (f != NULL);
+    g_return_if_fail (GNOME_CMD_IS_FILE (f));
     g_return_if_fail (event != NULL);
 
     fl->modifier_click = event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK);
@@ -1196,7 +1194,7 @@ static void on_file_clicked (GnomeCmdFileList *fl, GnomeCmdFile *f, GdkEventButt
 static void on_file_released (GnomeCmdFileList *fl, GnomeCmdFile *f, GdkEventButton *event, gpointer data)
 {
     g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl));
-    g_return_if_fail (f != NULL);
+    g_return_if_fail (GNOME_CMD_IS_FILE (f));
     g_return_if_fail (event != NULL);
 
     if (event->type == GDK_BUTTON_RELEASE && event->button == 1 && !fl->modifier_click && gnome_cmd_data.left_mouse_button_mode == GnomeCmdData::LEFT_BUTTON_OPENS_WITH_SINGLE_CLICK)
@@ -1638,7 +1636,7 @@ gboolean GnomeCmdFileList::remove_file(GnomeCmdFile *f)
     if (row<0)                              // f not found in the shown file list...
         return FALSE;
 
-    gtk_clist_remove (GTK_CLIST (this), row);
+    gtk_clist_remove (*this, row);
 
     priv->selected_files = g_list_remove (priv->selected_files, f);
     priv->visible_files.remove(f);
@@ -1659,7 +1657,7 @@ gboolean GnomeCmdFileList::remove_file(const gchar *uri_str)
 
 void GnomeCmdFileList::clear()
 {
-    gtk_clist_clear (GTK_CLIST (this));
+    gtk_clist_clear (*this);
     priv->visible_files.clear();
     gnome_cmd_file_list_free (priv->selected_files);
     priv->selected_files = NULL;
@@ -1849,7 +1847,8 @@ static gint compare_filename (GnomeCmdFile *f1, GnomeCmdFile *f2)
 
 void gnome_cmd_file_list_compare_directories (GnomeCmdFileList *fl1, GnomeCmdFileList *fl2)
 {
-    g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl1) || GNOME_CMD_IS_FILE_LIST (fl2));
+    g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl1));
+    g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl2));
 
     fl1->unselect_all();
     fl2->select_all();
@@ -1908,7 +1907,7 @@ void GnomeCmdFileList::sort()
     {
         gint selrow = get_row_from_file(selfile);
         select_row(selrow);
-        gtk_clist_moveto (GTK_CLIST (this), selrow, -1, 1, 0);
+        gtk_clist_moveto (*this, selrow, -1, 1, 0);
     }
 
     // reselect the previously selected files
@@ -2169,19 +2168,19 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event)
                 return TRUE;
 
             case GDK_F3:
-                on_column_clicked (GTK_CLIST (this), GnomeCmdFileList::COLUMN_NAME, this);
+                on_column_clicked (*this, GnomeCmdFileList::COLUMN_NAME, this);
                 return TRUE;
 
             case GDK_F4:
-                on_column_clicked (GTK_CLIST (this), GnomeCmdFileList::COLUMN_EXT, this);
+                on_column_clicked (*this, GnomeCmdFileList::COLUMN_EXT, this);
                 return TRUE;
 
             case GDK_F5:
-                on_column_clicked (GTK_CLIST (this), GnomeCmdFileList::COLUMN_DATE, this);
+                on_column_clicked (*this, GnomeCmdFileList::COLUMN_DATE, this);
                 return TRUE;
 
             case GDK_F6:
-                on_column_clicked (GTK_CLIST (this), GnomeCmdFileList::COLUMN_SIZE, this);
+                on_column_clicked (*this, GnomeCmdFileList::COLUMN_SIZE, this);
                 return TRUE;
         }
     }
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index 59d3fc8..c62f1a5 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -938,15 +938,6 @@ static void on_list_empty_space_clicked (GnomeCmdFileList *fl, GdkEventButton *e
 }
 
 
-static void on_list_files_changed (GnomeCmdFileList *fl, GnomeCmdFileSelector *fs)
-{
-    g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
-
-    if (fs->file_list()==fl)
-        fs->update_selected_files_label();
-}
-
-
 static void on_list_con_changed (GnomeCmdFileList *fl, GnomeCmdCon *con, GnomeCmdFileSelector *fs)
 {
     fs->priv->dir_history = gnome_cmd_con_get_dir_history (con);
@@ -988,6 +979,15 @@ static void on_list_dir_changed (GnomeCmdFileList *fl, GnomeCmdDir *dir, GnomeCm
 }
 
 
+static void on_list_files_changed (GnomeCmdFileList *fl, GnomeCmdFileSelector *fs)
+{
+    g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
+
+    if (fs->file_list()==fl)
+        fs->update_selected_files_label();
+}
+
+
 static void on_dir_list_ok (GnomeCmdDir *dir, GList *files, GnomeCmdFileSelector *fs)
 {
     DEBUG('l', "on_dir_list_ok\n");
@@ -1106,9 +1106,9 @@ static gboolean on_list_key_pressed_private (GtkCList *clist, GdkEventKey *event
 {
     if (state_is_blank (event->state) || state_is_shift (event->state))
     {
-        if ((event->keyval >= GDK_A && event->keyval <= GDK_Z) ||
-            (event->keyval >= GDK_a && event->keyval <= GDK_z) ||
-            event->keyval == GDK_period)
+        if (event->keyval>=GDK_A && event->keyval<=GDK_Z ||
+            event->keyval>=GDK_a && event->keyval<=GDK_z ||
+            event->keyval==GDK_period)
         {
             static gchar text[2];
 
@@ -1117,7 +1117,6 @@ static gboolean on_list_key_pressed_private (GtkCList *clist, GdkEventKey *event
             else
             {
                 text[0] = event->keyval;
-                text[1] = '\0';
                 gnome_cmd_cmdline_append_text (gnome_cmd_main_win_get_cmdline (main_win), text);
                 gnome_cmd_cmdline_focus (gnome_cmd_main_win_get_cmdline (main_win));
             }