gnome-commander r1727 - in branches/gcmd-1-3: . src src/intviewer

[epiotr svn gnome org]

Author: epiotr
Date: Fri Apr 25 22:10:49 2008
New Revision: 1727
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1727&view=rev

Log:
Code cleanup

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/src/gnome-cmd-clist.cc
   branches/gcmd-1-3/src/gnome-cmd-file-list.cc
   branches/gcmd-1-3/src/intviewer/searcher.cc
   branches/gcmd-1-3/src/intviewer/viewer-window.cc
   branches/gcmd-1-3/src/main.cc

Modified: branches/gcmd-1-3/src/gnome-cmd-clist.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-clist.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-clist.cc	Fri Apr 25 22:10:49 2008
@@ -625,7 +625,7 @@
 
 GtkWidget *gnome_cmd_clist_new_with_titles (gint columns, gchar **titles)
 {
-    GnomeCmdCList *clist = (GnomeCmdCList *) g_object_new (gnome_cmd_clist_get_type(), "n_columns", columns, NULL);
+    GnomeCmdCList *clist = (GnomeCmdCList *) g_object_new (gnome_cmd_clist_get_type(), "n-columns", columns, NULL);
 
     for (gint i=0; i<columns; i++)
         gtk_clist_set_column_auto_resize (GTK_CLIST (clist), i, TRUE);

Modified: branches/gcmd-1-3/src/gnome-cmd-file-list.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-list.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-list.cc	Fri Apr 25 22:10:49 2008
@@ -641,7 +641,7 @@
     gtk_widget_ref (menu);
     gtk_object_set_data_full (GTK_OBJECT (fl), "file_popup_menu", menu, (GtkDestroyNotify)gtk_widget_unref);
 
-    gnome_popup_menu_do_popup (menu, (GtkMenuPositionFunc)popup_position_function, fl, event, fl, NULL);
+    gnome_popup_menu_do_popup (menu, (GtkMenuPositionFunc) popup_position_function, fl, event, fl, NULL);
 }
 
 
@@ -1292,7 +1292,7 @@
 
 GtkWidget *gnome_cmd_file_list_new ()
 {
-    GnomeCmdFileList *fl = (GnomeCmdFileList *) g_object_new (gnome_cmd_file_list_get_type(), "n_columns", FILE_LIST_NUM_COLUMNS, NULL);
+    GnomeCmdFileList *fl = (GnomeCmdFileList *) g_object_new (gnome_cmd_file_list_get_type(), "n-columns", FILE_LIST_NUM_COLUMNS, NULL);
 
     create_column_titles (fl);
 
@@ -1328,7 +1328,7 @@
 
 inline void format_file_for_display (GnomeCmdFile *finfo, FileFormatData &data, gboolean tree_size)
 {
-    // If the user wants a character insted of icon for filetype set it now
+    // If the user wants a character instead of icon for filetype set it now
     if (gnome_cmd_data_get_layout () == GNOME_CMD_LAYOUT_TEXT)
         data.text[FILE_LIST_COLUMN_ICON] = (gchar *) gnome_cmd_file_get_type_string (finfo);
     else
@@ -1885,7 +1885,7 @@
 }
 
 
-static gint compare_filename(GnomeCmdFile *f1, GnomeCmdFile *f2)
+static gint compare_filename (GnomeCmdFile *f1, GnomeCmdFile *f2)
 {
     return strcmp(f1->info->name, f2->info->name);
 }
@@ -1907,7 +1907,7 @@
     {
         GnomeCmdFile *f1 = (GnomeCmdFile *) i->data;
         GnomeCmdFile *f2;
-        GList *gl2 = g_list_find_custom (fl2->priv->selected_files, f1, (GCompareFunc)compare_filename);
+        GList *gl2 = g_list_find_custom (fl2->priv->selected_files, f1, (GCompareFunc) compare_filename);
 
         if (!gl2)
         {

Modified: branches/gcmd-1-3/src/intviewer/searcher.cc
==============================================================================
--- branches/gcmd-1-3/src/intviewer/searcher.cc	(original)
+++ branches/gcmd-1-3/src/intviewer/searcher.cc	Fri Apr 25 22:10:49 2008
@@ -110,7 +110,7 @@
 
 static void g_viewer_searcher_class_init(GViewerSearcherClass *klass)
 {
-    GObjectClass *object_class = G_OBJECT_CLASS(klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
     parent_class = (GObjectClass *) g_type_class_peek_parent(klass);
     object_class->finalize = g_viewer_searcher_finalize;
@@ -137,8 +137,7 @@
 
 static void g_viewer_searcher_finalize(GObject *object)
 {
-    GViewerSearcher *cobj;
-    cobj = G_VIEWERSEARCHER(object);
+    GViewerSearcher *cobj = G_VIEWERSEARCHER (object);
 
     // Free private members, etc.
     if (cobj->priv)
@@ -167,13 +166,13 @@
         cobj->priv = NULL;
     }
 
-    G_OBJECT_CLASS(parent_class)->finalize(object);
+    G_OBJECT_CLASS (parent_class)->finalize(object);
 }
 
 
 GViewerSearcher *g_viewer_searcher_new()
 {
-    GViewerSearcher *obj = G_VIEWERSEARCHER(g_object_new(G_TYPE_VIEWERSEARCHER, NULL));
+    GViewerSearcher *obj = G_VIEWERSEARCHER (g_object_new (G_TYPE_VIEWERSEARCHER, NULL));
 
     return obj;
 }
@@ -601,7 +600,7 @@
     // Reset indicators
     src->priv->abort_indicator = 0;
     src->priv->completed_indicator = 0;
-    // src->priv->progress_value is NOT reset here, only on "setup_new_search"
+    // src->priv->progress_value is NOT reset here, only in "setup_new_search"
     src->priv->search_reached_end = FALSE;
 
     src->priv->search_forward = forward;

Modified: branches/gcmd-1-3/src/intviewer/viewer-window.cc
==============================================================================
--- branches/gcmd-1-3/src/intviewer/viewer-window.cc	(original)
+++ branches/gcmd-1-3/src/intviewer/viewer-window.cc	Fri Apr 25 22:10:49 2008
@@ -1591,12 +1591,12 @@
 }
 
 
-static void set_zoom_normal(GViewerWindow *obj)
+static void set_zoom_normal (GViewerWindow *obj)
 {
     g_return_if_fail (obj);
     g_return_if_fail (obj->priv->viewer);
 
-    switch (gviewer_get_display_mode(obj->priv->viewer))
+    switch (gviewer_get_display_mode (obj->priv->viewer))
     {
         case DISP_MODE_TEXT_FIXED:
         case DISP_MODE_BINARY:
@@ -1605,7 +1605,7 @@
            break;
 
         case DISP_MODE_IMAGE:
-           gviewer_set_best_fit(obj->priv->viewer, FALSE);
+           gviewer_set_best_fit (obj->priv->viewer, FALSE);
            gviewer_set_scale_factor(obj->priv->viewer, 1);
            break;
 
@@ -1615,7 +1615,7 @@
 }
 
 
-static void set_zoom_best_fit(GViewerWindow *obj)
+static void set_zoom_best_fit (GViewerWindow *obj)
 {
     g_return_if_fail (obj);
     g_return_if_fail (obj->priv->viewer);

Modified: branches/gcmd-1-3/src/main.cc
==============================================================================
--- branches/gcmd-1-3/src/main.cc	(original)
+++ branches/gcmd-1-3/src/main.cc	Fri Apr 25 22:10:49 2008
@@ -116,7 +116,7 @@
     gdk_rgb_init ();
     gnome_vfs_init ();
 
-    conf_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir(), ".gnome-commander", NULL);
+    conf_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome-commander", NULL);
     create_dir_if_needed (conf_dir);
     g_free (conf_dir);
     gnome_cmd_data_load ();