Updating branch refs/heads/master
to 206f891a5ff8ffcbc656ad1df4a9e3681f7334c4 (commit)
from e737c2421fa482c0d1fd823753431594b24c7a2d (commit)
commit 206f891a5ff8ffcbc656ad1df4a9e3681f7334c4
Author: Stefan Ott <[email protected]>
Date: Fri May 20 05:35:55 2011 +0200
Removed compile-time option to enable the graphical signal indicator (it is
always enabled now)
configure.in.in | 8 --------
panel-plugin/xfce4-radio.c | 10 ----------
2 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index a1466d2..1c1eb61 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -39,14 +39,6 @@ XDT_I18N([@LINGUAS@])
dnl Check for debugging support
XDT_FEATURE_DEBUG()
-dnl Enable (currently broken) icon
-AC_ARG_ENABLE(antenna-icon,
-[ --enable-antenna-icon Enable the signal-strength icon (experimental)],
-[
- AC_DEFINE([ENABLE_ANTENNA_ICON],[1],
- [Use the experimental signal-strength icon])
-])
-
AC_OUTPUT([
Makefile
panel-plugin/Makefile
diff --git a/panel-plugin/xfce4-radio.c b/panel-plugin/xfce4-radio.c
index 453c116..1726995 100644
--- a/panel-plugin/xfce4-radio.c
+++ b/panel-plugin/xfce4-radio.c
@@ -795,7 +795,6 @@ radio_resolve_presets_changed(GtkEditable* editable, void
*pointer)
update_label(data);
}
-#ifdef ENABLE_ANTENNA_ICON
static void
radio_signal_type_changed(GtkEditable* editable, void *pointer)
{
@@ -804,7 +803,6 @@ radio_signal_type_changed(GtkEditable* editable, void
*pointer)
(GTK_TOGGLE_BUTTON(editable));
update_label(data);
}
-#endif
static void
radio_auto_update_display_changed(GtkEditable* editable, void *pointer)
@@ -1001,9 +999,7 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
GtkWidget *show_signal; // show the signal when on
GtkWidget *show_label; // show the label when on
-#ifdef ENABLE_ANTENNA_ICON
GtkWidget *graphical_signal_strength;
-#endif
GSList *auto_update_display_group = NULL;// auto update display:
GtkWidget *auto_update_display_yes; // - show
GtkWidget *auto_update_display_no; // - hide
@@ -1265,13 +1261,11 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
gtk_widget_show(show_signal);
gtk_container_add(GTK_CONTAINER(ui_options), show_signal);
-#ifdef ENABLE_ANTENNA_ICON
// Use graphics
graphical_signal_strength = gtk_check_button_new_with_label
(_("Use graphics instead of text labels and progress bars"));
gtk_widget_show(graphical_signal_strength);
gtk_container_add(GTK_CONTAINER(ui_options), graphical_signal_strength);
-#endif
// Show the label
show_label = gtk_check_button_new_with_label
@@ -1287,10 +1281,8 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
(show_signal), data->show_signal);
-#ifdef ENABLE_ANTENNA_ICON
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
(graphical_signal_strength), data->show_signal_graphical);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
(show_label), data->show_label);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
@@ -1359,10 +1351,8 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
G_CALLBACK(radio_show_signal_changed), data);
g_signal_connect(G_OBJECT(show_label), "toggled",
G_CALLBACK(radio_show_label_changed), data);
-#ifdef ENABLE_ANTENNA_ICON
g_signal_connect(G_OBJECT(graphical_signal_strength), "toggled",
G_CALLBACK(radio_signal_type_changed), data);
-#endif
g_signal_connect(G_OBJECT(resolve_presets), "toggled",
G_CALLBACK(radio_resolve_presets_changed), data);
g_signal_connect(G_OBJECT(auto_update_display_yes), "toggled",
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
