casa / casa-mp-base / 0ec59c5f169

Commits

Kurt Hindenburg authored 0ec59c5f169 01 Feb 2019

gkrellm: update commits from 2.3.10 onward from git master branch

sysutils/gkrellm/files/patch-master-commits.diff

Modified

-226
++++ b/src/battery.c
-227
+@@ -382,7 +382,7 @@ estimate_battery_time_left(Battery *bat)
-228
+ 			/* charging, use exponential: eta =~ 2.5 * time-constant (~=92%) */
-229
+ 			eta = -2.5 * dt/60 / (log(1 - (gdouble)dp/(gdouble)(p+dp)));
-230
+ 		else
-231
+-			eta = abs((gdouble)p / rate);	/* use linear */
-232
++			eta = fabs((gdouble)p / rate);	/* use linear */
-233
-234
+ #ifdef BAT_ESTIMATE_DEBUG
-235
+ 		fprintf(stderr, "eta = %.2f\t", eta);
-+
+diff --git a/src/client.c b/src/client.c
-+
+index e644eba..8f9d5f8 100644
-+
+--- a/src/client.c
-+
++++ b/src/client.c
-+
+@@ -1787,6 +1787,11 @@ read_server_setup(gint fd)
-+
+ void
-+
+ gkrellm_client_mode_disconnect(void)
-+
+ 	{
-+
++	if (client_input_id != 0)
-+
++		{
-+
++		gdk_input_remove(client_input_id);
-+
++		client_input_id = 0;
-+
++		}
-+
+ 	if (client_fd >= 0)
-+
+ 		{
-+
+ 		gkrellm_debug(DEBUG_CLIENT, "gkrellm_client_mode_disconnect(); " \
-+
+@@ -1795,8 +1800,6 @@ gkrellm_client_mode_disconnect(void)
-+
+ 		}
-+
+ 	client_fd = -1;
-+
+ 	server_alive = FALSE;
-+
+-	gdk_input_remove(client_input_id);
-+
+-	client_input_id = 0;
-+
+ 	}
-+
-+
+ static void
-261
+diff --git a/src/fs.c b/src/fs.c
--
+index 626bc74..6c73f41 100644
-+
+index 626bc74..5db65b1 100644
-263
+--- a/src/fs.c
-264
++++ b/src/fs.c
-265
+@@ -460,7 +460,7 @@ fs_draw_decal_text(FSmon *fs, gint value)
-266
+ 	GkrellmDecal		*d;
-267
+ 	GkrellmTextstyle	ts_save;
-268
+ 	gchar				buf[128];
-269
+-	gint				x_off, w;
-270
++	gint				x_off, w = 0;
-271
-272
+ 	if (value == 0)
-273
+ 		{
-+
+@@ -810,7 +810,7 @@ fs_update(void)
-+
+ 				if (fs->blocks > 2147483648LL)
-+
+ 					fs->krell_factor = 1024 * 1024;
-+
+ 				else if (fs->blocks > 2097152LL)
-+
+-					fs->krell_factor = 1024 * 1024;
-+
++					fs->krell_factor = 1024;
-+
+ 				else
-+
+ 					fs->krell_factor = 1;
-+
+ 				}
-283
+diff --git a/src/gkrellm-sysdeps.h b/src/gkrellm-sysdeps.h
-284
+index 9a0f8fc..07295fb 100644
-285
+--- a/src/gkrellm-sysdeps.h
-286
++++ b/src/gkrellm-sysdeps.h
-287
+@@ -139,7 +139,7 @@ void	gkrellm_proc_assign_users(gint n_users);
-288
+ |      the device numbers to an identifying name.  It may also set an order
-289
+ |      value for the name to control the stacking order of the disk chart.
-290
+ |  If gkrellm_disk_assign_data_by_name() is used, then an order may be
-291
+-|      optionally specifed with gkrellm_sys_disk_order_from_name().
-292
++|      optionally specified with gkrellm_sys_disk_order_from_name().
-479
+@@ -4029,7 +4036,7 @@ gkrellm_sys_sensors_init(void)
-480
-481
+ 	sensors_nvidia_smi_read(TRUE);
-482
-483
+-	/* nvidia-settings GPU core & ambient temperatues
-484
++	/* nvidia-settings GPU core & ambient temperatures
-485
+ 	*/
-486
+ 	cnt = sensors_nvidia_settings_ngpus();
-487
+ 	ngpus_added = 0;
-488
+diff --git a/src/utils.c b/src/utils.c
--
+index f5300df..0190ed8 100644
-+
+index f6162e9..0190ed8 100644
-490
+--- a/src/utils.c
-491
++++ b/src/utils.c
--
+@@ -370,7 +370,8 @@ gkrellm_text_extents(PangoFontDescription *font_desc, gchar *text,
-+
+@@ -276,13 +276,17 @@ gkrellm_format_size_abbrev(gchar *buf, size_t buflen, gfloat size,
-+
+ 	{
-+
+ 	gfloat	abs_size;
-+
+ 	gint	i;
-+
++	int		ret;
-+
-+
+ 	abs_size = (size < 0.0) ? -size : size;
-+
-+
+ 	for (i = 0; i < tbl_size - 1; ++i)
-+
+ 		if (abs_size < tbl[i].limit)
-+
+ 			break;
-+
+-	return snprintf(buf, buflen, tbl[i].format, size / tbl[i].divisor);
-+
++	ret = snprintf(buf, buflen, tbl[i].format, size / tbl[i].divisor);
-+
++	if (ret < 0 || ret >= buflen)
-+
++		return 0;
-+
++	return ret;
-+
+ 	}
-+
-+
-+
+@@ -366,7 +370,8 @@ gkrellm_text_extents(PangoFontDescription *font_desc, gchar *text,
-512
+ 	else
-513
+ 		{
-514
+ 		utf8 = g_locale_to_utf8(text, -1, NULL, NULL, NULL);
-515
+-		pango_layout_set_text(layout, utf8, len);
-516
++		if (utf8)
-517
++			pango_layout_set_text(layout, utf8, len);
-518
+ 		g_free(utf8);
-519
+ 		}
-520
+ 	iter = pango_layout_get_iter(layout);
--
+@@ -460,7 +461,8 @@ gkrellm_gdk_draw_text(GdkDrawable *drawable, PangoFontDescription *font_desc,
-+
+@@ -456,7 +461,8 @@ gkrellm_gdk_draw_text(GdkDrawable *drawable, PangoFontDescription *font_desc,
-522
-523
+ 	layout = gtk_widget_create_pango_layout(gkrellm_get_top_window(), NULL);
-524
+ 	pango_layout_set_font_description(layout, font_desc);
-525
+-	pango_layout_set_text(layout, string, len);
-526
++	if (g_utf8_validate(string, -1, NULL))
-527
++		pango_layout_set_text(layout, string, len);
-528
+ 	gdk_draw_layout(drawable, gc, x, y, layout);
-529
+ 	g_object_unref(layout);
-530
+ 	}

casa-mp-base

Commits

Jira Issues

Add shortcut