[f-spot] Remove the Export suffix from CDExport.



commit 9e1828457161079e1b0f4a050c56ab46845885c2
Author: Ruben Vermeersch <ruben savanne be>
Date:   Mon Aug 9 17:06:53 2010 +0200

    Remove the Export suffix from CDExport.
    
    Should do this for all exporters.

 F-Spot.sln                                         |   18 +++++++++---------
 build/build.environment.mk                         |    2 +-
 configure.ac                                       |    2 +-
 .../FSpot.Exporters.CD.csproj}                     |    6 +++---
 .../FSpot.Exporters.CD}/CDExport.cs                |    2 +-
 .../FSpot.Exporters.CD}/CDExportDialog.cs          |    2 +-
 .../Makefile.am                                    |    8 ++++----
 .../Resources/CDExport.addin.xml                   |    2 +-
 .../Resources/CDExport.ui                          |    0
 src/Extensions/Exporters/Makefile.am               |    2 +-
 10 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/F-Spot.sln b/F-Spot.sln
index 6480a81..9fed98d 100644
--- a/F-Spot.sln
+++ b/F-Spot.sln
@@ -63,7 +63,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{78EC5D8B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exporters", "Exporters", "{C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.CDExport", "src\Extensions\Exporters\FSpot.Exporters.CDExport\FSpot.Exporters.CDExport.csproj", "{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.CD", "src\Extensions\Exporters\FSpot.Exporters.CD\FSpot.Exporters.CD.csproj", "{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.FacebookExport", "src\Extensions\Exporters\FSpot.Exporters.FacebookExport\FSpot.Exporters.FacebookExport.csproj", "{7004A4E6-12A5-46F1-BB1F-578FA9B63493}"
 EndProject
@@ -210,14 +210,14 @@ Global
 		{903D6440-A981-4B29-8825-7EB820684925}.Release|Any CPU.Build.0 = Release|Any CPU
 		{903D6440-A981-4B29-8825-7EB820684925}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
 		{903D6440-A981-4B29-8825-7EB820684925}.Submodule|Any CPU.Build.0 = Debug|Any CPU
-		{95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
-		{95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.Build.0 = Submodule|Any CPU
+		{95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E12}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E12}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E12}.Submodule|Any CPU.ActiveCfg = Submodule|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E12}.Submodule|Any CPU.Build.0 = Submodule|Any CPU
-		{95374549-9553-4C1E-9D89-667755F90E13}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
-		{95374549-9553-4C1E-9D89-667755F90E13}.Debug|Any CPU.Build.0 = Submodule|Any CPU
+		{95374549-9553-4C1E-9D89-667755F90E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95374549-9553-4C1E-9D89-667755F90E13}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E13}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E13}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E13}.Submodule|Any CPU.ActiveCfg = Submodule|Any CPU
@@ -234,8 +234,8 @@ Global
 		{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Submodule|Any CPU.Build.0 = Debug|Any CPU
-		{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
-		{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Debug|Any CPU.Build.0 = Submodule|Any CPU
+		{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Submodule|Any CPU.ActiveCfg = Submodule|Any CPU
@@ -246,8 +246,8 @@ Global
 		{BE981FC8-9B41-4336-815C-ECC365AE05D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BE981FC8-9B41-4336-815C-ECC365AE05D4}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
 		{BE981FC8-9B41-4336-815C-ECC365AE05D4}.Submodule|Any CPU.Build.0 = Debug|Any CPU
-		{C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
-		{C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.Build.0 = Submodule|Any CPU
+		{C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C856EFD8-E812-4E61-8B76-E3583D94C233}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{C856EFD8-E812-4E61-8B76-E3583D94C233}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{C856EFD8-E812-4E61-8B76-E3583D94C233}.Submodule|Any CPU.ActiveCfg = Submodule|Any CPU
diff --git a/build/build.environment.mk b/build/build.environment.mk
index f89944b..e2f06ad 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -140,7 +140,7 @@ REF_FSPOT_EXTENSION_BWEDITOR = $(LINK_FSPOT_DEPS) $(LINK_MONO_SIMD)
 REF_FSPOT_EXTENSION_FLIPEDITOR = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_PIXELATEEDITOR = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_RESIZEEDITOR = $(LINK_FSPOT_DEPS)
-REF_FSPOT_EXTENSION_CDEXPORT = $(LINK_FSPOT_DEPS)
+REF_FSPOT_EXTENSION_CD = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_FACEBOOKEXPORT = $(LINK_FSPOT_DEPS) $(LINK_KEYRING)
 REF_FSPOT_EXTENSION_FLICKREXPORT = $(LINK_FSPOT_DEPS) $(LINK_FLICKRNET)
 REF_FSPOT_EXTENSION_FOLDEREXPORT = $(LINK_FSPOT_DEPS) $(LINK_SYSTEM_WEB)
diff --git a/configure.ac b/configure.ac
index 8c89cb7..d75f950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -367,7 +367,7 @@ src/Extensions/Editors/FSpot.Editors.FlipEditor/Makefile
 src/Extensions/Editors/FSpot.Editors.PixelateEditor/Makefile
 src/Extensions/Editors/FSpot.Editors.ResizeEditor/Makefile
 src/Extensions/Exporters/Makefile
-src/Extensions/Exporters/FSpot.Exporters.CDExport/Makefile
+src/Extensions/Exporters/FSpot.Exporters.CD/Makefile
 src/Extensions/Exporters/FSpot.Exporters.FlickrExport/Makefile
 src/Extensions/Exporters/FSpot.Exporters.GalleryExport/Makefile
 src/Extensions/Exporters/FSpot.Exporters.FacebookExport/Makefile
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport.csproj b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
similarity index 95%
rename from src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport.csproj
rename to src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
index e0d69b5..b38dd59 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
@@ -32,8 +32,8 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FSpot.Exporters.CDExport\CDExport.cs" />
-    <Compile Include="FSpot.Exporters.CDExport\CDExportDialog.cs" />
+    <Compile Include="FSpot.Exporters.CD\CDExport.cs" />
+    <Compile Include="FSpot.Exporters.CD\CDExportDialog.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\CDExport.addin.xml">
@@ -88,7 +88,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="FSpot.Exporters.CDExport\" />
     <Folder Include="Resources\" />
+    <Folder Include="FSpot.Exporters.CD\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport/CDExport.cs b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
similarity index 99%
rename from src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport/CDExport.cs
rename to src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
index db7b75d..2827305 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport/CDExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
@@ -28,7 +28,7 @@ using GLib;
 using Gtk;
 using GtkBeans;
 
-namespace FSpot.Exporters.CDExport {
+namespace FSpot.Exporters.CD {
 	public class CDExport : FSpot.Extensions.IExporter {
 		IBrowsableCollection selection;
 
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport/CDExportDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
similarity index 98%
rename from src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport/CDExportDialog.cs
rename to src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
index 3abf93f..6295798 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CDExport/FSpot.Exporters.CDExport/CDExportDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
@@ -13,7 +13,7 @@ using GLib;
 using Gtk;
 using GtkBeans;
 
-namespace FSpot.Exporters.CDExport
+namespace FSpot.Exporters.CD
 {
 	class CDExportDialog : BuilderDialog {
 		Gtk.Window listwindow;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CDExport/Makefile.am b/src/Extensions/Exporters/FSpot.Exporters.CD/Makefile.am
similarity index 53%
rename from src/Extensions/Exporters/FSpot.Exporters.CDExport/Makefile.am
rename to src/Extensions/Exporters/FSpot.Exporters.CD/Makefile.am
index 74bcce8..a8c94e0 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CDExport/Makefile.am
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/Makefile.am
@@ -1,11 +1,11 @@
-ASSEMBLY = FSpot.Exporters.CDExport
+ASSEMBLY = FSpot.Exporters.CD
 TARGET = library
-LINK = $(REF_FSPOT_EXTENSION_CDEXPORT)
+LINK = $(REF_FSPOT_EXTENSION_CD)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
-	FSpot.Exporters.CDExport/CDExport.cs \
-	FSpot.Exporters.CDExport/CDExportDialog.cs
+	FSpot.Exporters.CD/CDExport.cs \
+	FSpot.Exporters.CD/CDExportDialog.cs
 
 RESOURCES =  \
 	Resources/CDExport.addin.xml \
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CDExport/Resources/CDExport.addin.xml b/src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml
similarity index 93%
rename from src/Extensions/Exporters/FSpot.Exporters.CDExport/Resources/CDExport.addin.xml
rename to src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml
index a7fe3b6..a28fce9 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CDExport/Resources/CDExport.addin.xml
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml
@@ -12,6 +12,6 @@
 	</Dependencies>
 
 	<Extension path = "/FSpot/Menus/Exports">
-		<ExportMenuItem id="CD" _label = "_CD..." class = "FSpot.Exporters.CDExport.CDExport" />
+		<ExportMenuItem id="CD" _label = "_CD..." class = "FSpot.Exporters.CD.CDExport" />
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CDExport/Resources/CDExport.ui b/src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui
similarity index 100%
rename from src/Extensions/Exporters/FSpot.Exporters.CDExport/Resources/CDExport.ui
rename to src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui
diff --git a/src/Extensions/Exporters/Makefile.am b/src/Extensions/Exporters/Makefile.am
index 5dcb952..d92128a 100644
--- a/src/Extensions/Exporters/Makefile.am
+++ b/src/Extensions/Exporters/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = 			\
-	FSpot.Exporters.CDExport		\
+	FSpot.Exporters.CD		\
 	FSpot.Exporters.FacebookExport		\
 	FSpot.Exporters.FlickrExport		\
 	FSpot.Exporters.FolderExport		\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]