diff options
author | Lluis Sanchez <lluis@novell.com> | 2010-03-17 15:50:19 +0300 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2010-03-17 15:50:19 +0300 |
commit | b2c81a6c6d742aacc87a4d190a55ca553cdbdced (patch) | |
tree | 5169bb646665e48e158c1c0bf2e389478d459289 /main/src/addins/GnomePlatform | |
parent | 13bba2fa864ebe3209ae0673d93f5bbbdb4ecc05 (diff) | |
parent | 585086f0ea0a49166046bb8f48d2def87907d0e0 (diff) |
Merged MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
and MD.Components into MD.Ide.
svn path=/trunk/monodevelop/; revision=153749
Diffstat (limited to 'main/src/addins/GnomePlatform')
-rw-r--r-- | main/src/addins/GnomePlatform/ChangeLog | 10 | ||||
-rw-r--r-- | main/src/addins/GnomePlatform/Gio.cs | 3 | ||||
-rw-r--r-- | main/src/addins/GnomePlatform/GnomePlatform.addin.xml | 2 | ||||
-rw-r--r-- | main/src/addins/GnomePlatform/GnomePlatform.cs | 12 | ||||
-rw-r--r-- | main/src/addins/GnomePlatform/GnomePlatform.csproj | 7 | ||||
-rw-r--r-- | main/src/addins/GnomePlatform/Makefile.am | 2 |
6 files changed, 19 insertions, 17 deletions
diff --git a/main/src/addins/GnomePlatform/ChangeLog b/main/src/addins/GnomePlatform/ChangeLog index d1c2e74ac0..bb9e6b8125 100644 --- a/main/src/addins/GnomePlatform/ChangeLog +++ b/main/src/addins/GnomePlatform/ChangeLog @@ -1,3 +1,13 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * Gio.cs: + * Makefile.am: + * GnomePlatform.cs: + * GnomePlatform.csproj: + * GnomePlatform.addin.xml: Merged MD.Projects into MD.Core, + and MD.Projects.Gui, MD.Core.Gui and MD.Components into + MD.Ide. + 2010-02-18 Lluis Sanchez Gual <lluis@novell.com> * GnomePlatform.csproj: Add missing reference. diff --git a/main/src/addins/GnomePlatform/Gio.cs b/main/src/addins/GnomePlatform/Gio.cs index db48994915..89eed2f66b 100644 --- a/main/src/addins/GnomePlatform/Gio.cs +++ b/main/src/addins/GnomePlatform/Gio.cs @@ -24,11 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -using GLib; using System; using System.Collections; using System.Runtime.InteropServices; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide.Desktop; namespace MonoDevelop.Platform { diff --git a/main/src/addins/GnomePlatform/GnomePlatform.addin.xml b/main/src/addins/GnomePlatform/GnomePlatform.addin.xml index 8557efbf27..1654c25448 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.addin.xml +++ b/main/src/addins/GnomePlatform/GnomePlatform.addin.xml @@ -15,7 +15,7 @@ <Dependencies> <Addin id="Core" version="2.2"/> - <Addin id="Core.Gui" version="2.2"/> + <Addin id="Ide" version="2.2"/> </Dependencies> <Extension path = "/MonoDevelop/Core/PlatformService"> diff --git a/main/src/addins/GnomePlatform/GnomePlatform.cs b/main/src/addins/GnomePlatform/GnomePlatform.cs index a5c67ab4db..32697281c5 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.cs +++ b/main/src/addins/GnomePlatform/GnomePlatform.cs @@ -26,17 +26,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; -using System.IO; -using System.Collections; -using System.Diagnostics; -using System.Text.RegularExpressions; -using System.Runtime.InteropServices; - -using MonoDevelop.Core.Gui; using Gnome; +using MonoDevelop.Ide.Desktop; +using System; using System.Collections.Generic; - +using System.Runtime.InteropServices; namespace MonoDevelop.Platform { diff --git a/main/src/addins/GnomePlatform/GnomePlatform.csproj b/main/src/addins/GnomePlatform/GnomePlatform.csproj index 9d4f59d327..f3cbcc1ccc 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.csproj +++ b/main/src/addins/GnomePlatform/GnomePlatform.csproj @@ -64,10 +64,9 @@ <Name>MonoDevelop.Core</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Core.Gui\MonoDevelop.Core.Gui.csproj"> - <Project>{659B0888-3956-4040-BDB1-B45F6D64E7FA}</Project> - <Name>MonoDevelop.Core.Gui</Name> - <Private>False</Private> + <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> + <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> + <Name>MonoDevelop.Ide</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/GnomePlatform/Makefile.am b/main/src/addins/GnomePlatform/Makefile.am index 0752186e60..07c24c2ce0 100644 --- a/main/src/addins/GnomePlatform/Makefile.am +++ b/main/src/addins/GnomePlatform/Makefile.am @@ -4,7 +4,7 @@ ASSEMBLY = $(ADDIN_BUILD)/GnomePlatform.dll DEPS = \ $(top_builddir)/build/bin/MonoDevelop.Core.dll \ - $(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll + $(top_builddir)/build/bin/MonoDevelop.Ide.dll REFS = \ $(GCONF_SHARP_LIBS) \ |