[Apcupsd-commits] apcupsd/src/gapcmon gpanel_apcmon.c,1.6,1.7

[James S. Jr. <sk...@us...>]

Update of /cvsroot/apcupsd/apcupsd/src/gapcmon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32468

Modified Files:
	gpanel_apcmon.c 
Log Message:
Define GAPC_REFRESH_FACTOR_ONE_TIME=500 to manage any further exploration
of timers supporting the one_shot model.  Although we want it to refresh
quickly; I have to remember that is will repeated until sucessful
and possibly interfer with the thread its waiting on.
James,


Index: gpanel_apcmon.c
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/gapcmon/gpanel_apcmon.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gpanel_apcmon.c	19 Mar 2006 01:39:05 -0000	1.6
+++ gpanel_apcmon.c	19 Mar 2006 02:09:07 -0000	1.7
@@ -107,6 +107,7 @@
 #define GAPC_REFRESH_INCREMENT 30000 /* 30 sec Display update timer 1K=1 */
 #define GAPC_REFRESH_FACTOR_1M 250000 /* 1-4th of usecs for network threads */
 #define GAPC_REFRESH_FACTOR_1K 1000 /* secs for visual refresh           */
+#define GAPC_REFRESH_FACTOR_ONE_TIME 500
 #define GAPC_HISTORY_CHART_PTS 40 /* Num of data points in each series */
 #define GAPC_HISTORY_CHART_SERIES 5 /* Num of data series       */
 #define GAPC_HISTORY_CHART_FACTOR_XINC 30 /* Num refreshes per collection  */
@@ -1776,7 +1777,8 @@
         gtk_statusbar_push (GTK_STATUSBAR (w), ppi->i_info_context,
                         "Refresh Failed(retry enabled): Thread is Busy...");
     }
-    g_timeout_add (1000, (GSourceFunc)cb_monitor_dedicated_one_time_refresh, ppi);    
+    g_timeout_add (GAPC_REFRESH_FACTOR_ONE_TIME,
+                   (GSourceFunc)cb_monitor_dedicated_one_time_refresh, ppi);    
   }
 
   return;
@@ -2803,7 +2805,8 @@
   GTK_WIDGET_SET_FLAGS (dbutton, GTK_CAN_DEFAULT);
   gtk_widget_grab_default (dbutton);
 
-  g_timeout_add (250, (GSourceFunc) cb_monitor_dedicated_one_time_refresh, ppi);
+  g_timeout_add (GAPC_REFRESH_FACTOR_ONE_TIME, 
+                 (GSourceFunc) cb_monitor_dedicated_one_time_refresh, ppi);
 
   return GTK_WIDGET (window);
 }
@@ -3570,7 +3573,8 @@
 
   gtk_widget_show_all (GTK_WIDGET (ppi->evbox));
 
-  g_timeout_add (250, (GSourceFunc) cb_monitor_dedicated_one_time_refresh, ppi);
+  g_timeout_add (GAPC_REFRESH_FACTOR_ONE_TIME, 
+  				 (GSourceFunc) cb_monitor_dedicated_one_time_refresh, ppi);
 
   return b_rc;
 }