Remove dependencies to gob2

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

diff --git a/src/background.c b/src/background.c
index e83ff64567535c06f13f4e1a6902df2900b9f54a..624d78bec800ce5bcbf9aee9ef641a106cd23300 100644 (file)
--- a/src/background.c
+++ b/src/background.c
@@ -20,9 +20,10 @@
  */
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "vikstatus.h"
 #include "background.h"
-#include "gtkcellrendererprogress.h"
 
 static GtkWidget *bgwindow = NULL;
 static GtkWidget *bgtreeview = NULL;
@@ -34,7 +35,7 @@ static gint bgitemcount = 0;
 
 enum
 {
-  TITLE_COLUMN,
+  TITLE_COLUMN = 0,
   PROGRESS_COLUMN,
   DATA_COLUMN,
   N_COLUMNS,
@@ -50,7 +51,7 @@ void a_background_update_status ( VikStatusbar *vs, gchar *str )
 static void background_thread_update ()
 {
   static gchar buf[20];
-  g_snprintf(buf, sizeof(buf), "%d items", bgitemcount);
+  g_snprintf(buf, sizeof(buf), _("%d items"), bgitemcount);
   g_slist_foreach ( statusbars_to_update, (GFunc) a_background_update_status, buf );
 }
 
@@ -59,7 +60,7 @@ void a_background_thread_progress ( gpointer callbackdata, gdouble fraction )
   gpointer *args = (gpointer *) callbackdata;
   a_background_testcancel ( callbackdata );
   gdk_threads_enter();
-  gtk_list_store_set( GTK_LIST_STORE(bgstore), (GtkTreeIter *) args[5], PROGRESS_COLUMN, fraction, -1 );
+  gtk_list_store_set( GTK_LIST_STORE(bgstore), (GtkTreeIter *) args[5], PROGRESS_COLUMN, fraction*100, -1 );
   gdk_threads_leave();
 
   args[6] = GINT_TO_POINTER(GPOINTER_TO_INT(args[6])-1);
@@ -103,9 +104,10 @@ void thread_helper ( gpointer args[6] )
   vik_thr_func func = args[1];
   gpointer userdata = args[2];
 
+  g_debug(__FUNCTION__);
+
   func ( userdata, args );
 
-  /* need MUTEX ? */
   gdk_threads_enter();
   if ( ! args[0] )
     gtk_list_store_remove ( bgstore, (GtkTreeIter *) args[5] );
@@ -119,6 +121,8 @@ void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func
   GtkTreeIter *piter = g_malloc ( sizeof ( GtkTreeIter ) );
   gpointer *args = g_malloc ( sizeof(gpointer) * 7 );
 
+  g_debug(__FUNCTION__);
+
   args[0] = GINT_TO_POINTER(0);
   args[1] = func;
   args[2] = userdata;
@@ -130,7 +134,11 @@ void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func
   bgitemcount += number_items;
 
   gtk_list_store_append ( bgstore, piter );
-  gtk_list_store_set ( bgstore, piter, TITLE_COLUMN, message, PROGRESS_COLUMN, 0.0, DATA_COLUMN, args, -1 );
+  gtk_list_store_set ( bgstore, piter,
+                      TITLE_COLUMN, message,
+                      PROGRESS_COLUMN, 0.0,
+                      DATA_COLUMN, args,
+                      -1 );
 
   /* run the thread in the background */
   g_thread_create( (GThreadFunc) thread_helper, args, FALSE, NULL );
@@ -144,34 +152,42 @@ void a_background_show_window ()
 static void cancel_job_with_iter ( GtkTreeIter *piter )
 {
     gpointer *args;
+
+  g_debug(__FUNCTION__);
+
     gtk_tree_model_get( GTK_TREE_MODEL(bgstore), piter, DATA_COLUMN, &args, -1 );
 
     /* we know args still exists because it is free _after_ the list item is destroyed */
     /* need MUTEX ? */
     args[0] = GINT_TO_POINTER(1); /* set killswitch */
 
-    bgitemcount -= GPOINTER_TO_INT(args[6]);
-
     gtk_list_store_remove ( bgstore, piter );
 }
 
 static void bgwindow_response (GtkDialog *dialog, gint arg1 )
 {
- if ( arg1 == 1 ) /* cancel */
- {
-   GtkTreeIter iter;
-   if ( gtk_tree_selection_get_selected ( gtk_tree_view_get_selection ( GTK_TREE_VIEW(bgtreeview) ), NULL, &iter ) )
-     cancel_job_with_iter ( &iter );
-    background_thread_update();
-  }
+  /* note this function is a signal handler called back from the GTK main loop, 
+   * so GDK is already locked.  We need to release the lock before calling 
+   * thread-safe routines
+   */
+  if ( arg1 == 1 ) /* cancel */
+    {
+      GtkTreeIter iter;
+      if ( gtk_tree_selection_get_selected ( gtk_tree_view_get_selection ( GTK_TREE_VIEW(bgtreeview) ), NULL, &iter ) )
+       cancel_job_with_iter ( &iter );
+      gdk_threads_leave();
+      background_thread_update();
+      gdk_threads_enter();
+    }
   else if ( arg1 == 2 ) /* clear */
-  {
-    GtkTreeIter iter;
-    while ( gtk_tree_model_get_iter_first ( GTK_TREE_MODEL(bgstore), &iter ) )
-      cancel_job_with_iter ( &iter );
-    bgitemcount = 0;
-    background_thread_update();
-  }
+    {
+      GtkTreeIter iter;
+      while ( gtk_tree_model_get_iter_first ( GTK_TREE_MODEL(bgstore), &iter ) )
+       cancel_job_with_iter ( &iter );
+      gdk_threads_leave();
+      background_thread_update();
+      gdk_threads_enter();
+    }
   else /* OK */
     gtk_widget_hide ( bgwindow );
 }
@@ -182,6 +198,8 @@ void a_background_init()
   GtkTreeViewColumn *column;
   GtkWidget *scrolled_window;
 
+  g_debug(__FUNCTION__);
+
   /* store & treeview */
   bgstore = gtk_list_store_new ( N_COLUMNS, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_POINTER );
   bgtreeview = gtk_tree_view_new_with_model ( GTK_TREE_MODEL(bgstore) );
@@ -191,11 +209,11 @@ void a_background_init()
 
   /* add columns */
   renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ( "Job", renderer, "text", TITLE_COLUMN, NULL );
+  column = gtk_tree_view_column_new_with_attributes ( _("Job"), renderer, "text", TITLE_COLUMN, NULL );
   gtk_tree_view_append_column ( GTK_TREE_VIEW(bgtreeview), column );
 
   renderer = gtk_cell_renderer_progress_new ();
-  column = gtk_tree_view_column_new_with_attributes ( "Progress", renderer, "percentage", PROGRESS_COLUMN, NULL );
+  column = gtk_tree_view_column_new_with_attributes ( _("Progress"), renderer, "value", PROGRESS_COLUMN, NULL );
   gtk_tree_view_append_column ( GTK_TREE_VIEW(bgtreeview), column );
 
   /* setup window */
@@ -206,7 +224,7 @@ void a_background_init()
   bgwindow = gtk_dialog_new_with_buttons ( "", NULL, 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_DELETE, 1, GTK_STOCK_CLEAR, 2, NULL );
   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_window_set_title ( GTK_WINDOW(bgwindow), _("Viking Background Jobs") );
   /* don't destroy win */
   g_signal_connect ( G_OBJECT(bgwindow), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL );