[glom] startup: Check that the gi.repository python module is available.



commit 641921309c2f6d66e3a7af3107de3d52d99a13c9
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Sep 8 13:36:45 2011 +0200

    startup: Check that the gi.repository python module is available.
    
    	* glom/main.cc: Actually call check_gir_is_available_with_warning() and do
    	that before checking for Gda inside it.

 ChangeLog    |    7 +++++++
 glom/main.cc |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dada759..9810d95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-08  Murray Cumming  <murrayc murrayc com>
+
+	startup: Check that the gi.repository python module is available.
+
+	* glom/main.cc: Actually call check_gir_is_available_with_warning() and do 
+	that before checking for Gda inside it.
+
 2011-09-05  Murray Cumming  <murrayc murrayc com>
 
 	Glade files: Alignment corrections.
diff --git a/glom/main.cc b/glom/main.cc
index 51733fb..c1d35b7 100644
--- a/glom/main.cc
+++ b/glom/main.cc
@@ -615,12 +615,15 @@ main(int argc, char* argv[])
       return -1;
 #endif //GLOM_ENABLE_POSTGRESQL
 
-    if(!Glom::check_pyglom_is_available_with_warning())
+    if(!Glom::check_gir_is_available_with_warning())
       return -1;
 
     if(!Glom::check_pygda_is_available_with_warning())
       return -1;
 
+    if(!Glom::check_pyglom_is_available_with_warning())
+      return -1;
+
 
     // Some more sanity checking:
     // These print errors to the stdout if they fail.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]