[f-spot] [xbuild] Move to distro provided gio-sharp and gtk-sharp
- From: Stephen Shaw <sshaw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] [xbuild] Move to distro provided gio-sharp and gtk-sharp
- Date: Sat, 30 Jun 2012 19:52:31 +0000 (UTC)
commit be02590bc4fb226ec9469619f3a1792ede752d13
Author: Stephen Shaw <sshaw decriptor com>
Date: Fri Jun 29 15:27:19 2012 -0600
[xbuild] Move to distro provided gio-sharp and gtk-sharp
Not entirely sure why we were including them. Maybe
legacy? Moving to the provided ones for now to
simplify the build process
.gitignore | 1 +
F-Spot.sln | 11 -----------
autogen.sh | 2 ++
.../MainApp/FSpot.Import/FileImportSource.cs | 4 ++--
.../MainApp/FSpot.Import/ImportController.cs | 2 +-
src/Clients/MainApp/FSpot.Widgets/TagMenu.cs | 3 ++-
src/Clients/MainApp/MainApp.csproj | 15 +++++++--------
src/Core/FSpot.Bling/FSpot.Bling.csproj | 9 +++------
src/Core/FSpot.Core/FSpot.Core.csproj | 8 ++++----
src/Core/FSpot.Gui/FSpot.Gui.csproj | 15 +++++++--------
src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs | 2 +-
src/Core/FSpot.Utils/FSpot.Utils.csproj | 11 +++++++----
.../FSpot.Exporters.CD/FSpot.Exporters.CD.csproj | 15 +++++++--------
.../FSpot.Exporters.Facebook.csproj | 15 +++++++--------
.../FSpot.Exporters.Flickr.csproj | 7 +++----
.../FSpot.Exporters.Folder.csproj | 15 +++++++--------
.../FSpot.Exporters.Gallery.csproj | 15 +++++++--------
.../FSpot.Exporters.PicasaWeb.csproj | 7 +++----
.../FSpot.Exporters.SmugMug.csproj | 7 +++----
.../FSpot.Exporters.Tabblo.csproj | 15 +++++++--------
.../FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj | 15 +++++++--------
.../FSpot.Tools.ChangePhotoPath.csproj | 15 +++++++--------
.../FSpot.Tools.DevelopInUFraw.csproj | 15 +++++++--------
.../FSpot.Tools.LiveWebGallery.csproj | 7 +++----
.../FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj | 15 +++++++--------
.../FSpot.Tools.ScreensaverConfig.csproj | 7 +++----
26 files changed, 115 insertions(+), 138 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bcb036..ae20368 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ Makefile.in
/autom4te.cache
/bin
/obj
+external
configure
config.guess
config.h
diff --git a/F-Spot.sln b/F-Spot.sln
index 6f0e2ae..9dbc2e8 100644
--- a/F-Spot.sln
+++ b/F-Spot.sln
@@ -35,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Tabblo", "lib\Mono.Tab
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "unique-sharp", "lib\unique-sharp\unique-sharp.csproj", "{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gtk-sharp-beans", "lib\gtk-sharp-beans\gtk-sharp-beans.csproj", "{069D1797-427D-4CED-A754-233DE64FC5DD}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{9D75644A-DEF1-4362-8553-4B5F09783DC9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MainApp", "src\Clients\MainApp\MainApp.csproj", "{27EC05FB-0223-4B26-8157-E49AF81D0007}"
@@ -117,14 +115,6 @@ Global
{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.Release|Any CPU.Build.0 = Release|Any CPU
{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.Submodule|Any CPU.Build.0 = Debug|Any CPU
- {069D1797-427D-4CED-A754-233DE64FC5DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {069D1797-427D-4CED-A754-233DE64FC5DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {069D1797-427D-4CED-A754-233DE64FC5DD}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {069D1797-427D-4CED-A754-233DE64FC5DD}.Default|Any CPU.Build.0 = Debug|Any CPU
- {069D1797-427D-4CED-A754-233DE64FC5DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {069D1797-427D-4CED-A754-233DE64FC5DD}.Release|Any CPU.Build.0 = Release|Any CPU
- {069D1797-427D-4CED-A754-233DE64FC5DD}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
- {069D1797-427D-4CED-A754-233DE64FC5DD}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -388,7 +378,6 @@ Global
{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
{B5CDF05C-278A-40AA-A587-B27A00BD9135} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
- {069D1797-427D-4CED-A754-233DE64FC5DD} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
{27EC05FB-0223-4B26-8157-E49AF81D0007} = {9D75644A-DEF1-4362-8553-4B5F09783DC9}
{A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4} = {9D75644A-DEF1-4362-8553-4B5F09783DC9}
{416E19A2-9CD9-498F-BE75-20AB74535ACD} = {7D049DAA-F1B0-4697-9BCA-91FC0E1A2B9D}
diff --git a/autogen.sh b/autogen.sh
index 65b58bd..c568023 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -92,3 +92,5 @@ fi
run ./configure --enable-maintainer-mode $@
+mkdir -p external
+cp -f `pkg-config --variable Libraries gtk-sharp-beans-2.0` external
diff --git a/src/Clients/MainApp/FSpot.Import/FileImportSource.cs b/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
index e94af2b..40e62dc 100644
--- a/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
+++ b/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
@@ -94,8 +94,8 @@ namespace FSpot.Import
};
var infos = new List<FileImportInfo> ();
foreach (var file in enumerator) {
- if (ImageFile.HasLoader (new SafeUri (file.Uri, true))) {
- infos.Add (new FileImportInfo (new SafeUri (file.Uri, true)));
+ if (ImageFile.HasLoader (new SafeUri (file.Uri.ToString(), true))) {
+ infos.Add (new FileImportInfo (new SafeUri (file.Uri.ToString(), true)));
}
if (infos.Count % 10 == 0 || infos.Count < 10) {
diff --git a/src/Clients/MainApp/FSpot.Import/ImportController.cs b/src/Clients/MainApp/FSpot.Import/ImportController.cs
index d5c6302..cf4d609 100644
--- a/src/Clients/MainApp/FSpot.Import/ImportController.cs
+++ b/src/Clients/MainApp/FSpot.Import/ImportController.cs
@@ -144,7 +144,7 @@ namespace FSpot.Import
var monitor = GLib.VolumeMonitor.Default;
var sources = new List<IImportSource> ();
foreach (var mount in monitor.Mounts) {
- var root = new SafeUri (mount.Root.Uri, true);
+ var root = new SafeUri (mount.Root.Uri.ToString(), true);
var themed_icon = (mount.Icon as GLib.ThemedIcon);
if (themed_icon != null && themed_icon.Names.Length > 0) {
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs b/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
index 7442cef..2408918 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
@@ -64,7 +64,8 @@ public class TagMenu : Menu {
Value = t;
if (t.Icon != null) {
this.Image = new Gtk.Image (t.SizedIcon);
- this.SetAlwaysShowImage (true);
+ // FIXME: Where did this method go?
+ //this.SetAlwaysShowImage (true);
}
}
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index f599a06..2080817 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -330,6 +330,13 @@
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Private>False</Private>
</Reference>
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Core\FSpot.Core\FSpot.Core.csproj">
@@ -380,14 +387,6 @@
<Project>{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}</Project>
<Name>unique-sharp</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="FSpot\" />
diff --git a/src/Core/FSpot.Bling/FSpot.Bling.csproj b/src/Core/FSpot.Bling/FSpot.Bling.csproj
index 40d0536..1f4db2f 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling.csproj
+++ b/src/Core/FSpot.Bling/FSpot.Bling.csproj
@@ -59,11 +59,8 @@
<ItemGroup>
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Core/FSpot.Core.csproj b/src/Core/FSpot.Core/FSpot.Core.csproj
index 0752459..77e3e71 100644
--- a/src/Core/FSpot.Core/FSpot.Core.csproj
+++ b/src/Core/FSpot.Core/FSpot.Core.csproj
@@ -74,10 +74,6 @@
<Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
<Name>FSpot.Cms</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -85,6 +81,10 @@
<Reference Include="System.Xml" />
<Reference Include="Mono.Posix" />
<Reference Include="System" />
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="FSpot.Core.addins">
diff --git a/src/Core/FSpot.Gui/FSpot.Gui.csproj b/src/Core/FSpot.Gui/FSpot.Gui.csproj
index 229b7a2..7c65cdc 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui.csproj
+++ b/src/Core/FSpot.Gui/FSpot.Gui.csproj
@@ -84,6 +84,13 @@
<Reference Include="Mono.Cairo" />
<Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
<Reference Include="System.Core" />
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FSpot.Utils\FSpot.Utils.csproj">
@@ -110,14 +117,6 @@
<Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
<Name>Hyena.Gui</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="FSpot.Transitions\" />
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs b/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
index df1dcbc..e6ad8fa 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
@@ -132,7 +132,7 @@ namespace FSpot.Widgets
return;
Image = GtkBeans.Image.NewFromIcon (app.Icon, IconSize.Menu);
- this.SetAlwaysShowImage (true);
+ //this.SetAlwaysShowImage (true);
}
}
}
diff --git a/src/Core/FSpot.Utils/FSpot.Utils.csproj b/src/Core/FSpot.Utils/FSpot.Utils.csproj
index 6a43a75..2f2fd66 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils.csproj
+++ b/src/Core/FSpot.Utils/FSpot.Utils.csproj
@@ -78,10 +78,6 @@
<Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
<Name>Hyena</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -92,5 +88,12 @@
<Reference Include="Mono.Posix" />
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
<Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
index cae63ed..ea77bc2 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
@@ -65,6 +65,13 @@
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
@@ -79,14 +86,6 @@
<Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
<Name>Hyena</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
index ac55fdd..a35de53 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
@@ -92,6 +92,13 @@
<Reference Include="System.Xml" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System.Core" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
@@ -122,13 +129,5 @@
<Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
<Name>FSpot.Gui</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
index f9480ec..9fe2ff9 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
@@ -66,6 +66,9 @@
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
@@ -88,10 +91,6 @@
<Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
<Name>FSpot.Core</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
index ce1db3a..2fb14a8 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
@@ -90,14 +90,6 @@
<Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
<Name>FSpot.Gui</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib" />
@@ -106,6 +98,13 @@
<Reference Include="System.Web" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
index 6777108..6d1b7cf 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
@@ -79,6 +79,13 @@
<Reference Include="System.Xml" />
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
@@ -105,14 +112,6 @@
<Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
<Name>FSpot.Gui</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
index 897498f..572a990 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
@@ -77,6 +77,9 @@
<Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
</Reference>
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
@@ -99,9 +102,5 @@
<Project>{40C7D4EA-FB93-49FE-B18F-700A28C3E670}</Project>
<Name>Mono.Google</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
</ItemGroup>
</Project>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
index 2733001..bbfba4b 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
@@ -84,10 +84,6 @@
<Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
<Name>FSpot.Core</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
@@ -95,6 +91,9 @@
<Reference Include="System" />
<Reference Include="Mono.Posix" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
index 9b75e5b..0a3a3c5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
@@ -72,6 +72,13 @@
<Reference Include="Mono.Posix" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
@@ -94,14 +101,6 @@
<Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
<Name>FSpot.Core</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
index 227ceb6..e51780f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
@@ -74,20 +74,19 @@
<Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
<Name>FSpot.Core</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="Mono.Posix" />
<Reference Include="ICSharpCode.SharpZipLib" />
<Reference Include="System" />
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
index 4608b7d..6f197ca 100644
--- a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
@@ -62,6 +62,13 @@
<ItemGroup>
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
@@ -84,14 +91,6 @@
<Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
<Name>FSpot.Utils</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="FSpot.Tools.ChangePhotoPath\" />
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj
index 508a3d4..e8264e9 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj
@@ -77,17 +77,16 @@
<Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
<Name>FSpot.Utils</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Posix" />
<Reference Include="System" />
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
index def9c8c..28c9f22 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
@@ -83,6 +83,9 @@
<Reference Include="Mono.Posix" />
<Reference Include="System" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
@@ -101,9 +104,5 @@
<Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
<Name>FSpot.Utils</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
index 0931c83..35d090a 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
@@ -87,18 +87,17 @@
<Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
<Name>FSpot.Utils</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gio-sharp\gio-sharp.csproj">
- <Project>{942B6AEF-0A90-4A7F-B8E4-F1A4327E408C}</Project>
- <Name>gio-sharp</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Posix" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Private>False</Private>
+ <Package>gio-sharp-2.0</Package>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="FSpot.Tools.MergeDb\" />
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
index d6e8ce7..796d073 100644
--- a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
@@ -59,6 +59,9 @@
</ProjectExtensions>
<ItemGroup>
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
@@ -73,10 +76,6 @@
<Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
<Name>FSpot.Gui</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.csproj">
- <Project>{069D1797-427D-4CED-A754-233DE64FC5DD}</Project>
- <Name>gtk-sharp-beans</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="FSpot.Tools.ScreensaverConfig\" />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
