<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8a06a30e4051547e2a42c3d77334a42e08f90c2">https://github.com/macports/macports-ports/commit/b8a06a30e4051547e2a42c3d77334a42e08f90c2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b8a06a3 gkrellm: add commits from 2.3.10 onward from git master branch
</span>b8a06a3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b8a06a30e4051547e2a42c3d77334a42e08f90c2
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Thu Feb 15 19:16:05 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gkrellm: add commits from 2.3.10 onward from git master branch
</span>---
sysutils/gkrellm/Portfile | 4 +
sysutils/gkrellm/files/patch-master-commits.diff | 477 +++++++++++++++++++++++
2 files changed, 481 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/Portfile b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 236ddb4..a44b26f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name gkrellm
version 2.3.10
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories sysutils
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +27,9 @@ depends_build port:pkgconfig
</span> depends_lib port:gtk2 \
port:xorg-libsm
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-master-commits.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/files/patch-master-commits.diff b/sysutils/gkrellm/files/patch-master-commits.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7e8f5f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gkrellm/files/patch-master-commits.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,477 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Changelog b/Changelog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b078036..ee52938 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Changelog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Changelog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@ GKrellM Changelog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Patch from Gerard Neil: Skip autofs mounts in free disk space polling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Patch from Gerard Neil: Handle cifs as remote filesystem to use longer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nfs-timeout polling interval
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Patch from Alexandre Rostovtsev: Explicitely link against gmodule-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Patch from Alexandre Rostovtsev: Explicitly link against gmodule-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Add support for GPU-Z sensor information on Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Increase minimum required GLib version to 2.32, some parts of gkrellm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use newer GLib API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,7 +151,7 @@ GKrellM Changelog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Use unicode function calls.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Use getaddrinfo() on win32.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Support CoreTemp application for getting cpu temperatures.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Redo sensor-handling to support multipe sensor backends.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Redo sensor-handling to support multiple sensor backends.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Make Proc monitor work and properly count # of logged in users.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Mem monitor displays cache bytes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ System name shows some new windows versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/README b/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 84df8ac..b8f59d4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -549,7 +549,7 @@ The reasons for this choice are a) efficiency (though it might be possible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to open/close /dev/sysmon each time a reading is needed without major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ performance issue) and b) as of october 2001, there's a bug in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ envsys(4) driver which sometimes causes deadlocks when processes try to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-access simultaneoulsy /dev/sysmon (see NetBSD PR#14368). A (quick and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++access simultaneously /dev/sysmon (see NetBSD PR#14368). A (quick and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dirty) workaround for this is to monopolize the driver :)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Themes.html b/Themes.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9975120..e411ec3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Themes.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Themes.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -719,7 +719,7 @@ krell parameters, frame rendering, etc are made in the gkrellmrc file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Setting these values may have a variable effect on different monitors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ because the programmer may use the values to differing degrees. For
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ example, margins may affect a label or some text decal but not affect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-other text decals because the programmer explicitely centers the decal.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++other text decals because the programmer explicitly centers the decal.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <p>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The possible gkrellmrc lines are listed here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <p>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gkrellmd.1 b/gkrellmd.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 073a665..032e775 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gkrellmd.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gkrellmd.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -192,7 +192,7 @@ arguments may be given. If no hosts are specified on the command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ line or in a gkrellmd.conf file, then all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hosts are allowed to connect. The
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .I hostname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-argument may be a text name or a IPv4 or IPv6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++argument may be a text name or an IPv4 or IPv6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dotted notation. For IPv4, the simple subnet pattern x.y.z.* may be used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Also, if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .I hostname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/server/mail.c b/server/mail.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 83a8a7b..d7929f9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/server/mail.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/server/mail.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,7 +324,7 @@ check_maildir(Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | But, new mail arriving (writing mailbox) sets st_mtime while reading
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | the mailbox (mail program reading) sets st_atime. So the test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | st_atime > st_mtime is testing if mbox has been read since last new mail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | Mail readers may restore st_mtime after writting status.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | Mail readers may restore st_mtime after writing status.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | And Netscape mail does status with X-Mozilla-Status: xxxS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | where S is bitwise or of status flags:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | 1: read 2: replied 4: marked 8: deleted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/server/main.c b/server/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8851e13..1c1f22e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/server/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/server/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1124,18 +1124,28 @@ detach_from_terminal(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !defined(WIN32) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ drop_privileges(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (drop_privs.gid > (uid_t)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (void) setgroups((size_t)0, (gid_t*)0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (void) setgid(drop_privs.gid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ r = setgroups((size_t)0, (gid_t*)0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (r != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ r = setgid(drop_privs.gid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (r != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (drop_privs.uid > (uid_t)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (void) setuid(drop_privs.uid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ r = setuid(drop_privs.uid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (r != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1201,7 +1211,12 @@ gkrellmd_run(gint argc, gchar **argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make_pidfile();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_main_init();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- drop_privileges();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (drop_privileges() != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_warning("Failed to drop privileges: %s\n", strerror(errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_sys_main_cleanup();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _GK.start_time = time(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_GK.update_HZ < 1 || _GK.update_HZ > 10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/server/monitor.c b/server/monitor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3e3eec9..1a7fa45 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/server/monitor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/server/monitor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2018,7 +2018,7 @@ init_sensors_monitor(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ======================================================= */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static time_t base_uptime,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ up_seconds;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static gulong up_minutes = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static glong up_minutes = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_uptime_set_base_uptime(time_t base)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2029,16 +2029,16 @@ gkrellm_uptime_set_base_uptime(time_t base)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ update_uptime(GkrellmdMonitor *mon, gboolean first_update)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint prev_up;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glong prev_up;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (GK.ten_second_tick || up_minutes < 0 || first_update)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prev_up = up_minutes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ up_seconds = gkrellm_sys_uptime_read_uptime();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (up_seconds > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- up_minutes = (gint) (up_seconds / 60);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ up_minutes = (glong) (up_seconds / 60);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- up_minutes = (gint)(time(0) - _GK.start_time + base_uptime) / 60;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ up_minutes = (glong)(time(0) - _GK.start_time + base_uptime) / 60;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (up_minutes != prev_up)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellmd_need_serve(mon);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2050,7 +2050,7 @@ serve_uptime_data(GkrellmdMonitor *mon, gboolean first_serve)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar buf[128];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellmd_set_serve_name(mon, "uptime");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- snprintf(buf, sizeof(buf), "%lu\n", (gulong) up_minutes);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ snprintf(buf, sizeof(buf), "%ld\n", (glong) (up_minutes >= 0 ? up_minutes : 0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellmd_serve_data(mon, buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/shared/log.c b/shared/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 44a429c..6d47993 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/shared/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/shared/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@ gkrellm_log_file_cleanup()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gkrellm_log_file_log(GLogLevelFlags log_level, const gchar *message)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gkrellm_log_file_log(G_GNUC_UNUSED GLogLevelFlags log_level, const gchar *message)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_t raw_time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *local_time_str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,11 +160,11 @@ gkrellm_log_to_terminal(GLogLevelFlags log_level, const gchar *message)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! Handler that receives all the log-messages first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gkrellm_log_handler(const gchar *log_domain, GLogLevelFlags log_level,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const gchar *message, gpointer user_data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gkrellm_log_handler(G_GNUC_UNUSED const gchar *log_domain, GLogLevelFlags log_level,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const gchar *message, G_GNUC_UNUSED gpointer user_data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *localized_message;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmLogFacility *f;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ localized_message = g_locale_from_utf8(message, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,7 +206,7 @@ gkrellm_log_init()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_log_cleanup()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmLogFacility *f;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!s_log_facility_ptr_array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,7 +231,7 @@ gkrellm_log_register(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmLogCleanupFunc cleanup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmLogFacility *f;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!s_log_facility_ptr_array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return FALSE; // gkrellm_log_init() not called yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@ gkrellm_log_register(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_log_unregister(GkrellmLogFunc log)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmLogFacility *f;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!s_log_facility_ptr_array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/battery.c b/src/battery.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bacd3cd..40d4198 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/battery.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/battery.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,7 +382,7 @@ estimate_battery_time_left(Battery *bat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* charging, use exponential: eta =~ 2.5 * time-constant (~=92%) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eta = -2.5 * dt/60 / (log(1 - (gdouble)dp/(gdouble)(p+dp)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eta = abs((gdouble)p / rate); /* use linear */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eta = fabs((gdouble)p / rate); /* use linear */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef BAT_ESTIMATE_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "eta = %.2f\t", eta);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/fs.c b/src/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 626bc74..6c73f41 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -460,7 +460,7 @@ fs_draw_decal_text(FSmon *fs, gint value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmDecal *d;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmTextstyle ts_save;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar buf[128];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint x_off, w;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gint x_off, w = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gkrellm-sysdeps.h b/src/gkrellm-sysdeps.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9a0f8fc..07295fb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gkrellm-sysdeps.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gkrellm-sysdeps.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,7 @@ void gkrellm_proc_assign_users(gint n_users);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | the device numbers to an identifying name. It may also set an order
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | value for the name to control the stacking order of the disk chart.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | If gkrellm_disk_assign_data_by_name() is used, then an order may be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-| optionally specifed with gkrellm_sys_disk_order_from_name().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| optionally specified with gkrellm_sys_disk_order_from_name().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | (the default order of -1 simply appends disk charts as data for them
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | is reported). After this function is called for a disk, the function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | gkrellm_disk_subdisk_assign_data_by_name() may be called for subdisk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gui.c b/src/gui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 406f2e9..68a43e6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1569,7 +1569,7 @@ gkrellm_save_theme_config(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Assume gkrellm -t is for testing and don't save theme config changes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | Similary for _GK.demo.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | Similarly for _GK.demo.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!theme_modified || _GK.command_line_theme || _GK.demo || _GK.no_config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/krell.c b/src/krell.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 697c4a0..07a1a1d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/krell.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/krell.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -663,7 +663,7 @@ reset_text_layer_pixmap_decal_region(GkrellmPanel *p, GkrellmDecal *d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | a decal's extents. So when scrolling, a slow Pango redraw at each scroll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | step can be avoided if the text string has not changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | There are a couple of limitations because it's impossible to generate a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | stencil bitmask of Pango rendered text (Pango doesn't allow writting to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | stencil bitmask of Pango rendered text (Pango doesn't allow writing to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | depth 1 and it looks at the background pixmap colors as it renders):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | 1) A scroll text decal is not transparent and will hide any objects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | underneath it, so when this condition is detected, scroll drawing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mail.c b/src/mail.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a47cf01..51e53a6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mail.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mail.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -814,12 +814,36 @@ tcp_shutdown(ConnInfo *conn, Mailbox *mbox, gchar *message, gboolean warn)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssl_negotiate(ConnInfo *conn, Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const SSL_METHOD *ssl_method;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const SSL_METHOD *ssl_method = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gchar buf[128];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssl_method = TLS_client_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_debug("ssl_negotiate( %s ): will use TLS client method\n", buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (mbox->account->use_ssl == SSL_TRANSPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssl_method = SSLv23_client_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_debug("ssl_negotiate( %s ): will use SSLv23 client method\n", buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssl_method = TLSv1_client_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_debug("ssl_negotiate( %s ): will use TLSv1 client method\n", buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ssl_method == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return tcp_shutdown(conn, mbox,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ N_("Cannot initialize SSL method."),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1251,7 +1275,11 @@ check_imap(Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_SSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (account->use_ssl == SSL_STARTTLS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_debug(DEBUG_MAIL, "check_imap: Issuing STARTTLS\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_debug("check_imap( %s ): issuing STARTTLS\n", buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf(line, sizeof(line), "a%03d STARTTLS\r\n", ++seq);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ server_command(&conn, mbox, line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf(line, sizeof(line), "a%03d OK", seq);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1261,7 +1289,11 @@ check_imap(Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ssl_negotiate(&conn, mbox))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_debug(DEBUG_MAIL, "check_imap: STARTTLS successful\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_debug("check_imap( %s ): STARTTLS successful\n", buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1560,7 +1592,7 @@ check_maildir(Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | But, new mail arriving (writing mailbox) sets st_mtime while reading
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | the mailbox (mail program reading) sets st_atime. So the test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | st_atime > st_mtime is testing if mbox has been read since last new mail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | Mail readers may restore st_mtime after writting status.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | Mail readers may restore st_mtime after writing status.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | And Netscape mail does status with X-Mozilla-Status: xxxS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | where S is bitwise or of status flags:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | 1: read 2: replied 4: marked 8: deleted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mem.c b/src/mem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2f85935..c130aa4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,7 +299,7 @@ draw_decal_label(MeminfoMeter *mm, gint draw_to_screen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmDecal *d;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GkrellmTextstyle ts_save;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar buf[128];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint x_off, w;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gint x_off, w = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d = mm->decal_label;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! mm->label_is_data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/proc.c b/src/proc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a813066..80887b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/proc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/proc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,7 +347,7 @@ setup_proc_scaling(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ res = gkrellm_get_chartconfig_grid_resolution(cp->config);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Since grid_resolution is set for load, set krell_full_scale explicitely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Since grid_resolution is set for load, set krell_full_scale explicitly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | to get what I want, which is 10 forks full scale.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | When res or number of grids is changed, scale all fork data to keep a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | fixed 50 forks/sec max on the chart.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/sensors.c b/src/sensors.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9482874..80a43e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/sensors.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/sensors.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1669,7 +1669,7 @@ gkrellm_init_sensor_monitor(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | to composite CPU on a SMP machine.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | 2.1.15 scales sensor factor/offset values by SENSOR_FLOAT_FACTOR to avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | writting decimal points in the config. This is not backwards compatible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | writing decimal points in the config. This is not backwards compatible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | with the pre 2.1.15 sensor_config format hence the config file name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | change to sensor-config. But sensor_config is forward compatible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | since the float factor defaults to 1.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/sysdeps/linux.c b/src/sysdeps/linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c82dfaf..921cf63 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/sysdeps/linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/sysdeps/linux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -556,6 +556,8 @@ gkrellm_sys_disk_order_from_name(const gchar *name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i >= table_size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (i > 9) /* > hda */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ i += (i - 10) * 16 + suffix - dm->suffix_base;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1523,7 +1525,7 @@ gkrellm_sys_fs_get_mounts_list(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (fgets(buf, sizeof(buf), f))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dev[0] = dir[0] = type[0] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sscanf(buf, "%512s %512s %127s", dev, dir, type);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sscanf(buf, "%511s %511s %127s", dev, dir, type);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix_fstab_name(dev);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix_fstab_name(dir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix_fstab_name(type);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3155,6 +3157,7 @@ sensors_nvidia_smi_read(gboolean setup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || !strcmp(id, ":")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stmp = str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((str = g_strstr_len(str, -1, "Temperature")) != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str += 11;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3183,6 +3186,10 @@ sensors_nvidia_smi_read(gboolean setup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if ((smi = nvidia_smi_lookup(id)) != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ smi->temp = temp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ str = stmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (output)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4029,7 +4036,7 @@ gkrellm_sys_sensors_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sensors_nvidia_smi_read(TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* nvidia-settings GPU core & ambient temperatues
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* nvidia-settings GPU core & ambient temperatures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cnt = sensors_nvidia_settings_ngpus();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ngpus_added = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/utils.c b/src/utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f5300df..0190ed8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -370,7 +370,8 @@ gkrellm_text_extents(PangoFontDescription *font_desc, gchar *text,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utf8 = g_locale_to_utf8(text, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pango_layout_set_text(layout, utf8, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (utf8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pango_layout_set_text(layout, utf8, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(utf8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iter = pango_layout_get_iter(layout);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -460,7 +461,8 @@ gkrellm_gdk_draw_text(GdkDrawable *drawable, PangoFontDescription *font_desc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ layout = gtk_widget_create_pango_layout(gkrellm_get_top_window(), NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_layout_set_font_description(layout, font_desc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pango_layout_set_text(layout, string, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (g_utf8_validate(string, -1, NULL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pango_layout_set_text(layout, string, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdk_draw_layout(drawable, gc, x, y, layout);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_object_unref(layout);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>