[glom] 1.11.2:



commit 7b1285161cf20c5952e5b840249abe5169fbc281
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 14 11:26:40 2009 +0200

    1.11.2:
    
    2009-09-14  Murray Cumming  <murrayc murray com>
    
    * glom/frame_glom.cc:
    * glom/utility_widgets/flowtable.cc: Fixed warnings-as-errors build
    problems with the latest gtkmm.

 ChangeLog                         |    9 +++++++++
 NEWS                              |   10 ++++++++++
 configure.ac                      |    2 +-
 glom/frame_glom.cc                |    2 +-
 glom/utility_widgets/flowtable.cc |    7 ++++++-
 5 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9571b2d..5902f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1.11.2:
+
+2009-09-14  Murray Cumming  <murrayc murray com>
+
+	* glom/frame_glom.cc:
+	* glom/utility_widgets/flowtable.cc: Fixed warnings-as-errors build 
+	problems with the latest gtkmm.
+
 2009-09-09  Michael Hasselmann <michaelh openismus com>
 
 	Refactoring Glom::Dialog_Import_CSV
@@ -10,6 +18,7 @@
 	allow the Dialog_Import_CSV class to parse a scanned line into its tree model
 	the parser emits a lineScanned signal, with the currently scanned line as
 	parameter.
+	Bug #588233.
 
 2009-09-08  Johannes Schmid <jschmid openismus com>
 
diff --git a/NEWS b/NEWS
index 1eaca10..78642ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+1.11.2 (unstable):
+
+* Fixed deprecated-disabled build with latest gtkmm.
+* Client-only build fixes.
+* Maemo build fixes.
+  (Johannes Schmid, Murray Cumming, Openismus)
+* Refactoring of .csv importing code.
+  Bug #588233.
+  (Michael Hasselmann)
+
 1.11.1 (unstable):
 
 * Really save field definition changes again.
diff --git a/configure.ac b/configure.ac
index f8eae56..50762bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom], [1.11.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
+AC_INIT([Glom], [1.11.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
 AC_PREREQ([2.60])
 
 AC_CONFIG_SRCDIR([glom/main.cc])
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 3dcde0b..74e0bd3 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
diff --git a/glom/utility_widgets/flowtable.cc b/glom/utility_widgets/flowtable.cc
index f592592..d3a182e 100644
--- a/glom/utility_widgets/flowtable.cc
+++ b/glom/utility_widgets/flowtable.cc
@@ -852,11 +852,12 @@ void FlowTable::on_add(Gtk::Widget* child)
 }
 
 
+
 void FlowTable::on_remove(Gtk::Widget* child)
 {
   if(child)
   {
-    const bool visible = child->is_visible();
+    const bool visible = child_is_visible(child);
 
   //g_warning("FlowTable::on_remove");
     for(type_vecChildren::iterator iter = m_children.begin(); iter != m_children.end(); ++iter)
@@ -920,7 +921,11 @@ void FlowTable::set_padding(guint padding)
 
 bool FlowTable::child_is_visible(const Gtk::Widget* widget) const
 {
+  #if GTKMM_MICRO_VERSION >= 11
+  return widget && widget->get_visible();
+  #else
   return widget && widget->is_visible();
+  #endif
 }
 
 void FlowTable::remove(Gtk::Widget& first)



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