gnome-commander r2092 - in trunk: . src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Sep 22 18:17:13 2008
New Revision: 2092
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2092&view=rev

Log:
GnomeCmdData: gnome_cmd_data_get_gui_update_rate() -> gnome_cmd_data.gui_update_rate

Modified:
   trunk/ChangeLog
   trunk/src/dirlist.cc
   trunk/src/gnome-cmd-con.cc
   trunk/src/gnome-cmd-data.cc
   trunk/src/gnome-cmd-data.h
   trunk/src/gnome-cmd-delete-dialog.cc
   trunk/src/gnome-cmd-file-props-dialog.cc
   trunk/src/gnome-cmd-file-selector.cc
   trunk/src/gnome-cmd-file.cc
   trunk/src/gnome-cmd-search-dialog.cc
   trunk/src/gnome-cmd-xfer.cc

Modified: trunk/src/dirlist.cc
==============================================================================
--- trunk/src/dirlist.cc	(original)
+++ trunk/src/dirlist.cc	Mon Sep 22 18:17:13 2008
@@ -104,7 +104,7 @@
                                         (GnomeVFSAsyncDirectoryLoadCallback) on_files_listed,
                                         dir);
 
-    g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) update_list_progress, dir);
+    g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) update_list_progress, dir);
 }
 
 

Modified: trunk/src/gnome-cmd-con.cc
==============================================================================
--- trunk/src/gnome-cmd-con.cc	(original)
+++ trunk/src/gnome-cmd-con.cc	Mon Sep 22 18:17:13 2008
@@ -280,7 +280,7 @@
     if (con->state != CON_STATE_OPEN)
         klass->open (con);
 
-    g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) check_con_open_progress, con);
+    g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) check_con_open_progress, con);
 }
 
 

Modified: trunk/src/gnome-cmd-data.cc
==============================================================================
--- trunk/src/gnome-cmd-data.cc	(original)
+++ trunk/src/gnome-cmd-data.cc	Mon Sep 22 18:17:13 2008
@@ -80,7 +80,6 @@
     gchar                *start_dirs[2];
     gchar                *last_pattern;
     GList                *auto_load_plugins;
-    guint                gui_update_rate;
     gint                 sort_column[2];
     gboolean             sort_direction[2];
     gint                 main_win_pos[2];
@@ -1119,6 +1118,8 @@
     cmdline_visibility = TRUE;
     buttonbar_visibility = TRUE;
 
+    gui_update_rate = DEFAULT_GUI_UPDATE_RATE;
+
     main_win_width = 600;
     main_win_height = 400;
 
@@ -1288,7 +1289,7 @@
     priv->btn_relief = (GtkReliefStyle) gnome_cmd_data_get_int ("/options/btn_relief", GTK_RELIEF_NONE);
     filter_type = (Filter::Type) gnome_cmd_data_get_int ("/options/filter_type", Filter::TYPE_FNMATCH);
     priv->list_orientation = gnome_cmd_data_get_bool ("/options/list_orientation", FALSE);
-    priv->gui_update_rate = gnome_cmd_data_get_int ("/options/gui_update_rate", DEFAULT_GUI_UPDATE_RATE);
+    gui_update_rate = gnome_cmd_data_get_int ("/options/gui_update_rate", DEFAULT_GUI_UPDATE_RATE);
     priv->main_win_pos[0] = gnome_cmd_data_get_int ("/options/main_win_pos_x", -1);
     priv->main_win_pos[1] = gnome_cmd_data_get_int ("/options/main_win_pos_y", -1);
 
@@ -1298,10 +1299,10 @@
     cmdline_visibility = gnome_cmd_data_get_bool ("/options/cmdline_visibility", TRUE);
     buttonbar_visibility = gnome_cmd_data_get_bool ("/programs/buttonbar_visibility", TRUE);
 
-    if (priv->gui_update_rate < MIN_GUI_UPDATE_RATE)
-        priv->gui_update_rate = MIN_GUI_UPDATE_RATE;
-    if (priv->gui_update_rate > MAX_GUI_UPDATE_RATE)
-        priv->gui_update_rate = MAX_GUI_UPDATE_RATE;
+    if (gui_update_rate < MIN_GUI_UPDATE_RATE)
+        gui_update_rate = MIN_GUI_UPDATE_RATE;
+    if (gui_update_rate > MAX_GUI_UPDATE_RATE)
+        gui_update_rate = MAX_GUI_UPDATE_RATE;
 
     priv->honor_expect_uris = gnome_cmd_data_get_bool ("/programs/honor_expect_uris", FALSE);
     priv->use_internal_viewer = gnome_cmd_data_get_bool ("/programs/use_internal_viewer", TRUE);
@@ -1634,6 +1635,7 @@
     gnome_cmd_data_set_int    ("/options/btn_relief", priv->btn_relief);
     gnome_cmd_data_set_int    ("/options/filter_type", filter_type);
     gnome_cmd_data_set_bool   ("/options/list_orientation", priv->list_orientation);
+    gnome_cmd_data_set_int    ("/options/gui_update_rate", gui_update_rate);
 
     gnome_cmd_data_set_bool   ("/programs/honor_expect_uris", priv->honor_expect_uris);
     gnome_cmd_data_set_bool   ("/programs/use_internal_viewer", priv->use_internal_viewer);
@@ -2213,12 +2215,6 @@
 }
 
 
-guint gnome_cmd_data_get_gui_update_rate ()
-{
-    return gnome_cmd_data.priv->gui_update_rate;
-}
-
-
 void gnome_cmd_data_get_sort_params (GnomeCmdFileList *fl, gint *col, gboolean *direction)
 {
     if (!gnome_cmd_main_win_get_fs (main_win, LEFT) || gnome_cmd_main_win_get_fs (main_win, LEFT)->file_list() == fl)

Modified: trunk/src/gnome-cmd-data.h
==============================================================================
--- trunk/src/gnome-cmd-data.h	(original)
+++ trunk/src/gnome-cmd-data.h	Mon Sep 22 18:17:13 2008
@@ -89,6 +89,8 @@
     gboolean                     cmdline_visibility;
     gboolean                     buttonbar_visibility;
 
+    guint                        gui_update_rate;
+
     gint                         main_win_width;
     gint                         main_win_height;
     GdkWindowState               main_win_state;
@@ -229,8 +231,6 @@
 GList *gnome_cmd_data_get_auto_load_plugins ();
 void gnome_cmd_data_set_auto_load_plugins (GList *plugins);
 
-guint gnome_cmd_data_get_gui_update_rate ();
-
 void gnome_cmd_data_get_main_win_pos (gint *x, gint *y);
 void gnome_cmd_data_set_main_win_pos (gint x, gint y);
 

Modified: trunk/src/gnome-cmd-delete-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-delete-dialog.cc	(original)
+++ trunk/src/gnome-cmd-delete-dialog.cc	Mon Sep 22 18:17:13 2008
@@ -249,7 +249,7 @@
     create_delete_progress_win (data);
 
     data->thread = g_thread_create ((GThreadFunc) perform_delete_operation, data, FALSE, NULL);
-    g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) update_delete_status_widgets, data);
+    g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) update_delete_status_widgets, data);
 }
 
 

Modified: trunk/src/gnome-cmd-file-props-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-file-props-dialog.cc	(original)
+++ trunk/src/gnome-cmd-file-props-dialog.cc	Mon Sep 22 18:17:13 2008
@@ -184,7 +184,7 @@
 
     data->thread = g_thread_create ((PthreadFunc) calc_tree_size_func, data, TRUE, NULL);
 
-    g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) update_count_status, data);
+    g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) update_count_status, data);
 }
 
 

Modified: trunk/src/gnome-cmd-file-selector.cc
==============================================================================
--- trunk/src/gnome-cmd-file-selector.cc	(original)
+++ trunk/src/gnome-cmd-file-selector.cc	Mon Sep 22 18:17:13 2008
@@ -577,7 +577,7 @@
         if (fs->priv->autoscroll_timeout) return;
         fs->priv->autoscroll_dir = FALSE;
         fs->priv->autoscroll_y = y;
-        fs->priv->autoscroll_timeout = g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) do_scroll, fs);
+        fs->priv->autoscroll_timeout = g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) do_scroll, fs);
     }
     else if (y > smax)
     {
@@ -585,7 +585,7 @@
         fs->priv->autoscroll_dir = TRUE;
         fs->priv->autoscroll_y = y;
         fs->priv->autoscroll_timeout =
-            g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) do_scroll, fs);
+            g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) do_scroll, fs);
     }
     else
     {
@@ -1743,7 +1743,7 @@
         priv->con_opening = con;
 
         create_con_open_progress_dialog (this);
-        g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) update_con_open_progress, this);
+        g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) update_con_open_progress, this);
 
         gnome_cmd_con_open (con);
     }

Modified: trunk/src/gnome-cmd-file.cc
==============================================================================
--- trunk/src/gnome-cmd-file.cc	(original)
+++ trunk/src/gnome-cmd-file.cc	Mon Sep 22 18:17:13 2008
@@ -976,7 +976,7 @@
 
     g_get_current_time (&t);
 
-    if (tv2ms (t) - tv2ms (file->priv->last_update) > gnome_cmd_data_get_gui_update_rate ())
+    if (tv2ms (t) - tv2ms (file->priv->last_update) > gnome_cmd_data.gui_update_rate)
     {
         file->priv->last_update = t;
         return TRUE;

Modified: trunk/src/gnome-cmd-search-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-search-dialog.cc	(original)
+++ trunk/src/gnome-cmd-search-dialog.cc	Mon Sep 22 18:17:13 2008
@@ -571,7 +571,7 @@
     data->thread = g_thread_create ((GThreadFunc) perform_search_operation, data, TRUE, NULL);
 
     gtk_widget_show (data->dialog->priv->pbar);
-    data->update_gui_timeout_id = g_timeout_add (gnome_cmd_data_get_gui_update_rate (),
+    data->update_gui_timeout_id = g_timeout_add (gnome_cmd_data.gui_update_rate,
                                                  (GSourceFunc) update_search_status_widgets,
                                                  dialog->priv->data);
     return FALSE;

Modified: trunk/src/gnome-cmd-xfer.cc
==============================================================================
--- trunk/src/gnome-cmd-xfer.cc	(original)
+++ trunk/src/gnome-cmd-xfer.cc	Mon Sep 22 18:17:13 2008
@@ -438,7 +438,7 @@
                                                   xfer_callback,
                                                   data);
 
-    g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) update_xfer_gui_func, data);
+    g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) update_xfer_gui_func, data);
 }
 
 
@@ -524,5 +524,5 @@
                                    xfer_callback,
                                    data);
 
-    g_timeout_add (gnome_cmd_data_get_gui_update_rate (), (GSourceFunc) update_xfer_gui_func, data);
+    g_timeout_add (gnome_cmd_data.gui_update_rate, (GSourceFunc) update_xfer_gui_func, data);
 }