Updating branch refs/heads/master to a2e5010a08c014802157788a50c30ec97e271dba (commit) from e85183e08092e1f734b3873e0e000f20303a69b4 (commit)
commit a2e5010a08c014802157788a50c30ec97e271dba Author: Harald Judt <h.j...@gmx.at> Date: Mon Jan 13 19:32:52 2014 +0100 Remove code dealing with laptop lid open/close (bug #10330). Lesson learned: Treating lid open/close like on_battery events is not a good idea in some cases. It is much better to simply distinguish between on AC/battery instead of doing too much aggressive powersaving. panel-plugin/weather-debug.c | 2 -- panel-plugin/weather-summary.c | 4 ++-- panel-plugin/weather.c | 24 +++++------------------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/panel-plugin/weather-debug.c b/panel-plugin/weather-debug.c index f15b239..30fec15 100644 --- a/panel-plugin/weather-debug.c +++ b/panel-plugin/weather-debug.c @@ -430,7 +430,6 @@ weather_dump_plugindata(const plugin_data *data) " --------------------------------------------\n" #ifdef HAVE_UPOWER_GLIB " upower on battery: %s\n" - " upower lid closed: %s\n" #endif " power saving: %s\n" " --------------------------------------------\n" @@ -474,7 +473,6 @@ weather_dump_plugindata(const plugin_data *data) data->panel_orientation, #ifdef HAVE_UPOWER_GLIB YESNO(data->upower_on_battery), - YESNO(data->upower_lid_closed), #endif YESNO(data->power_saving), last_astro_update, diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c index a40dfde..d8ab386 100644 --- a/panel-plugin/weather-summary.c +++ b/panel-plugin/weather-summary.c @@ -1087,7 +1087,7 @@ update_summary_subtitle(plugin_data *data) time(&now_t); #ifdef HAVE_UPOWER_GLIB - if (data->upower_on_battery || data->upower_lid_closed) + if (data->upower_on_battery) date_format = "%Y-%m-%d %H:%M %z (%Z)"; else #endif @@ -1103,7 +1103,7 @@ update_summary_subtitle(plugin_data *data) g_get_current_time(&now); now_ms = ((gint64) now.tv_sec * 1000) + ((gint64) now.tv_usec / 1000); #ifdef HAVE_UPOWER_GLIB - if (data->upower_on_battery || data->upower_lid_closed) + if (data->upower_on_battery) update_interval = 60000 - (now_ms % 60000) + 10; else #endif diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c index 7852da0..59b8dde 100644 --- a/panel-plugin/weather.c +++ b/panel-plugin/weather.c @@ -306,13 +306,6 @@ update_icon(plugin_data *data) void scrollbox_set_visible(plugin_data *data) { -#ifdef HAVE_UPOWER_GLIB - if (data->upower_lid_closed) { - gtk_widget_hide_all(GTK_WIDGET(data->vbox_center_scrollbox)); - gtk_scrollbox_set_visible(GTK_SCROLLBOX(data->scrollbox), FALSE); - return; - } -#endif if (data->show_scrollbox && data->labels->len > 0) gtk_widget_show_all(GTK_WIDGET(data->vbox_center_scrollbox)); else @@ -1537,23 +1530,18 @@ static void upower_changed_cb(UpClient *client, plugin_data *data) { - gboolean on_battery, lid_closed; + gboolean on_battery; if (G_UNLIKELY(data->upower == NULL) || !data->power_saving) return; on_battery = data->upower_on_battery; - lid_closed = data->upower_lid_closed; - weather_debug("upower old status: on_battery=%d, lid_closed=%d", - on_battery, lid_closed); + weather_debug("upower old status: on_battery=%d", on_battery); data->upower_on_battery = up_client_get_on_battery(client); - data->upower_lid_closed = up_client_get_lid_is_closed(client); - weather_debug("upower new status: on_battery=%d, lid_closed=%d", - data->upower_on_battery, data->upower_lid_closed); + weather_debug("upower new status: on_battery=%d", data->upower_on_battery); - if (data->upower_on_battery != on_battery || - data->upower_lid_closed != lid_closed) { + if (data->upower_on_battery != on_battery) { if (data->summary_window) update_summary_subtitle(data); @@ -1801,10 +1789,8 @@ xfceweather_create_control(XfcePanelPlugin *plugin) data->plugin = plugin; #ifdef HAVE_UPOWER_GLIB data->upower = up_client_new(); - if (data->upower) { + if (data->upower) data->upower_on_battery = up_client_get_on_battery(data->upower); - data->upower_lid_closed = up_client_get_lid_is_closed(data->upower); - } #endif data->units = g_slice_new0(units_config); data->weatherdata = make_weather_data(); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits