summaryrefslogtreecommitdiff
path: root/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2019-09-19 23:46:33 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2019-09-19 23:46:33 +0000
commite69e6941cc0f1dab5aefa920fb26c0f26941f258 (patch)
treee3316902afbb4318b0439dc574f0496749ecfdc3 /sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c
parentUpgrade editors/openoffice-devel to upstream git hash d871312c80. (diff)
Welcome XFCE 4.14 to the FreeBSD ports tree
- This XFCE release uses almost exclusively gtk3, so the USES=xfce now defaults to gtk3 - Make x11-themes/gtk-xfce-engine an optional dependency(disabled by default), it only supports gtk2, so would leave miost of this XFCE version unthemed. - Add Greybird as an optional and enabled dependency as a modern theme supporting both GTK versions and all other XFCE parts - The xfce4-vala port is deprecated and removed. The VALA bindings are available in the library ports using the GIR and VAPI options (on by default) - Fixed various missing library and portlint warnings (portmgr fixit blanket) - Default Display Manager changed to lightdm (Thanks to woodsb02 for help) - Add x11/xfce4-screensaver as an optional dependency to the xfce4-goodies (enabled by default) - Remove dependency on x11-fm/thunar-vfs and deprecate the port. It is EOL upstream and the functionality is included in thunar itself Update: - Added back sysutils/xfce4-places-plugin, updated to 1.8.1 - archivers/thunar-archive-plugin to 0.4.0 - audio/thunar-media-tags-plugin to 0.3.0 - audio/xfce4-mpc-plugin to 0.5.2 - audio/xfce4-pulseaudio-plugin to 0.4.2 - deskutils/xfce4-tumbler to 0.2.7 - devel/thunar-vcs-plugin to 0.2.0 [1] - devel/xfce4-dev-tools to 4.14.0 - misc/xfce4-appfinder to 4.14.0 - misc/xfce4-weather-plugin to 0.10.0 - multimedia/xfce4-parole to 1.0.4 - sysutils/gigolo to 0.5.0 - sysutils/xfce4-battery-plugin to 1.1.3 - sysutils/xfce4-fsguard-plugin to 1.1.1 - sysutils/xfce4-netload-plugin to 1.3.2 - sysutils/xfce4-power-manage to 1.6.5 - sysutils/xfce4-settings 4.14.1 - sysutils/xfce4-systemload-plugin to 1.2.3 - sysutils/xfce4-wavelan-plugin to 0.6.1 - www/xfce4-smartbookmark-plugin to 0.5.1 - x11-clocks/xfce4-datetime-plugin to 0.8.0 - Added new xfce4-stopwatch-plugin, version 0.3.1 - x11-clocks/xfce4-timer-out-plugin to 1.0.3 - x11-fm/thunar to 1.8.9 - x11-wm/xfce4-desktop to 4.14.1 - x11-wm/xfce4-panel to 4.14.0 - x11-wm/xfce4-session to 4.14.0 - x11-wm/xfce4-wm to 4.14.0 - x11/libexo to 0.12.8 - x11/libxfce4menu to 4.14.1 - x11/libxfce4util to 4.14.0 - x11/xfce4-conf to 4.14.1 - x11/xfce4-dashboard to 0.7.5 - x11/xfce4-screensaver to 0.1.8 - x11/xfce4-screenshooter-plugin to 1.9.6 - x11/xfce4-verve-plugin to 2.0.0 Thanks to: Olivier Duchateau <duchateau.olivier@gmail.com> PR: 240236 Exp-run by: antoine Tested by: sbruno Approved by: sergey.dyatko@gmail.com (maintainer timeout via email), portmgr (fixit blanket, port breaks with new Thunar if not updated) [1] Differential Revision: https://reviews.freebsd.org/D21278
Notes
Notes: svn path=/head/; revision=512378
Diffstat (limited to 'sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c')
-rw-r--r--sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c91
1 files changed, 21 insertions, 70 deletions
diff --git a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c b/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c
index cc269cb51079..2362c4b1c06a 100644
--- a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c
+++ b/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c
@@ -1,79 +1,30 @@
---- panel-plugin/wavelan.c.orig 2016-10-29 06:46:02 UTC
+--- panel-plugin/wavelan.c.orig 2019-08-13 10:29:17 UTC
+++ panel-plugin/wavelan.c
-@@ -64,6 +64,9 @@ typedef struct
- GtkWidget *image;
- GtkWidget *signal;
- GtkWidget *tooltip_text;
-+#if GTK_CHECK_VERSION (3, 16, 0)
-+ GtkCssProvider *css_provider;
-+#endif
-
- XfcePanelPlugin *plugin;
-
-@@ -77,7 +80,6 @@ wavelan_set_state(t_wavelan *wavelan, gint state)
- {
- GdkRGBA color;
- #if GTK_CHECK_VERSION (3, 16, 0)
-- GtkCssProvider *css_provider;
- gchar *css;
- #endif
-
-@@ -99,11 +101,11 @@ wavelan_set_state(t_wavelan *wavelan, gint state)
-
- if (wavelan->signal_colors) {
- /* set color */
-- if (state > 70)
-+ if (state > 75)
- gdk_rgba_parse(&color, signal_color_strong);
-- else if (state > 55)
-+ else if (state > 50)
- gdk_rgba_parse(&color, signal_color_good);
-- else if (state > 40)
-+ else if (state > 25)
- gdk_rgba_parse(&color, signal_color_weak);
- else
- gdk_rgba_parse(&color, signal_color_bad);
-@@ -118,12 +120,7 @@ wavelan_set_state(t_wavelan *wavelan, gint state)
- #endif
- gdk_rgba_to_string(&color));
- /* Setup Gtk style */
-- css_provider = gtk_css_provider_new ();
-- gtk_css_provider_load_from_data (css_provider, css, strlen(css), NULL);
-- gtk_style_context_add_provider (
-- GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))),
-- GTK_STYLE_PROVIDER (css_provider),
-- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-+ gtk_css_provider_load_from_data (wavelan->css_provider, css, strlen(css), NULL);
- g_free(css);
- #else
- gtk_widget_override_background_color(GTK_WIDGET(wavelan->signal),
-@@ -183,7 +180,15 @@ wavelan_timer(gpointer data)
- }
- }
- else {
-- wavelan_set_state(wavelan, stats.ws_quality);
-+ /*
-+ * Usual formula is: qual = 4 * (signal - noise)
-+ * where noise is typically about -96dBm, but we don't have
-+ * the actual noise value here, so approximate one.
-+ */
-+ if (strcmp(stats.ws_qunit, "dBm") == 0)
-+ wavelan_set_state(wavelan, 4 * (stats.ws_quality - (-96)));
-+ else
-+ wavelan_set_state(wavelan, stats.ws_quality);
+@@ -108,11 +108,11 @@ wavelan_set_state(t_wavelan *wavelan, gint state)
- if (strlen(stats.ws_netname) > 0)
- /* Translators: net_name: quality quality_unit at rate Mb/s*/
-@@ -338,6 +343,13 @@ wavelan_new(XfcePanelPlugin *plugin)
+ if (wavelan->signal_colors) {
+ /* set color */
+- if (state > 70)
++ if (state > 75)
+ gdk_rgba_parse(&color, signal_color_strong);
+- else if (state > 55)
++ else if (state > 50)
+ gdk_rgba_parse(&color, signal_color_good);
+- else if (state > 40)
++ else if (state > 25)
+ gdk_rgba_parse(&color, signal_color_weak);
+ else
+ gdk_rgba_parse(&color, signal_color_bad);
+@@ -357,11 +357,13 @@ wavelan_new(XfcePanelPlugin *plugin)
/* setup progressbar */
wavelan->signal = gtk_progress_bar_new();
+#if GTK_CHECK_VERSION (3, 16, 0)
-+ wavelan->css_provider = gtk_css_provider_new ();
-+ gtk_style_context_add_provider (
-+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))),
-+ GTK_STYLE_PROVIDER (wavelan->css_provider),
-+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ wavelan->css_provider = gtk_css_provider_new ();
+ gtk_style_context_add_provider (
+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))),
+ GTK_STYLE_PROVIDER (wavelan->css_provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+#endif
wavelan->image = GTK_WIDGET(xfce_panel_image_new_from_source("network-wireless"));