[Goodies-commits] r6936 - xfce4-radio-plugin/trunk/panel-plugin

[Stefan Ott]

Author: cockroach
Date: 2009-03-18 02:04:51 +0000 (Wed, 18 Mar 2009)
New Revision: 6936

Modified:
   xfce4-radio-plugin/trunk/panel-plugin/v4l1.c
   xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c
Log:
Properly disabled all graphical-signal-related parts of the code


Modified: xfce4-radio-plugin/trunk/panel-plugin/v4l1.c
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/v4l1.c	2009-03-18 01:46:52 UTC (rev 6935)
+++ xfce4-radio-plugin/trunk/panel-plugin/v4l1.c	2009-03-18 02:04:51 UTC (rev 6936)
@@ -163,7 +163,6 @@
 		perror ("VIDIOCGFREQ");
 		return -1;
 	}
-	printf ("%d %f\n", freq, freq);
 	return freq / (double) dev->freq_fact;
 }
 

Modified: xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c	2009-03-18 01:46:52 UTC (rev 6935)
+++ xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c	2009-03-18 02:04:51 UTC (rev 6936)
@@ -279,8 +279,6 @@
 			gtk_tooltips_enable (data->tooltips);
 			data->on = TRUE;
 		}
-		double ff = radio_get_freq ();
-		DBG ("FREQ=%f", ff);
 		data->freq = radio_get_freq () * 100;
 		DBG ("Updating frequency to %d", data->freq);
 	}
@@ -653,7 +651,6 @@
 static void
 add_gui_elements (radio_gui *gui)
 {
-
 	add_boxes (gui);
 	add_label (gui);
 	add_signal_bar (gui);
@@ -781,6 +778,7 @@
 	update_label (data);
 }
 
+/*
 static void
 radio_show_label_when_off_changed (GtkEditable* editable, void *pointer)
 {
@@ -789,6 +787,7 @@
 		(GTK_TOGGLE_BUTTON (editable));
 	update_label (data);
 }
+*/
 
 static void
 radio_resolve_presets_changed (GtkEditable* editable, void *pointer)
@@ -799,6 +798,7 @@
 	update_label (data);
 }
 
+/*
 static void
 radio_signal_type_changed (GtkEditable* editable, void *pointer)
 {
@@ -809,6 +809,7 @@
 
 	DBG ("show_signal_graphical = %d", data->show_signal_graphical);
 }
+*/
 
 static void
 radio_auto_update_display_changed (GtkEditable* editable, void *pointer)
@@ -1005,12 +1006,14 @@
 
 	GtkWidget *show_signal;			// show the signal when on
 	GtkWidget *show_label;			// show the label when on
+	/*
 	GSList *signal_type_group = NULL;	// show signal strength as:
 	GtkWidget *signal_type_bar;		//  - progress bar
 	GtkWidget *signal_type_xpm;		//  - graphical
 	GSList *show_when_off = NULL;		// what to show when off:
 	GtkWidget *label_when_off;		//  - label
 	GtkWidget *graphics_when_off;		//  - graphics
+	*/
 	GSList *auto_update_display_group = NULL;// auto update display:
 	GtkWidget *auto_update_display_yes;	//  - show
 	GtkWidget *auto_update_display_no;	//  - hide
@@ -1346,10 +1349,13 @@
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
 		(show_signal), data->show_signal);
+	/*
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
 		(signal_type_bar), !data->show_signal_graphical);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
 		(signal_type_xpm), data->show_signal_graphical);
+
+	*/
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
 		(show_label), data->show_label);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
@@ -1418,12 +1424,14 @@
 			G_CALLBACK (radio_show_signal_changed), data);
 	g_signal_connect (G_OBJECT (show_label), "toggled",
 			G_CALLBACK (radio_show_label_changed), data);
+	/*
 	g_signal_connect (G_OBJECT (label_when_off), "toggled",
 			G_CALLBACK (radio_show_label_when_off_changed), data);
+	g_signal_connect (G_OBJECT (signal_type_bar), "toggled",
+			G_CALLBACK (radio_signal_type_changed), data);
+	*/
 	g_signal_connect (G_OBJECT (resolve_presets), "toggled",
 			G_CALLBACK (radio_resolve_presets_changed), data);
-	g_signal_connect (G_OBJECT (signal_type_bar), "toggled",
-			G_CALLBACK (radio_signal_type_changed), data);
 	g_signal_connect (G_OBJECT (auto_update_display_yes), "toggled",
 			G_CALLBACK (radio_auto_update_display_changed), data);
 	g_signal_connect (G_OBJECT (frequency_button), "toggled",
@@ -1450,6 +1458,8 @@
 	gui->orientation = orientation;
 	gtk_container_remove (GTK_CONTAINER (gui->ebox), gui->outer_box);
 	add_gui_elements (gui);
+
+	update_label (gui);
 }
 
 static void