[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[andrei zavada]

The following commit has been merged in the master branch:
commit 73791c4ea91468c0083726cc25330939ce8ea51a
Author: andrei zavada <johnhommer at gmail.com>
Date:   Sun Oct 28 23:04:48 2012 +0200

    end romance with gtk_flush in sb_main_progress_indicator & suchlike ICM

diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index 589e11c..e326fa1 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -620,7 +620,6 @@ sb_main_progress_indicator( const char* current, size_t n, size_t i)
 		gtk_widget_get_parent_window(
 			(GtkWidget*)sbMainStatusBar),
 		FALSE);
-//	gtk_flush(); // choose either omp or gtk
 }
 
 
diff --git a/src/ui/sf/sf-montage.cc b/src/ui/sf/sf-montage.cc
index c0c8509..d8b8b4b 100644
--- a/src/ui/sf/sf-montage.cc
+++ b/src/ui/sf/sf-montage.cc
@@ -948,13 +948,11 @@ void
 aghui::SScoringFacility::
 draw_montage( const char *fname) // to a file
 {
-#ifdef CAIRO_HAS_SVG_SURFACE
 	cairo_surface_t *cs = cairo_svg_surface_create( fname, da_wd, da_ht);
 	cairo_t *cr = cairo_create( cs);
 	draw_montage( cr);
 	cairo_destroy( cr);
 	cairo_surface_destroy( cs);
-#endif
 }
 
 void

-- 
Sleep experiment manager