[f-spot: 8/8] Merge branch 'on2.12'

[Stephane Delcroix <sdelcroix src gnome org>]

commit 2aad4303e9ac3828a95c8ac53c401719483d3205
Merge: 91427fc... ab05b9e...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Tue May 26 13:09:44 2009 +0200

    Merge branch 'on2.12'

 Makefile.am                                      |    7 +-
 Makefile.include                                 |    4 +
 autogen.sh                                       |   26 +-
 configure.in => configure.ac                     |   20 +-
 extensions/Exporters/CDExport/Makefile.am        |    2 +-
 extensions/Exporters/PicasaWebExport/Makefile.am |    1 +
 extensions/Exporters/ZipExport/Makefile.am       |    2 +-
 extensions/Tools/DevelopInUFraw/Makefile.am      |    2 +-
 extensions/Tools/RawPlusJpeg/Makefile.am         |    2 +-
 gio-sharp/.gitignore                             |    2 +
 gio-sharp/Makefile.am                            |   18 +
 gio-sharp/generator/AliasGen.cs                  |   30 +
 gio-sharp/generator/BoxedGen.cs                  |   82 +
 gio-sharp/generator/ByRefGen.cs                  |   63 +
 gio-sharp/generator/CallbackGen.cs               |  306 ++
 gio-sharp/generator/ChildProperty.cs             |   45 +
 gio-sharp/generator/ClassBase.cs                 |  480 ++
 gio-sharp/generator/ClassGen.cs                  |   94 +
 gio-sharp/generator/CodeGenerator.cs             |  122 +
 gio-sharp/generator/ConstFilenameGen.cs          |   52 +
 gio-sharp/generator/ConstStringGen.cs            |   59 +
 gio-sharp/generator/Ctor.cs                      |  165 +
 gio-sharp/generator/EnumGen.cs                   |  127 +
 gio-sharp/generator/FieldBase.cs                 |  270 ++
 gio-sharp/generator/GenBase.cs                   |  142 +
 gio-sharp/generator/GenerationInfo.cs            |  188 +
 gio-sharp/generator/HandleBase.cs                |   81 +
 gio-sharp/generator/IAccessor.cs                 |   29 +
 gio-sharp/generator/IGeneratable.cs              |   71 +
 gio-sharp/generator/IManualMarshaler.cs          |   32 +
 gio-sharp/generator/InterfaceGen.cs              |  384 ++
 gio-sharp/generator/LPGen.cs                     |   58 +
 gio-sharp/generator/LPUGen.cs                    |   58 +
 gio-sharp/generator/Makefile.am                  |   68 +
 gio-sharp/generator/ManagedCallString.cs         |  152 +
 gio-sharp/generator/ManualGen.cs                 |   58 +
 gio-sharp/generator/MarshalGen.cs                |   56 +
 gio-sharp/generator/Method.cs                    |  304 ++
 gio-sharp/generator/MethodBase.cs                |  184 +
 gio-sharp/generator/MethodBody.cs                |  177 +
 gio-sharp/generator/ObjectBase.cs                |   36 +
 gio-sharp/generator/ObjectField.cs               |   48 +
 gio-sharp/generator/ObjectGen.cs                 |  425 ++
 gio-sharp/generator/OpaqueGen.cs                 |  230 +
 gio-sharp/generator/Parameters.cs                |  728 ++++
 gio-sharp/generator/Parser.cs                    |  170 +
 gio-sharp/generator/Property.cs                  |  193 +
 gio-sharp/generator/PropertyBase.cs              |  122 +
 gio-sharp/generator/ReturnValue.cs               |  170 +
 gio-sharp/generator/Signal.cs                    |  587 +++
 gio-sharp/generator/Signature.cs                 |  123 +
 gio-sharp/generator/SimpleBase.cs                |  121 +
 gio-sharp/generator/SimpleGen.cs                 |   31 +
 gio-sharp/generator/Statistics.cs                |  197 +
 gio-sharp/generator/StructBase.cs                |  230 +
 gio-sharp/generator/StructField.cs               |  149 +
 gio-sharp/generator/StructGen.cs                 |   53 +
 gio-sharp/generator/SymbolTable.cs               |  412 ++
 gio-sharp/generator/VMSignature.cs               |   75 +
 gio-sharp/generator/VirtualMethod.cs             |  168 +
 gio-sharp/gio/AppInfoAdapter.custom              |   28 +
 gio-sharp/gio/AssemblyInfo.cs                    |    7 +
 gio-sharp/gio/File.custom                        |   31 +
 gio-sharp/gio/FileAdapter.custom                 |   46 +
 gio-sharp/gio/FileEnumerator.custom              |   59 +
 gio-sharp/gio/FileFactory.cs                     |   59 +
 gio-sharp/gio/Gio.metadata                       |   58 +
 gio-sharp/gio/GioStream.cs                       |  215 +
 gio-sharp/gio/Makefile.am                        |   49 +
 gio-sharp/gio/gio-api.raw                        | 5078 ++++++++++++++++++++++
 gio-sharp/gio/gio-sharp.dll.config               |    6 +
 gio-sharp/gio/gtk-sharp.snk                      |  Bin 0 -> 596 bytes
 gtk-sharp-beans/AssemblyInfo.cs                  |    6 +
 gtk-sharp-beans/Builder.custom                   |  409 ++
 gtk-sharp-beans/Dialog.cs                        |   46 +
 gtk-sharp-beans/Format.cs                        |   37 +
 gtk-sharp-beans/Gtk.metadata                     |    6 +
 gtk-sharp-beans/Image.cs                         |   38 +
 gtk-sharp-beans/Makefile.am                      |   69 +
 gtk-sharp-beans/PixbufFormat.cs                  |   35 +
 gtk-sharp-beans/Priority.cs                      |   31 +
 gtk-sharp-beans/Sources.cs                       |   39 +
 gtk-sharp-beans/Timeout.cs                       |   34 +
 gtk-sharp-beans/Widget.cs                        |   49 +
 gtk-sharp-beans/gtk-api.raw                      |  138 +
 gtk-sharp-beans/gtk-sharp-beans.dll.config       |    6 +
 gtk-sharp-beans/gtk-sharp-beans.snk              |  Bin 0 -> 596 bytes
 src/Bling/Animation.cs                           |    5 +-
 src/Imaging/ImageFile.cs                         |    7 +-
 src/Makefile.am                                  |    8 +-
 src/UI.Dialog/BuilderDialog.cs                   |    2 +-
 src/UI.Dialog/DateRangeDialog.cs                 |   10 +-
 src/Widgets/DateEdit.cs                          |    6 +-
 src/Widgets/OpenWithMenu.cs                      |    2 +-
 src/f-spot.in                                    |    2 +-
 95 files changed, 14866 insertions(+), 46 deletions(-)