Tagged 1.0.2.

Don't use gtk-stock icons (they're deprecated).

Makefile.am

@@ -158,37 +158,66 @@ win-dist-prepare: all
 # 	$(MKDIR_P) win-dist/share/icons
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/hicolor win-dist/share/icons
 
-#	needed for window titlebar (if using client-side decorations)
-# 	$(MKDIR_P) win-dist/share/icons/Adwaita/16x16/actions
+#	needed for window titlebar (if using client-side decorations),
+#	tree sorting indicators, GUI icons.
+	$(MKDIR_P) win-dist/share/icons/Adwaita/16x16/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/actions/window-close-symbolic.symbolic.png win-dist/share/icons/Adwaita/16x16/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/actions/window-maximize-symbolic.symbolic.png win-dist/share/icons/Adwaita/16x16/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/actions/window-minimize-symbolic.symbolic.png win-dist/share/icons/Adwaita/16x16/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/actions/window-restore-symbolic.symbolic.png win-dist/share/icons/Adwaita/16x16/actions
-# 	$(MKDIR_P) win-dist/share/icons/Adwaita/24x24/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/actions/pan-down-symbolic.symbolic.png win-dist/share/icons/Adwaita/16x16/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/actions/pan-up-symbolic.symbolic.png win-dist/share/icons/Adwaita/16x16/actions
+	$(MKDIR_P) win-dist/share/icons/Adwaita/16x16/status
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/status/dialog-information.png win-dist/share/icons/Adwaita/16x16/status
+	$(MKDIR_P) win-dist/share/icons/Adwaita/22x22/status
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/22x22/status/dialog-information.png win-dist/share/icons/Adwaita/22x22/status
+	$(MKDIR_P) win-dist/share/icons/Adwaita/24x24/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/24x24/actions/window-close-symbolic.symbolic.png win-dist/share/icons/Adwaita/24x24/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/24x24/actions/window-maximize-symbolic.symbolic.png win-dist/share/icons/Adwaita/24x24/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/24x24/actions/window-minimize-symbolic.symbolic.png win-dist/share/icons/Adwaita/24x24/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/24x24/actions/window-restore-symbolic.symbolic.png win-dist/share/icons/Adwaita/24x24/actions
-# 	$(MKDIR_P) win-dist/share/icons/Adwaita/32x32/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/24x24/actions/pan-down-symbolic.symbolic.png win-dist/share/icons/Adwaita/24x24/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/24x24/actions/pan-up-symbolic.symbolic.png win-dist/share/icons/Adwaita/24x24/actions
+	$(MKDIR_P) win-dist/share/icons/Adwaita/24x24/status
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/24x24/status/dialog-information.png win-dist/share/icons/Adwaita/24x24/status
+	$(MKDIR_P) win-dist/share/icons/Adwaita/32x32/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/32x32/actions/window-close-symbolic.symbolic.png win-dist/share/icons/Adwaita/32x32/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/32x32/actions/window-maximize-symbolic.symbolic.png win-dist/share/icons/Adwaita/32x32/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/32x32/actions/window-minimize-symbolic.symbolic.png win-dist/share/icons/Adwaita/32x32/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/32x32/actions/window-restore-symbolic.symbolic.png win-dist/share/icons/Adwaita/32x32/actions
-# 	$(MKDIR_P) win-dist/share/icons/Adwaita/48x48/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/32x32/actions/pan-down-symbolic.symbolic.png win-dist/share/icons/Adwaita/32x32/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/32x32/actions/pan-up-symbolic.symbolic.png win-dist/share/icons/Adwaita/32x32/actions
+	$(MKDIR_P) win-dist/share/icons/Adwaita/32x32/status
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/32x32/status/dialog-information.png win-dist/share/icons/Adwaita/32x32/status
+	$(MKDIR_P) win-dist/share/icons/Adwaita/48x48/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/48x48/actions/window-close-symbolic.symbolic.png win-dist/share/icons/Adwaita/48x48/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/48x48/actions/window-maximize-symbolic.symbolic.png win-dist/share/icons/Adwaita/48x48/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/48x48/actions/window-minimize-symbolic.symbolic.png win-dist/share/icons/Adwaita/48x48/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/48x48/actions/window-restore-symbolic.symbolic.png win-dist/share/icons/Adwaita/48x48/actions
-# 	$(MKDIR_P) win-dist/share/icons/Adwaita/64x64/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/48x48/actions/pan-down-symbolic.symbolic.png win-dist/share/icons/Adwaita/48x48/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/48x48/actions/pan-up-symbolic.symbolic.png win-dist/share/icons/Adwaita/48x48/actions
+	$(MKDIR_P) win-dist/share/icons/Adwaita/48x48/status
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/48x48/status/dialog-information.png win-dist/share/icons/Adwaita/48x48/status
+	$(MKDIR_P) win-dist/share/icons/Adwaita/64x64/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/64x64/actions/window-close-symbolic.symbolic.png win-dist/share/icons/Adwaita/64x64/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/64x64/actions/window-maximize-symbolic.symbolic.png win-dist/share/icons/Adwaita/64x64/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/64x64/actions/window-minimize-symbolic.symbolic.png win-dist/share/icons/Adwaita/64x64/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/64x64/actions/window-restore-symbolic.symbolic.png win-dist/share/icons/Adwaita/64x64/actions
-# 	$(MKDIR_P) win-dist/share/icons/Adwaita/96x96/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/64x64/actions/pan-down-symbolic.symbolic.png win-dist/share/icons/Adwaita/64x64/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/64x64/actions/pan-up-symbolic.symbolic.png win-dist/share/icons/Adwaita/64x64/actions
+# 	$(MKDIR_P) win-dist/share/icons/Adwaita/64x64/status
+# 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/64x64/status/dialog-information.png win-dist/share/icons/Adwaita/64x64/status
+	$(MKDIR_P) win-dist/share/icons/Adwaita/96x96/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/96x96/actions/window-close-symbolic.symbolic.png win-dist/share/icons/Adwaita/96x96/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/96x96/actions/window-maximize-symbolic.symbolic.png win-dist/share/icons/Adwaita/96x96/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/96x96/actions/window-minimize-symbolic.symbolic.png win-dist/share/icons/Adwaita/96x96/actions
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/96x96/actions/window-restore-symbolic.symbolic.png win-dist/share/icons/Adwaita/96x96/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/96x96/actions/pan-down-symbolic.symbolic.png win-dist/share/icons/Adwaita/96x96/actions
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/96x96/actions/pan-up-symbolic.symbolic.png win-dist/share/icons/Adwaita/96x96/actions
+# 	$(MKDIR_P) win-dist/share/icons/Adwaita/96x96/status
+# 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/96x96/status/dialog-information.png win-dist/share/icons/Adwaita/96x96/status
+	$(MKDIR_P) win-dist/share/icons/Adwaita/256x256/status
+	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/256x256/status/dialog-information.png win-dist/share/icons/Adwaita/256x256/status
 
 #	other
 	cp -p "@WINDOWS_SYSROOT@"/bin/libgcc_s_*.dll win-dist/

NEWS

@@ -1,3 +1,8 @@
+Version 1.0.2, released on 2017-07-21
+	Fixed incomplete capturing of smartctl output under Windows.
+	Added missing icons under Windows.
+	Fixed being able to turn on AODC even if unsupported.
+
 Version 1.0.1, released on 2017-06-19
 	Fixed compilation under macOS.
 	Fixed compilation under Fedora Rawhide.

TODO

@@ -28,6 +28,7 @@ Bugs / patches:
 
 TODO:
 
+
 Don't rely on smartctl return code (2), parse the output instead.
 	This will allow us to show the Info page.
 

configure.ac

@@ -1,5 +1,5 @@
 
-AC_INIT([GSmartControl],[1.0.1],[],[gsmartcontrol])
+AC_INIT([GSmartControl],[1.0.2],[],[gsmartcontrol])
 
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])

src/applib/cmdex.cpp

@@ -92,8 +92,10 @@ extern "C" {
 
 bool Cmdex::execute()
 {
-	if (this->running_ || this->stopped_cleanup_needed())
+	DBG_FUNCTION_ENTER_MSG;
+	if (this->running_ || this->stopped_cleanup_needed()) {
 		return false;
+	}
 
 	cleanup_members();
 	clear_errors();
@@ -225,9 +227,11 @@ bool Cmdex::execute()
 
 	this->event_source_id_stdout_ = g_io_add_watch_full(channel_stdout_, io_priority, cond,
 			&cmdex_on_channel_io_stdout, this, NULL);
+// 	g_io_channel_unref(channel_stdout_);  // g_io_add_watch_full() holds its own reference
 
 	this->event_source_id_stderr_ = g_io_add_watch_full(channel_stderr_, io_priority, cond,
 			&cmdex_on_channel_io_stderr, this, NULL);
+// 	g_io_channel_unref(channel_stderr_);  // g_io_add_watch_full() holds its own reference
 
 
 	// If using SPAWN_DO_NOT_REAP_CHILD, this is needed to avoid zombies.
@@ -238,6 +242,7 @@ bool Cmdex::execute()
 
 	this->running_ = true;  // the process is running now.
 
+	DBG_FUNCTION_EXIT_MSG;
 	return true;
 }
 
@@ -247,6 +252,7 @@ bool Cmdex::execute()
 // send SIGTERM(15) (terminate)
 bool Cmdex::try_stop(hz::signal_t sig)
 {
+	DBG_FUNCTION_ENTER_MSG;
 	if (!this->running_ || this->pid_ <= 0)
 		return false;
 
@@ -262,6 +268,7 @@ bool Cmdex::try_stop(hz::signal_t sig)
 	// Possible: EPERM (no permissions), ESRCH (no such process, or zombie)
 	push_error(Error<int>("errno", ErrorLevel::error, errno), false);
 
+	DBG_FUNCTION_EXIT_MSG;
 	return false;
 }
 
@@ -269,6 +276,7 @@ bool Cmdex::try_stop(hz::signal_t sig)
 
 bool Cmdex::try_kill()
 {
+	DBG_TRACE_POINT_AUTO;
 	return try_stop(hz::SIGNAL_SIGKILL);
 }
 
@@ -276,6 +284,7 @@ bool Cmdex::try_kill()
 
 void Cmdex::set_stop_timeouts(int term_timeout_msec, int kill_timeout_msec)
 {
+	DBG_FUNCTION_ENTER_MSG;
 	DBG_ASSERT(term_timeout_msec == 0 || kill_timeout_msec == 0 || kill_timeout_msec > term_timeout_msec);
 
 	if (!this->running_)  // process not running
@@ -288,6 +297,8 @@ void Cmdex::set_stop_timeouts(int term_timeout_msec, int kill_timeout_msec)
 
 	if (kill_timeout_msec != 0)
 		event_source_id_kill = g_timeout_add(kill_timeout_msec, &cmdex_on_kill_timeout, this);
+
+	DBG_FUNCTION_EXIT_MSG;
 }
 
 
@@ -295,6 +306,7 @@ void Cmdex::set_stop_timeouts(int term_timeout_msec, int kill_timeout_msec)
 
 void Cmdex::unset_stop_timeouts()
 {
+	DBG_FUNCTION_ENTER_MSG;
 	if (event_source_id_term) {
 		GSource* source_term = g_main_context_find_source_by_id(NULL, event_source_id_term);
 		if (source_term)
@@ -308,6 +320,7 @@ void Cmdex::unset_stop_timeouts()
 			g_source_destroy(source_kill);
 		event_source_id_kill = 0;
 	}
+	DBG_FUNCTION_EXIT_MSG;
 }
 
 
@@ -315,8 +328,7 @@ void Cmdex::unset_stop_timeouts()
 // executed in main thread, manually by the caller.
 void Cmdex::stopped_cleanup()
 {
-// 	DBG_FUNCTION_ENTER_MSG;
-
+	DBG_FUNCTION_ENTER_MSG;
 	if (this->running_ || !this->stopped_cleanup_needed())  // huh?
 		return;
 
@@ -353,6 +365,7 @@ void Cmdex::stopped_cleanup()
 	cleanup_members();
 
 	this->running_ = false;
+	DBG_FUNCTION_EXIT_MSG;
 }
 
 
@@ -362,7 +375,7 @@ void Cmdex::stopped_cleanup()
 // Called when child exits
 void Cmdex::on_child_watch_handler(GPid arg_pid, int waitpid_status, gpointer data)
 {
-// 	DBG_FUNCTION_ENTER_MSG;
+	DBG_FUNCTION_ENTER_MSG;
 	Cmdex* self = static_cast<Cmdex*>(data);
 
 	g_timer_stop(self->timer_);  // stop the timer
@@ -371,6 +384,25 @@ void Cmdex::on_child_watch_handler(GPid arg_pid, int waitpid_status, gpointer da
 	self->child_watch_handler_called_ = true;
 	self->running_ = false;  // process is not running anymore
 
+	// These are needed because Windows doesn't read the remaining data otherwise.
+	g_io_channel_flush(self->channel_stdout_, NULL);
+	on_channel_io(self->channel_stdout_, GIOCondition(0), self, channel_type_stdout);
+
+	g_io_channel_flush(self->channel_stderr_, NULL);
+	on_channel_io(self->channel_stderr_, GIOCondition(0), self, channel_type_stderr);
+
+	if (self->channel_stdout_) {
+		g_io_channel_shutdown(self->channel_stdout_, false, NULL);
+		g_io_channel_unref(self->channel_stdout_);
+		self->channel_stdout_ = 0;
+	}
+
+	if (self->channel_stderr_) {
+		g_io_channel_shutdown(self->channel_stderr_, false, NULL);
+		g_io_channel_unref(self->channel_stderr_);
+		self->channel_stderr_ = 0;
+	}
+
 	// Remove fd IO callbacks. They may actually be removed already (note sure about this).
 	// This will force calling the iochannel callback (they may not be called
 	// otherwise at all if there was no output).
@@ -394,16 +426,17 @@ void Cmdex::on_child_watch_handler(GPid arg_pid, int waitpid_status, gpointer da
 	if (self->exited_callback_)
 		self->exited_callback_(self->exited_callback_data_);
 
-// 	DBG_FUNCTION_EXIT_MSG;
+	DBG_FUNCTION_EXIT_MSG;
 }
 
 
 
 
 
-gboolean Cmdex::on_channel_io(GIOChannel* source,
+gboolean Cmdex::on_channel_io(GIOChannel* channel,
 		GIOCondition cond, Cmdex* self, channel_t type)
 {
+	DBG_FUNCTION_ENTER_MSG;
 // 	debug_out_dump("app", "Cmdex::on_channel_io("
 // 			<< (type == channel_type_stdout ? "STDOUT" : "STDERR") << ") " << int(cond) << "\n");
 
@@ -420,13 +453,10 @@ gboolean Cmdex::on_channel_io(GIOChannel* source,
 	const gsize count = 1;
 	gchar buf[count] = {0};
 
-	GIOChannel* channel = 0;
 	std::string* output_str = 0;
 	if (type == channel_type_stdout) {
-		channel = self->channel_stdout_;
 		output_str = &self->str_stdout_;
 	} else if (type == channel_type_stderr) {
-		channel = self->channel_stderr_;
 		output_str = &self->str_stderr_;
 	}
 
@@ -451,7 +481,7 @@ gboolean Cmdex::on_channel_io(GIOChannel* source,
 		}
 	} while (g_io_channel_get_buffer_condition(channel) & G_IO_IN);
 
-// 	DBG_FUNCTION_EXIT_MSG;
+	DBG_FUNCTION_EXIT_MSG;
 
 	// false if the source should be removed, true otherwise.
 	return continue_events;
@@ -459,6 +489,20 @@ gboolean Cmdex::on_channel_io(GIOChannel* source,
 
 
 
+void Cmdex::cleanup_members()
+{
+	kill_signal_sent_ = 0;
+	child_watch_handler_called_ = false;
+	pid_ = 0;
+	waitpid_status_ = 0;
+	event_source_id_stdout_ = 0;
+	event_source_id_stderr_ = 0;
+	fd_stdout_ = 0;
+	fd_stderr_ = 0;
+}
+
+
+
 
 
 

src/applib/cmdex.h

@@ -217,36 +217,14 @@ class Cmdex : public hz::ErrorHolder<hz::SyncPolicyNone> {
 		static void on_child_watch_handler(GPid arg_pid, int waitpid_status, gpointer data);
 
 		/// Channel I/O handler
-		static gboolean on_channel_io(GIOChannel* source,
-				GIOCondition cond, Cmdex* self, channel_t type);
+		static gboolean on_channel_io(GIOChannel* channel, GIOCondition cond, Cmdex* self, Cmdex::channel_t type);
 
 
 	private:
 
 
 		/// Clean up the member variables and shut down the channels if needed.
-		void cleanup_members()
-		{
-			kill_signal_sent_ = 0;
-			child_watch_handler_called_ = false;
-			pid_ = 0;
-			waitpid_status_ = 0;
-			event_source_id_stdout_ = 0;
-			event_source_id_stderr_ = 0;
-			fd_stdout_ = 0;
-			fd_stderr_ = 0;
-
-			if (channel_stdout_) {
-				g_io_channel_shutdown(channel_stdout_, false, NULL);
-				g_io_channel_unref(channel_stdout_);
-				channel_stdout_ = 0;
-			}
-			if (channel_stderr_) {
-				g_io_channel_shutdown(channel_stderr_, false, NULL);
-				g_io_channel_unref(channel_stderr_);
-				channel_stderr_ = 0;
-			}
-		}
+		void cleanup_members();