Commit Graph

146 Commits

Author SHA1 Message Date
Stefan Gehn 0db8bfd07a Do not scan autofs mount points
Accessing mount points to determine free space actually triggers a
mounting operation of autofs mounts. This results in all autofs mount
points to be always-mounted while gkrellm is running, something which
is hardly desirable.

Thanks to Gerard Neil for submitting this patch.
2013-07-20 14:02:07 +02:00
Stefan Gehn 207a0519ac Do not free nullpointer in Darwin disk reading
Calling CFRelease() on a NULL value is wrong and causes crashes.
This should fix MacPorts ticket #29565.
2011-12-05 17:12:28 +01:00
Stefan Gehn fdc17315b7 Do not include gcrypt.h for newer GnuTLS versions
Not linking against Libgcrypt is not enough, we also should not try to
include headers. This fixes GnuTLS >= 2.12 detection when Libgcrypt
headers are not installed/found.
2011-11-26 20:00:53 +01:00
Stefan Gehn 752e5965b1 Only use Libgcrypt for GnuTLS < 2.12
Only initialize Libgcrypt threading functions on GnuTLS < 2.12 which
does not do this automatically. Also drop explicit linking against
Libgcrypt on newer GnuTLS version.

This should allow GKrellM to work with a GnuTLS that uses Nettle instead
of Libgcrypt as its cryptographic backend.
2011-08-27 16:51:46 +02:00
Bill Wilson 50b126e085 Patch from Neil Booth: Add multiple CPU capability to CPU monitor for
Dragonfly.  Acquired dragonfly.c from web so could apply patch.
I have no clue why I never had a dragonfly.c.
2011-08-08 16:06:26 -05:00
Bill Wilson 40c7cb01ce Store lockfiles under /var/lock/gkrellm-UID directories to make
lockfiles work for multiple users.
2011-08-08 15:53:14 -05:00
Bill Wilson 6365d18ad0 And some more Jindrich Makovicka patch changes for GTK3 compatibility. 2011-08-08 15:48:18 -05:00
Bill Wilson 7fee71d39f More GTK3 compatibility changes in mail.c from Jindrich Makovich 2011-08-08 15:44:46 -05:00
Bill Wilson 873fed3c1e Patch from Jindrich Makovicka: update multiple GKrellM files to compile
with -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE for GTK3 compatibility.
Replaces GtkItemFactory and GtkTooltips.
2011-08-08 15:39:22 -05:00
Bill Wilson 421cb3102e Add nvidia-smi interface to linux.c for getting nvidia GPU temperatures 2011-08-08 15:13:31 -05:00
Stefan Gehn f1d238478d Fix reading of speedfan shared memory area on win64, make the "handle" field a 32bit signed integer instead of a void pointer (whose length differs depending on the arch gkrellm was built for) 2010-10-09 16:14:11 +00:00
Stefan Gehn 065787f24f Merge with gkrellm-2.3.5.tar.bz2 (release tarball) 2010-10-08 06:55:09 +00:00
Stefan Gehn bf3d25c568 Merge with gkrellm-2.3.5-pre2.tar.bz2 2010-10-06 21:38:56 +00:00
Stefan Gehn 6bd26e8401 Allow disk paths of (almost) any length in both gkrellm and gkrellmd.
monitor.c: serve_disk_data() now uses a dynamic buffer for to-be-sent disk-lines instead of relying on a very short static array.
client.c: read_server_setup() now uses a static read buffer that is as big/small as the global server_buf. client_disk_line_from_server() now uses a dynamic string for disk names.
2010-10-06 20:50:45 +00:00
Stefan Gehn c67cf611a6 - gkrellm.h. Bump maximum line-/item-length for config to 512 (needed for long disk names on Darwin).
- src/disk.c, server/monitor.c: Add gkrellm_disk_add_by_name() that allows creating disks with a custom label from sysdep code.
- src/Makefile, server/Makefile: Cleanup of darwin/darwin9/macosx targets. All custom variables are now set in src/Makefile and server/Makefile to allow easy building inside these subdirs. Removed very old link-flags which were used before OS X 10.3.
- All Makefiles: Remove unused GTK_CONFIG definitions, they were neither passed as an argument nor executed anywhere.
- Makefile: Update comments documenting Darwin and OS X targets (darwin, darwin9 and macosx)
- src/sysdeps/darwin.c: Use utmpx instead of deprecated utmp.
- src/sysdeps/darwin.c: Fix possible leak in gkrellm_sys_cpu_init(), pinfo was never free'd.
- src/sysdeps/darwin.c: Rewrite disk device enumeration and performance gathering. The previous implementation failed as soon as a single device contained no medium, resulting in no/wrong performance data for all subsequent devices. Also provides labels for krells based on real device-names (uses new gkrellm_disk_add_by_name()).
2010-09-23 15:31:24 +00:00
Stefan Gehn d36c3ec662 Fix missing format-strings to avoid compiler warnings 2010-09-23 15:06:21 +00:00
Stefan Gehn 8dbee76730 win32.c: Drop current working directory from DLL search path by calling SetDllDirectory() with an empty string. Avoids possible security problems, especially when loading plugins.
Makefile, win32.c: Load ntdll.dll and lookup used functions at runtime (safer for future windows version and fixes unintended linking against sscanf() from ntdll)
win32.c: Add gkrellm_sys_inet_cleanup() for proper unloading of iphlpapi.dll
2010-09-20 20:53:48 +00:00
Stefan Gehn a457f7a3e1 INSTALL: Slightly update win32 build instructions
ChangeLog: Add and clarify win32-related changes
win32-resource.rc: Bump version number to 2.3.5
2010-09-15 16:14:11 +00:00
Stefan Gehn d72d689c4c Merge with changes from gkrellm-2.3.5-pre.tar.bz2 2010-09-15 15:32:14 +00:00
Stefan Gehn 1cce0cd3c9 Improve fix for building with mingw-w64 environment (#ifdef check for mingw-w64 env did not work for 32 bit builds) 2010-06-30 07:55:33 +00:00
Stefan Gehn 915d03ad66 Do not link against liblargeint on windows anymore. Allow overriding windres via environment variables (preparation for win64 builds) 2010-06-21 14:49:40 +00:00
Stefan Gehn 61ef995a7c Fix building with mingw-w64 environment which contains some updated windows-heeaders. Remove dependency on liblargeint which does not exist on win64 and is unneeded as gcc has native 64bit integer support. 2010-06-21 14:47:25 +00:00
Stefan Gehn f3c095a4f6 Correct email address 2010-06-13 17:54:28 +00:00
Stefan Gehn 07551c6fe9 Fix enumeration of fstab-entries in gkrellmd (fstab entries were only sent to a client if fstab was marked as modified, unfortunately this is never the case on win32). Fixes #3.
Remove parsing of "--debug-level" in get_args(), it is already parsed in parse_config()
Make "-d" commandline option the short version for "--detach" only. Before it was also used as a short version for "--debug-level"
2010-06-13 13:40:20 +00:00
Stefan Gehn 7e86c76f32 Switch from printf() to GLib/GKrellM logging (gkrellm_debug(), g_warning(), g_message())
Replace sprintf() calls with snprintf() for security reasons.
2010-06-12 19:41:22 +00:00
Stefan Gehn 4ff5bbfeb9 Switch from printf() to gkrellm_debug() and add more debug logging for client-connections 2010-06-12 19:39:28 +00:00
Stefan Gehn 22fd09df22 Fix time formatting on win32 for monthly stats. Switch to glib/gkrellm debug logging. 2010-06-12 19:34:04 +00:00
Stefan Gehn ce0158f031 Support monitoring of active IPv6 TCP connections on windows vista or newer now that GKrellM can be built with IPv6 support on win32 2010-06-12 19:32:16 +00:00
Stefan Gehn 836310c392 Enable IPv6-support on win32 if target os is windows xp or newer (win2k lacks needed functions) 2010-06-12 19:26:34 +00:00
Stefan Gehn bf40ec1d5d Allow passing linker flags via LDFLAGS in Makefile 2010-06-12 14:10:52 +00:00
Stefan Gehn 53e036319d Revert accidental commit for Makefile 2010-05-29 17:35:38 +00:00
Stefan Gehn bc8303d229 - svn-ignore built executables 2010-05-29 17:34:38 +00:00
Stefan Gehn 74b3dc6e03 - Use glib mutex functions for GnuTLS for portability reasons
- Fix IMAP login by escaping backslash and double-quotes in username, password and mailbox strings
2010-05-29 17:33:39 +00:00
Stefan Gehn b78ad60b43 - Display --help output in a dialog on windows, a windows-application has no (easy) way to output on a console, even if it was started on one 2010-05-29 14:42:28 +00:00
Stefan Gehn 4a13a74c93 - Handle errors returned by pkg-config and compiler calls more gracefully, instead of having to pass in a bunch of --disable-foo switches the configure script will simply continue working if OpenSSL/GnuTLS/LibNTLM or libsensors were not found. This is more in-line with the usual autoconf scripts and still allows disabling certain features if somebody has i.e. OpenSSL but does not want to build gkrellm with OpenSSL-support. 2010-05-29 13:22:35 +00:00
Stefan Gehn 0f9bc83d54 - Bump version to 2.3.4 in windows resource files 2010-05-29 13:19:39 +00:00
Stefan Gehn fcd0b544e4 - Merge with gkrellm-2.3.4 from upstream 2010-05-29 12:49:28 +00:00
Stefan Gehn 41370ff5d4 - src/Makefile: Rename SMC_LIBS to X11_lIBS and add -lX11 (should fix http://bugs.debian.org/554553)
- Makefile: Drop duplicating SMC_LIBS in "netbsd" targets by calling src/Makefile with "netbsd" target instead of using the generic "gkrellm" target
2010-01-03 17:36:15 +00:00
Stefan Gehn 7db73ae16d sysdeps/win32.c: Drop manual WTSAPI definitions, they are part of MinGW w32api 3.14 and newer
sysdeps/win32.c: Silence compiler warnings (unsigned char vs. char in sensors code)
2009-12-30 14:56:17 +00:00
Stefan Gehn 25076e8a0f - Merge in missing changes from gkrellm-2.3.3 release
- Revert gkrellm version header change, there are too many places in code/docs containing the version number, one more or less will not hurt
- configure: Make configure shell script write configure.mk and move logic for compiler and linker flags into configure
- configure: Also search openssl and libntlm via pkg-config and fall back to hardcoded library names for linking if not found
- Makefile: Workaround environment-bugs in win32 toolchain by switching from "override CC" to a normal makefile rule for building .o from .c files
2009-12-27 11:48:30 +00:00
Stefan Gehn a9c193f84c Merge with gkrellm-2.3.3 from upstream 2009-12-26 17:08:15 +00:00
Stefan Gehn a7ea973741 - Win32: enumerate users using WTS-API. NOTE: This makes GKrellM require Win XP or newer, code for Win 2k is still present though (depends on value of _WIN32_WINNT) 2009-12-26 15:11:13 +00:00
Stefan Gehn 0cc981108b - Make gkrellm client disconnect from server on exit 2009-12-26 15:08:00 +00:00
Stefan Gehn c8c1591363 - Wait up to 10 seconds for a running SpeedFan that has not detected its sensors yet (SHM file reports 0 sensors)
- Add debug output for sensor init on win32
2008-12-28 15:59:37 +00:00
Stefan Gehn a1bc3c7aae - Unify my own email address around gkrellm-sourcecode, translations are not updated due to gettext problems on win32 2008-12-28 14:51:59 +00:00
Stefan Gehn a65d08d0c5 - Forgot to update argument list when switching gkrellm_store_chartdata() to gkrellm_store_chartdatav() 2008-12-27 15:46:09 +00:00
Stefan Gehn abcce9a6b1 - add gkrellm_store_chartdatav() that takes a va_list instead of varargs. This fixes a potential crash caused by plugins using gkrellm_store_chartdata on win32 (same problem as with gkrellm_debug(), the win32 plugin-interface needs a va_list version of every vararg function in gkrellm). 2008-12-27 13:21:11 +00:00
Stefan Gehn 0d35922472 - Add gkrellm_debugv() function to fix gkrellm_debug() for win32-plugins. Forwarding var args is not possible with plain C 2008-12-26 10:47:29 +00:00
Stefan Gehn eb074fa36e - export gkrellm_debug() function to plugins 2008-12-23 20:14:11 +00:00
Stefan Gehn a5194a3488 - Unify search-paths for plugins and themes in both gkrellm and gkrellmd on win32 2008-12-17 14:12:21 +00:00
Stefan Gehn e09fe90ef8 - Remove "rc2" from version number
- Update (own) email-address in "about" tab
2008-12-17 09:39:18 +00:00
Stefan Gehn 2cf2afc458 - comment out all options in default gkrellmd.conf so it can be installed without causing any trouble
- move gkrellm[d] version into its own header
- win32: determine version from headers instead of hardcoding them in the .rc files
2008-10-29 16:02:13 +00:00
Stefan Gehn 3d405b9970 - Use glib wrappers for fopen/stat/chmod/unlink, fixes file operations for win32 where glib uses utf-8 for all file-handling
- win32: remove company name from exe headers as there's no company behind GKrellM
2008-10-28 19:02:04 +00:00
Stefan Gehn 5e176b0ed0 - win32: fix transmit bytes for network interfaces, wrong pdh-counter index was used 2008-10-28 11:05:52 +00:00
Stefan Gehn 902e9ce6ab - win32: Makefile: install binaries into standard "bin" directory as done on unix and make standard value for INSTALL variable work on win32/msys as well (INSTALL=install somehow calls the wrong install binary for me)
- win32: main.c: simplify locating the locales directory
2008-10-24 18:34:38 +00:00
Stefan Gehn b2670d098c - fix taskbar-entry being visible with gtk+ 2.14.4 by setting the toolwindow window-type using standard gtk-functions 2008-10-24 18:27:35 +00:00
Stefan Gehn 5f33ee8501 - Temporarily remove message dialog with warning about connection problems, it causes lockups when executed from the reconnect thread 2008-10-08 18:59:28 +00:00
Stefan Gehn a2d37af516 - get libntlm cflags/libs from pkg-config 2008-10-04 19:08:15 +00:00
Stefan Gehn 804e456c03 - Merge in gkrellm-2.3.2 release changes 2008-10-04 08:55:47 +00:00
Stefan Gehn 54aa6d29fb - win32.c: Add warning about missing performance counter names (may happen if perflib is broken) 2008-10-03 16:27:46 +00:00
Stefan Gehn b067125f1c - lower minimum required gtk+ version to 2.4 by removing the (hopefully) only call to a gtk+-2.6 function
- merge in translation changes from gkrellm-2.3.2 snapshot (forgot pl.po)
2008-10-03 12:06:33 +00:00
Stefan Gehn d8c30ffddb - Bump copyright year, version information and minimum gtk+ version in various files 2008-09-30 17:37:03 +00:00
Stefan Gehn 4d8e49b535 - move gkrellm.ico where it belongs 2008-09-30 17:11:16 +00:00
Stefan Gehn 8cddbba126 - main.c: Do not use gkrellm xpm-icon on win32, gkrellm on windows as an icon of its own that is set via win32-resource.rc 2008-09-30 16:57:07 +00:00
Stefan Gehn 2119506e02 - Switch from deprecated GtkCombo to GtkComboBox (new since GTK+ 2.4) 2008-09-30 16:50:17 +00:00
Stefan Gehn 2ac45ba0de - win32.c: reformatting parts of the code and cleaning out the ugly PTYPE syntax from win32-api
- win32.c: use win32 constants for buffers holding counter names or paths
2008-09-30 16:48:09 +00:00
Stefan Gehn cb4a2344eb - utils.c: Fix gkrellm_gtk_entry_get_text() default return value (empty string was allocated on the stack and is now a proper static variable) 2008-09-30 14:51:48 +00:00
Stefan Gehn e03fa87217 - Makefile: Add GTK+ version check (>= 2.6) 2008-09-30 14:42:40 +00:00
Stefan Gehn 25470669c3 - winops-win32.c: remove unneded include 2008-09-30 14:41:30 +00:00
Stefan Gehn 1ea1c2c6b6 - win32.c: Try to give unique names to disk/network in case the truncated names start conflicting with eachother 2008-09-29 20:57:01 +00:00
Stefan Gehn 6a6925312a - Show message dialog when initial connect to server fails in client-mode, instead of only printing a line on stdout which is invisible on most windowing-systems anyway 2008-09-29 08:35:02 +00:00
Stefan Gehn 6fc301ca06 - merge in changes from gkrellm 2.3.2 snapshot (fetched 2008-09-27) 2008-09-28 18:06:24 +00:00
Stefan Gehn 37c7f836ef - make use of new logging system in gkrellm
- removed trayicon on windows as it did not serve any purpose
- win32: load locale files from installation path
- sysdeps/win32.c: massively decreased length by refactoring
- sysdeps/win32.c: use unicode function-calls for better compatibility with non-ascii locales
- sysdeps/win32.c: format debug and warning messages that contain win32 error-codes and provide extensive error handling
- sysdeps/win32.c: completely redid sensor-handling that allows supporting multiple sensor-backends at the same time (like on unix) and optionally launch sensor-apps if they're in $PATH. Sensor detection is now properly done at gkrellm-startup
- sysdeps/win32.c: support CoreTemp application for getting cpu temperatures
- sysdeps/win32.c: proc stats are finally working. Load-computation is based on the number of processes in the processor waiting-queue
- sysdeps/win32.c: properly count number of logged in users by only counting "interactive logins"
- sysdeps/win32.c: memory stats now also monitor cache bytes on winxp and newer (not available on win2k)
- sysdeps/win32.c: system name updated with some new windows versions. Also allow proper OS-detection on 64bit-OS when running as a 32bit-app
2008-09-28 17:27:06 +00:00
Stefan Gehn 32a20aeaef 2008-09-28 17:16:35 +00:00
Stefan Gehn 5b78e499ca - mem.c: use GtkComboBox instead of deprecated GtkCombo
- net.c: use GtkComboBox instead of deprecated GtkCombo
2008-09-28 17:15:54 +00:00
Stefan Gehn 3b0cc0e0dc - mail.c: use new tooltip api when compiling with gtk >= 2.12.0
- mail.c: default to "multiple launch mua" on win32 (makes more sense)
- mail.c: also display error on failed mua launch when "multiple launch mua" is on
2008-09-28 14:09:07 +00:00
Stefan Gehn 937234774e - inet.c: fix return value of gkrellm_init_inet_monitor(), remove unneded gtk_widget_show() call 2008-09-28 14:03:10 +00:00
Stefan Gehn ed3006988a - disk.c: use GtkComboBox instead of deprecated GtkCombo 2008-09-28 13:57:12 +00:00
Stefan Gehn 0c92661ace - cpu.c: use GtkComboBox instead of deprecated GtkCombo 2008-09-28 13:54:46 +00:00
Stefan Gehn f1142e38e6 - config.c: switch to g_warning() for reporting errors 2008-09-28 13:52:30 +00:00
Stefan Gehn 960902fc52 - fix memory leaks, clock/calendar strings were never freed 2008-09-28 13:51:24 +00:00
Stefan Gehn f7b708e432 - fix winsock includes in client.c 2008-09-28 13:50:02 +00:00
Stefan Gehn 7196f279df - scrolling chartdata bitmap works on all recent GTK+ version on win32, remove workaround that forced a full redraw on every scroll 2008-09-28 13:49:11 +00:00
Stefan Gehn bbe16bd885 - win32.c: dynamically allocate resources for cpu-, network- and disk-monitoring, allowing any number of cpus, disks and network-devices.
- win32.c: switch from printf() to g_print() and g_printerr() for debug- and error-output
- win32.c: update OS name detection for vista and server 2008, remove unsupported OSes (9x, ME)
2008-05-25 11:59:22 +00:00
Stefan Gehn 0d055e759c - Set executable bits in svn repos 2008-04-08 09:38:48 +00:00
Stefan Gehn f0bc117fb4 - gkrellmd: clean up service install/uninstall, also start the service after install and stop a running service prior to uninstall
- Makefile: append binary extension on platforms that need it (i.e. win32), needed for new MSYS build-environment
2008-03-25 18:42:25 +00:00
Stefan Gehn b5ad32c190 - Merge in changes for macosx with native gtk+ 2008-02-10 13:30:48 +00:00
Stefan Gehn 0db0b41476 - win32: more error handling for failed system-calls
- win32: prepare code for unicode compilation
2008-02-08 22:33:37 +00:00
Stefan Gehn 1cdd02d10b - Fix date/time formatting for network stats gui on win32 2008-02-01 20:36:10 +00:00
Stefan Gehn c90b8b8830 - Fix date/time formatting on win32
- port clock gui from GtkCombo to non-deprecated GtkComboBox
2008-02-01 20:34:39 +00:00
Stefan Gehn bdba94298d - Add warning message for failed rename call when saving config
- Fix config saving on win32 (unlink old config before renaming the temporary/new one)
2008-02-01 19:29:13 +00:00
Stefan Gehn 2587c4a1df - Fix make dependencies for sysdeps folder (win32.c was missing) 2008-02-01 19:26:56 +00:00
Stefan Gehn 55f14c99cf - win32-plugin.c: fix typo/merge error 2008-02-01 19:25:46 +00:00
Stefan Gehn 87b9b46b37 - own win32 resource-file for gkrellm (client)
- demand admin-rights on startup (done via manifest file)
2008-02-01 19:13:51 +00:00
Stefan Gehn 4437aea144 - add many return value checks and error-messages for system-calls
- fix memory-leak when reading tcp-connection stats
2008-02-01 19:11:29 +00:00
Stefan Gehn 81d79d6568 2008-02-01 18:36:15 +00:00