[Pkg-xfce-commits] r262 - goodies/xfce4-cpufreq-plugin/debian/patches

[Stefan Ott]

Author: cockroach-guest
Date: 2005-10-11 21:14:01 +0000 (Tue, 11 Oct 2005)
New Revision: 262

Modified:
   goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch
Log:
Updated the patch


Modified: goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch
===================================================================
--- goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch	2005-10-07 12:42:16 UTC (rev 261)
+++ goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch	2005-10-11 21:14:01 UTC (rev 262)
@@ -5,7 +5,7 @@
 ## DP: Fix for the treeview crash when no sensors were available
 @DPATCH@
 --- xfce4-cpufreq-0.1-orig/cpufreq.c	2005-07-15 19:36:59.000000000 +0200
-+++ xfce4-cpufreq-0.1/cpufreq.c	2005-10-05 17:46:33.000000000 +0200
++++ xfce4-cpufreq-0.1/cpufreq.c	2005-10-11 23:10:51.000000000 +0200
 @@ -65,6 +65,8 @@
  	int cpu;
  	int timeoutid;
@@ -15,19 +15,21 @@
  	GdkColor colorLow;
  	GdkColor colorHi;
  
-@@ -136,6 +138,10 @@
+@@ -136,6 +138,8 @@
  
  	if (cur == 0) /* error */
  	{
 +		if (c->showed_warning) return TRUE;
 +
-+		c->showed_warning = TRUE;
-+
  		GtkWindow* win = GTK_WINDOW(gtk_widget_get_toplevel(c->vbox));
  		
  		if (c->cpu == 0) /* MUST work, unless cpufreq support is not available */
-@@ -146,8 +152,10 @@
- 			gtk_dialog_run(GTK_DIALOG(d));
+@@ -143,11 +147,13 @@
+ 			GtkWidget* d = gtk_message_dialog_new(win, 0,
+ 				GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ 				_("CPUFreq support is not present. The CPUFreq Monitor will not function this session."));
+-			gtk_dialog_run(GTK_DIALOG(d));
++			c->showed_warning = (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK);
  			gtk_widget_destroy(d);
  
 -			/* hide the useless widgets */
@@ -39,7 +41,16 @@
  			return TRUE; /* not an indicator of success */
  		}
  		else /* some other error, fall back to 0 */
-@@ -239,6 +247,7 @@
+@@ -155,7 +161,7 @@
+ 			GtkWidget* d = gtk_message_dialog_new(win, 0,
+ 				GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
+ 				_("CPU %d is not present. The CPUFreq Monitor will monitor CPU 0 for this session."), c->cpu);
+-			gtk_dialog_run(GTK_DIALOG(d));
++			c->showed_warning = (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK);
+ 			gtk_widget_destroy(d);
+ 
+ 			c->cpu = 0;
+@@ -239,6 +245,7 @@
  	c->cpu = 0;
  	c->orientation = VERTICAL; /* a very good default */
  	c->nr_cpus = get_nr_cpus();