Ensure vtl created in acquire operation runs post read stage.

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

diff --git a/src/background.c b/src/background.c
index f3ed15c8c085c8bf532812a7f4b06b638a0614ce..de6d1a2f5c883a6ec489f005a1a2428018c56a86 100644 (file)
--- a/src/background.c
+++ b/src/background.c
@@ -47,7 +47,7 @@ enum
 void a_background_update_status ( VikStatusbar *vs, gchar *str )
 {
   gdk_threads_enter ();
 void a_background_update_status ( VikStatusbar *vs, gchar *str )
 {
   gdk_threads_enter ();

-  vik_statusbar_set_message ( vs, 1, str );
+  vik_statusbar_set_message ( vs, VIK_STATUSBAR_ITEMS, str );

   gdk_threads_leave ();
 }
 
   gdk_threads_leave ();
 }
 


@@ -78,7 +78,8 @@ static void thread_die ( gpointer args[6] )
 {
   vik_thr_free_func userdata_free_func = args[3];
 
 {
   vik_thr_free_func userdata_free_func = args[3];
 

-  userdata_free_func ( args[2] );
+  if ( userdata_free_func != NULL )
+    userdata_free_func ( args[2] );

 
   if ( GPOINTER_TO_INT(args[6]) )
   {
 
   if ( GPOINTER_TO_INT(args[6]) )
   {


@@ -123,6 +124,18 @@ static void thread_helper ( gpointer args[6], gpointer user_data )
   thread_die ( args );
 }
 
   thread_die ( args );
 }
 

+/**
+ * a_background_thread:
+ * @parent:
+ * @message:
+ * @func: worker function
+ * @userdata:
+ * @userdata_free_func: free function for userdata
+ * @userdata_cancel_cleanup_func:
+ * @number_items:
+ *
+ * Function to enlist new background function.
+ */

 void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func func, gpointer userdata, vik_thr_free_func userdata_free_func, vik_thr_free_func userdata_cancel_cleanup_func, gint number_items )
 {
   GtkTreeIter *piter = g_malloc ( sizeof ( GtkTreeIter ) );
 void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func func, gpointer userdata, vik_thr_free_func userdata_free_func, vik_thr_free_func userdata_cancel_cleanup_func, gint number_items )
 {
   GtkTreeIter *piter = g_malloc ( sizeof ( GtkTreeIter ) );


@@ -151,6 +164,11 @@ void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func
   g_thread_pool_push( thread_pool, args, NULL );
 }
 
   g_thread_pool_push( thread_pool, args, NULL );
 }
 

+/**
+ * a_background_show_window:
+ *
+ * Display the background window.
+ */

 void a_background_show_window ()
 {
   gtk_widget_show_all ( bgwindow );
 void a_background_show_window ()
 {
   gtk_widget_show_all ( bgwindow );


@@ -160,7 +178,7 @@ static void cancel_job_with_iter ( GtkTreeIter *piter )
 {
     gpointer *args;
 
 {
     gpointer *args;
 

-  g_debug(__FUNCTION__);
+    g_debug(__FUNCTION__);

 
     gtk_tree_model_get( GTK_TREE_MODEL(bgstore), piter, DATA_COLUMN, &args, -1 );
 
 
     gtk_tree_model_get( GTK_TREE_MODEL(bgstore), piter, DATA_COLUMN, &args, -1 );
 


@@ -200,6 +218,11 @@ static void bgwindow_response (GtkDialog *dialog, gint arg1 )
     gtk_widget_hide ( bgwindow );
 }
 
     gtk_widget_hide ( bgwindow );
 }
 

+/**
+ * a_background_init:
+ *
+ * Initialize background feature.
+ */

 void a_background_init()
 {
   /* initialize thread pool */
 void a_background_init()
 {
   /* initialize thread pool */


@@ -235,9 +258,16 @@ void a_background_init()
   gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
 
   bgwindow = gtk_dialog_new_with_buttons ( "", NULL, 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_DELETE, 1, GTK_STOCK_CLEAR, 2, NULL );
   gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
 
   bgwindow = gtk_dialog_new_with_buttons ( "", NULL, 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_DELETE, 1, GTK_STOCK_CLEAR, 2, NULL );

+  gtk_dialog_set_default_response ( GTK_DIALOG(bgwindow), GTK_RESPONSE_ACCEPT );
+  GtkWidget *response_w = NULL;
+#if GTK_CHECK_VERSION (2, 20, 0)
+  response_w = gtk_dialog_get_widget_for_response ( GTK_DIALOG(bgwindow), GTK_RESPONSE_ACCEPT );
+#endif

   gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(bgwindow)->vbox), scrolled_window, TRUE, TRUE, 0 );
   gtk_window_set_default_size ( GTK_WINDOW(bgwindow), 400, 400 );
   gtk_window_set_title ( GTK_WINDOW(bgwindow), _("Viking Background Jobs") );
   gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(bgwindow)->vbox), scrolled_window, TRUE, TRUE, 0 );
   gtk_window_set_default_size ( GTK_WINDOW(bgwindow), 400, 400 );
   gtk_window_set_title ( GTK_WINDOW(bgwindow), _("Viking Background Jobs") );

+  if ( response_w )
+    gtk_widget_grab_focus ( response_w );

   /* don't destroy win */
   g_signal_connect ( G_OBJECT(bgwindow), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL );
 
   /* don't destroy win */
   g_signal_connect ( G_OBJECT(bgwindow), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL );
 


@@ -245,6 +275,11 @@ void a_background_init()
 
 }
 
 
 }
 

+/**
+ * a_background_uninit:
+ *
+ * Uninitialize background feature.
+ */

 void a_background_uninit()
 {
   /* wait until all running threads stop */
 void a_background_uninit()
 {
   /* wait until all running threads stop */