[gedit] Changed location of exernal tools to $(PLUGINSDIR)/externaltools/tools

[Jesse van den Kieboom <jessevdk src gnome org>]

commit c3537f8ab4e4e330288354f34414a578367fbd5a
Author: Jesse van den Kieboom <jesse icecrew nl>
Date:   Fri May 22 03:00:27 2009 +0200

    Changed location of exernal tools to $(PLUGINSDIR)/externaltools/tools
    
    Before, external tools were installed in $(PLUGINSDIR)/tools, and other
    external tools files in the proper location. Now all files are neatly installed in the
    correct externaltools directory
---
 plugins/externaltools/data/Makefile.am  |    2 +-
 plugins/externaltools/tools/__init__.py |    3 +--
 plugins/externaltools/tools/library.py  |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am
index e11628f..b7b593c 100644
--- a/plugins/externaltools/data/Makefile.am
+++ b/plugins/externaltools/data/Makefile.am
@@ -9,7 +9,7 @@ tools_in_files = \
 desktop_in_files = $(tools_in_files:.tool.in=.desktop.in)
 desktop_files    = $(tools_in_files:.tool.in=.desktop)
 tools_SCRIPTS    = $(tools_in_files:.tool.in=)
-toolsdir = $(GEDIT_PLUGINS_DATA_DIR)/tools
+toolsdir = $(GEDIT_PLUGINS_DATA_DIR)/externaltools/tools
 
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/externaltools/tools/__init__.py b/plugins/externaltools/tools/__init__.py
index f8f7cac..c722ced 100644
--- a/plugins/externaltools/tools/__init__.py
+++ b/plugins/externaltools/tools/__init__.py
@@ -187,8 +187,7 @@ class ExternalToolsPlugin(gedit.Plugin):
         super(ExternalToolsPlugin, self).__init__()
         
         self._manager = None
-
-        ToolLibrary().set_locations(self.get_data_dir())
+        ToolLibrary().set_locations(os.path.join(self.get_data_dir(), 'tools'))
 
     def activate(self, window):
         helper = ExternalToolsWindowHelper(self, window)
diff --git a/plugins/externaltools/tools/library.py b/plugins/externaltools/tools/library.py
index 2cd34af..cf14e87 100644
--- a/plugins/externaltools/tools/library.py
+++ b/plugins/externaltools/tools/library.py
@@ -41,7 +41,7 @@ class ToolLibrary(Singleton):
 
         if platform.platform() != 'Windows':
             for d in self.get_xdg_data_dirs():
-                self.locations.append(os.path.join(d, 'gedit-2/plugins/tools'))
+                self.locations.append(os.path.join(d, 'gedit-2', 'plugins', 'externaltools', 'tools'))
 
         self.locations.append(datadir)