[f-spot: 5/5] Merge branch 'FSPOT_0_6_0_STABLE'

[Stephane Delcroix <sdelcroix src gnome org>]

commit d00fe50fd7dd92162da6c0263f1c115d0fb26685
Merge: 4228b2d... b581be8...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Fri Sep 25 14:07:51 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 extensions/Exporters/FlickrExport/Makefile.am    |    3 ---
 extensions/Exporters/PicasaWebExport/Makefile.am |    3 ---
 extensions/Exporters/SmugMugExport/Makefile.am   |    4 ----
 extensions/Exporters/TabbloExport/Makefile.am    |    5 +----
 src/Loaders/GdkImageLoader.cs                    |    1 +
 src/Makefile.am                                  |    3 +--
 src/SingleView.cs                                |    2 --
 7 files changed, 3 insertions(+), 18 deletions(-)
---
diff --cc extensions/Exporters/TabbloExport/Makefile.am
index 14a8aaa,915a95f..99b300b
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@@ -45,16 -41,13 +45,13 @@@ SUBDIRS = 
  
  RESOURCES = \
  	-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
 -	-resource:$(srcdir)/$(PLUGIN_NAME).glade \
 -	-resource:$(srcdir)/TrustError.glade
 +	-resource:$(srcdir)/ui/$(PLUGIN_NAME).ui \
 +	-resource:$(srcdir)/ui/TrustError.ui
  
  mpack: $(PLUGIN_ASSEMBLY)
  	mautil p $(PLUGIN_ASSEMBLY)
  
- $(PLUGIN_ASSEMBLY): $(PLUGIN_INPUT) $(PLUGIN_MANIFEST)
- 	$(MAKE) -C $(SUBDIRS)
 -$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
++$(PLUGIN_ASSEMBLY): $(PLUGIN_INPUT)
  	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
  
  plugindir = $(pkglibdir)/extensions
diff --cc src/Makefile.am
index 3785f0d,58a97a5..4badc83
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -349,8 -349,6 +349,7 @@@ JOBSCHEDULER_ASSEMBLIES =			
  BLING_ASSEMBLIES =				\
  	-pkg:gtk-sharp-2.0			\
  	-r:Mono.Cairo				\
- 	-r:FSpot.Utils.dll			\
 +	$(LINK_GIOSHARP)			\
  	$(LINK_GTKSHARPBEANS)
  
  WIDGETS_ASSEMBLIES =				\