[glom: 4/4] Merged ChangeLog

[Murray Cumming <murrayc src gnome org>]

commit fa0f67ab0ad7e34db4f7da41e0bb780eba8ac772
Merge: af328a3... e2bca82...
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri May 8 00:07:07 2009 +0200

    Merged ChangeLog

 ChangeLog                                     |   12 ++
 glom/glom.glade                               |   55 ++++++++-
 glom/utility_widgets/Makefile.am              |    1 +
 glom/utility_widgets/dialog_image_progress.cc |  170 +++++++++++++++++++++++++
 glom/utility_widgets/dialog_image_progress.h  |   67 ++++++++++
 glom/utility_widgets/imageglom.cc             |   52 ++++----
 glom/utility_widgets/imageglom.h              |    1 +
 7 files changed, 325 insertions(+), 33 deletions(-)

diff --cc ChangeLog
index 887322a,f6b0882..5c66131
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,30 -1,15 +1,42 @@@
 +2009-05-07  Murray Cumming  <murrayc murrayc-x61>
 +
 +	Allow non-network-shared connections when using IPv6.
 +
 +	* glom/libglom/connectionpool_backends/postgres_self.cc: 
 +	DEFAULT_CONFIG_PG_HBA_LOCAL: Add an entry in IPv6 syntax, because 
 +	something seems to be more IPv6-like in Ubuntu Jaunty.
 +
 +2009-05-07  Murray Cumming  <murrayc murrayc com>
 +
 +	Pass some sharedptr&s as const.
 +
 +	* glom/utility_widgets/flowtable_dnd.h: on_dnd_add_layout_item()
 +	* glom/mode_data/flowtablewithfields.[h|cc]: on_dnd_add_layout_item(), 
 +	on_entry_edited(), on_entry_open_details_requested(), 
 +	on_dnd_add_layout_item(): Pass the sharedptr& as const.
 +
 +2009-05-07  Murray Cumming  <murrayc murrayc com>
 +
 +	Fixed minor compiler warnings and removed some virtuals.
 +
 +	* glom/mode_data/flowtablewithfields.h: Made methods non-virtual where 
 +	the virtual is unnecessary and misleading.
 +
 +	* glom/utility_widgets/adddel/eggcolumnchooser/: Removed.
 +	* several: Fixed minor compiler warnings.
 +
+ 2009-05-07  Armin Burgmeier  <armin arbur net>
+ 
+ 	* glom/glom.glade:
+ 	* glom/utility_widgets/dialog_image_progress.h:
+ 	* glom/utility_widgets/dialog_image_progress.cc:
+ 	* glom/utility_widgets/Makefile.am: Added a dialog which loads an
+ 	image and shows progress of the operation.
+ 
+ 	* glom/utility_widgets/imageglom.h:
+ 	* glom/utility_widgets/imageglom.cc: Use this dialog when the user
+ 	selects an image to load, to indicate progress for large images.
+ 
  2009-05-05  Armin Burgmeier  <armin arbur net>
  
  	* glom/libglom/sharedptr.h: Added operator!=.