[glom/maemo5: 2/2] Merged after pull

[Murray Cumming <murrayc src gnome org>]

commit ff992d11230cd52524b69590834395b5120e3dc0
Merge: 9a795a3... 90ffe63...
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 7 11:07:25 2009 +0200

    Merged after pull

 ChangeLog                       |   10 ++++++
 glom/application.cc             |   68 +++++++++++++++++++++-----------------
 glom/application.h              |   11 +++++-
 glom/mode_data/notebook_data.cc |    5 +++
 4 files changed, 62 insertions(+), 32 deletions(-)
---
diff --cc ChangeLog
index 63f0296,bfe166f..ff30a57
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,15 +1,20 @@@
 +2009-09-07  Murray Cumming  <murrayc murrayc com>
 +
 +	* glom/application.cc:
 +	* glom/frame_glom.cc: Fix tiny typos to fix the non-maemo build.
 +
  2009-09-05  Murray Cumming  <murrayc murrayc com>
  
+ 	Maemo: ifdef out useless menu code.
+ 
+ 	* glom/application.[h|c]]: Ifdef out any menu-building code because 
+ 	it must be completely replaced by Hildon::AppMenu code on Maemo.
+ 	* glom/mode_data/notebook_data.cc: Constructor: Hide the notebook 
+ 	tabs, in preparation for just showing the list, with the details in a 
+ 	separate window on Maemo.
+ 
+ 2009-09-05  Murray Cumming  <murrayc murrayc com>
+ 
  	connection_request_password_and_attempt(): Fix a crash in client-only mode.
  
  	* glom/frame_glom.[h|cc]: connection_request_password_and_attempt():