Merge commit 'ToolbarConfig'

[andy/viking.git] / src / background.c

diff --git a/src/background.c b/src/background.c
index de93690df79982fd751cec926c3e6bbffd127264..b388fb599be6ee8c02fe594906633cbba9f4ad98 100644 (file)
--- a/src/background.c
+++ b/src/background.c
@@ -23,6 +23,7 @@
 #include <glib/gi18n.h>
 
 #include "background.h"
+#include "settings.h"
 
 static GThreadPool *thread_pool = NULL;
 static gboolean stop_all_threads = FALSE;
@@ -50,7 +51,7 @@ void a_background_update_status ( VikWindow *vw, gpointer data )
 {
   static gchar buf[20];
   g_snprintf(buf, sizeof(buf), _("%d items"), bgitemcount);
-  vik_window_signal_statusbar_update ( vw, buf, VIK_STATUSBAR_ITEMS );
+  vik_window_statusbar_update ( vw, buf, VIK_STATUSBAR_ITEMS );
 }
 
 static void background_thread_update ()
@@ -218,6 +219,8 @@ static void bgwindow_response (GtkDialog *dialog, gint arg1 )
     gtk_widget_hide ( bgwindow );
 }
 
+#define VIK_SETTINGS_BACKGROUND_MAX_THREADS "background_max_threads"
+
 /**
  * a_background_init:
  *
@@ -226,8 +229,11 @@ static void bgwindow_response (GtkDialog *dialog, gint arg1 )
 void a_background_init()
 {
   /* initialize thread pool */
-  /* TODO parametrize this via preference and/or command line arg */
   gint max_threads = 10;  /* limit maximum number of threads running at one time */
+  gint maxt;
+  if ( a_settings_get_integer ( VIK_SETTINGS_BACKGROUND_MAX_THREADS, &maxt ) )
+    max_threads = maxt;
+
   thread_pool = g_thread_pool_new ( (GFunc) thread_helper, NULL, max_threads, FALSE, NULL );
 
   GtkCellRenderer *renderer;
@@ -285,6 +291,11 @@ void a_background_uninit()
   /* wait until all running threads stop */
   stop_all_threads = TRUE;
   g_thread_pool_free ( thread_pool, TRUE, TRUE );
+
+  gtk_list_store_clear ( bgstore );
+  g_object_unref ( bgstore );
+
+  gtk_widget_destroy ( bgwindow );
 }
 
 void a_background_add_window (VikWindow *vw)