Properly clean up the logging mechanism.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3878 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -14,6 +14,8 @@
    "Open with Geany" context menu item.
  * plugins/splitwindow.c:
    Avoid using deprecated GTK API.
+ * src/log.c, src/main.c:
+   Properly clean up the logging mechanism.
 
 
 2009-06-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

src/log.c

@@ -74,18 +74,22 @@ void geany_debug(gchar const *format, ...)
 static void handler_print(const gchar *msg)
 {
 	printf("%s\n", msg);
-	g_string_append_printf(log_buffer, "%s\n", msg);
-
-	update_dialog();
+	if (G_LIKELY(log_buffer != NULL))
+	{
+		g_string_append_printf(log_buffer, "%s\n", msg);
+		update_dialog();
+	}
 }
 
 
 static void handler_printerr(const gchar *msg)
 {
 	fprintf(stderr, "%s\n", msg);
-	g_string_append_printf(log_buffer, "%s\n", msg);
-
-	update_dialog();
+	if (G_LIKELY(log_buffer != NULL))
+	{
+		g_string_append_printf(log_buffer, "%s\n", msg);
+		update_dialog();
+	}
 }
 
 
@@ -208,5 +212,8 @@ void log_show_debug_messages_dialog(void)
 
 void log_finalize(void)
 {
+	g_log_set_default_handler(g_log_default_handler, NULL);
+
 	g_string_free(log_buffer, TRUE);
+	log_buffer = NULL;
 }

src/main.c

@@ -1109,7 +1109,6 @@ void main_quit()
 	encodings_finalize();
 	toolbar_finalize();
 	configuration_finalize();
-	/* must be last */
 	log_finalize();
 
 	tm_workspace_free(TM_WORK_OBJECT(app->tm_workspace));