[Xfce4-commits] <xfce4-radio-plugin:master> Renamed the config option to use a graphical UI

[Stefan Ott]

Updating branch refs/heads/master
         to 1cf17a7fe00be32845068cfa3a7142ec1f78a7eb (commit)
       from ab4187bad405bf2d101da043c7e2d01632853e08 (commit)

commit 1cf17a7fe00be32845068cfa3a7142ec1f78a7eb
Author: Stefan Ott <stefan at ott.net>
Date:   Sun May 22 13:04:06 2011 +0200

    Renamed the config option to use a graphical UI

 panel-plugin/xfce4-radio.c |   16 ++++++++--------
 panel-plugin/xfce4-radio.h |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/panel-plugin/xfce4-radio.c b/panel-plugin/xfce4-radio.c
index 23b50ff..e3df99a 100644
--- a/panel-plugin/xfce4-radio.c
+++ b/panel-plugin/xfce4-radio.c
@@ -108,7 +108,7 @@ update_signal(radio_gui* data)
 			gtk_widget_hide(data->signal_image);
 		}
 
-		if (!data->on && !data->show_signal_graphical)
+		if (!data->on && !data->use_graphics)
 		{
 			gtk_widget_hide(data->signal_image);
 		}
@@ -126,7 +126,7 @@ update_signal(radio_gui* data)
 				(GtkFunction) update_signal, (gpointer) data);
 		}
 
-		if (data->show_signal_graphical)
+		if (data->use_graphics)
 		{
 			gtk_widget_hide(data->signal_bar);
 			gtk_widget_show(data->signal_image);
@@ -232,7 +232,7 @@ update_label_when_radio_on(radio_gui *data)
 static void
 update_label_when_radio_off(radio_gui *data)
 {
-	if (!data->show_signal_graphical)
+	if (!data->use_graphics)
 	{
 		gtk_widget_hide(data->signal_image);
 		gtk_widget_show(data->label);
@@ -786,7 +786,7 @@ plugin_control_new(XfcePanelPlugin *plugin)
 	g_list_free(tuners);
 
 	plugin_data->show_signal = TRUE;
-	plugin_data->show_signal_graphical = TRUE;
+	plugin_data->use_graphics = TRUE;
 	plugin_data->show_label = TRUE;
 	plugin_data->auto_update_display = FALSE;
 	plugin_data->presets = NULL;
@@ -875,7 +875,7 @@ static void
 radio_signal_type_changed(GtkEditable* editable, void *pointer)
 {
 	radio_gui* data = (radio_gui*) pointer;
-	data->show_signal_graphical = gtk_toggle_button_get_active
+	data->use_graphics = gtk_toggle_button_get_active
 		(GTK_TOGGLE_BUTTON(editable));
 	update_label(data);
 }
@@ -1489,7 +1489,7 @@ radio_plugin_create_options(XfcePanelPlugin *plugin, radio_gui *data)
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
 		(show_signal), data->show_signal);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-		(graphical_signal_strength), data->show_signal_graphical);
+		(graphical_signal_strength), data->use_graphics);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
 		(show_label), data->show_label);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
@@ -1574,7 +1574,7 @@ write_config(radio_gui *data, gboolean save_presets)
 	xfce_rc_write_bool_entry(rc, "resolve_presets_in_label",
 						data->resolve_presets_in_label);
 	xfce_rc_write_bool_entry(rc, "graphical_signal",
-						data->show_signal_graphical);
+						data->use_graphics);
 
 	if (!save_presets)
 	{
@@ -1641,7 +1641,7 @@ read_config(XfcePanelPlugin *plugin, radio_gui *data)
 					(rc, "show_label", TRUE);
 	data->resolve_presets_in_label = xfce_rc_read_bool_entry
 					(rc, "resolve_presets_in_label", TRUE);
-	data->show_signal_graphical = xfce_rc_read_bool_entry
+	data->use_graphics = xfce_rc_read_bool_entry
 					(rc, "graphical_signal", TRUE);
 
 	if ((value = xfce_rc_read_entry(rc, "dev", NULL)) && *value)
diff --git a/panel-plugin/xfce4-radio.h b/panel-plugin/xfce4-radio.h
index 2f2ec31..c31a4ce 100644
--- a/panel-plugin/xfce4-radio.h
+++ b/panel-plugin/xfce4-radio.h
@@ -78,7 +78,7 @@ typedef struct {
 	gboolean		show_label;
 	gboolean		show_signal;
 	gboolean		resolve_presets_in_label;
-	gboolean		show_signal_graphical;
+	gboolean		use_graphics;
 	gboolean		auto_update_display;
 	gint			freq;
 	char			device [MAX_DEVICE_NAME_LENGTH];