[glom: 11/11] Fixed the regular build after the merge from maemo5 branch.



commit 83b1d1e6c524443b40d5a0414e5cfe1206b24880
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Sep 5 17:42:08 2009 +0200

    Fixed the regular build after the merge from maemo5 branch.

 glom/application.cc |    2 +-
 glom/frame_glom.cc  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/glom/application.cc b/glom/application.cc
index 31faeb6..59960c9 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -1033,7 +1033,7 @@ bool App_Glom::on_document_load()
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
     //Warn about read-only files, because users will otherwise wonder why they can't use Developer mode:
-    const Document::userLevelReason reason = Document::USER_LEVEL_REASON_UNKNOWN;
+    Document::userLevelReason reason = Document::USER_LEVEL_REASON_UNKNOWN;
     const AppState::userlevels userlevel = pDocument->get_userlevel(reason);
     if( (userlevel == AppState::USERLEVEL_OPERATOR) && (reason == Document::USER_LEVEL_REASON_FILE_READ_ONLY) )
     {
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 4a3ccdd..3dcde0b 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -2426,7 +2426,7 @@ bool Frame_Glom::connection_request_password_and_attempt(bool& database_not_foun
         }
         catch(const ExceptionConnection& ex)
         {
-          if(!handle_request_password_connection_error(true, ex, database_not_found);)
+          if(!handle_request_password_connection_error(true, ex, database_not_found));
             return false;
         }
         #else //GLIBMM_EXCEPTIONS_ENABLED



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