rpms/xfce4-diskperf-plugin/devel xfce4-diskperf-plugin-01_random_fixes.patch, NONE, 1.1 xfce4-diskperf-plugin.spec, 1.6, 1.7

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6147

Modified Files:
	xfce4-diskperf-plugin.spec 
Added Files:
	xfce4-diskperf-plugin-01_random_fixes.patch 
Log Message:
fix for #215863

xfce4-diskperf-plugin-01_random_fixes.patch:

--- NEW FILE xfce4-diskperf-plugin-01_random_fixes.patch ---
diff -Nur xfce4-diskperf-plugin-2.0/panel-plugin/main.c xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c
--- xfce4-diskperf-plugin-2.0/panel-plugin/main.c	2005-10-11 22:18:15.000000000 +0300
+++ xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c	2006-10-07 10:15:34.000000000 +0300
@@ -141,6 +141,8 @@
 
 	/**************************************************************/
 
+static int timerNeedsUpdate = 0;
+
 static int DisplayPerf (struct diskperf_t *p_poPlugin)
  /* Get the last disk perfomance data, compute the statistics and update
     the panel-docked monitor bars */
@@ -273,6 +275,12 @@
 
     DisplayPerf (poPlugin);
 
+    if (timerNeedsUpdate) {
+        g_source_remove (poPlugin->iTimerId);
+        poPlugin->iTimerId = 0;
+        timerNeedsUpdate = 0;
+    }
+
     if (!poPlugin->iTimerId)
         poPlugin->iTimerId = g_timeout_add (poConf->iPeriod_ms,
 					    (GSourceFunc) SetTimer, poPlugin);
@@ -773,6 +781,7 @@
     struct param_t *poConf = &(poPlugin->oConf.oParam);
     float           r;
 
+    timerNeedsUpdate = 1;
     TRACE ("SetPeriod()\n");
     r = gtk_spin_button_get_value (GTK_SPIN_BUTTON (p_wSc));
     poConf->iPeriod_ms = (r * 1000) + 0.5;	/* rounded */
@@ -1096,8 +1105,6 @@
 {
     diskperf_t *diskperf = diskperf_create_control (plugin);
 
-    diskperf_read_config (plugin, diskperf);
-
     g_signal_connect (plugin, "free-data", G_CALLBACK (diskperf_free), 
                       diskperf);
 
@@ -1120,7 +1127,9 @@
     gtk_container_add (GTK_CONTAINER (plugin), diskperf->oMonitor.wEventBox);
 
     CreateMonitorBars (diskperf, xfce_panel_plugin_get_orientation (plugin));
-    
+
+    diskperf_read_config (plugin, diskperf);
+    DevPerfInit();
     SetTimer (diskperf);
 }
 


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-diskperf-plugin.spec	5 Oct 2006 12:13:39 -0000	1.6
+++ xfce4-diskperf-plugin.spec	25 Nov 2006 02:01:38 -0000	1.7
@@ -1,12 +1,13 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-01_random_fixes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .random_fixes
 
 %build
 %configure --disable-static
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 25 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-4
+- Add patch to fix bug bugzilla.xfce.org #1842 (#215863)
+
 * Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-3
 - Bump release for devel checkin.