From 91f33087fa3455e7819ca16e4077d82d3c0a2426 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 3 Aug 2012 14:25:02 +0400
Subject: [PATCH] IDEA-89712 Make Github plugin depend on Tasks plugin. (cherry
 picked from commit 537a8e108302f4501577e1db71c2405c18695293)

Conflicts:

	plugins/github/src/META-INF/plugin.xml
---
 plugins/github/src/META-INF/githubtracker.xml | 5 -----
 plugins/github/src/META-INF/plugin.xml        | 5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 plugins/github/src/META-INF/githubtracker.xml

diff --git a/plugins/github/src/META-INF/githubtracker.xml b/plugins/github/src/META-INF/githubtracker.xml
deleted file mode 100644
index 3f70e9be02cc..000000000000
--- a/plugins/github/src/META-INF/githubtracker.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <checkoutCompletedListener implementation="org.jetbrains.plugins.github.GithubCheckoutListener" order="after PlatformProjectCheckoutListener"/>
-  </extensions>
-</idea-plugin>
\ No newline at end of file
diff --git a/plugins/github/src/META-INF/plugin.xml b/plugins/github/src/META-INF/plugin.xml
index 104297300162..e6fa00a6b744 100644
--- a/plugins/github/src/META-INF/plugin.xml
+++ b/plugins/github/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
 
   <depends>com.intellij.modules.lang</depends>
   <depends>Git4Idea</depends>
-  <depends optional="true" config-file="githubtracker.xml">com.intellij.tasks</depends>
+  <depends>com.intellij.tasks</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
@@ -15,6 +15,7 @@
                         serviceImplementation="org.jetbrains.plugins.github.GithubSettings"/>
     <applicationConfigurable instance="org.jetbrains.plugins.github.ui.GitHubSettingsConfigurable"/>
     <vcsAnnotationGutterActionProvider implementation="org.jetbrains.plugins.github.ui.GithubAnnotationGutterActionProvider" />
+    <checkoutCompletedListener implementation="org.jetbrains.plugins.github.GithubCheckoutListener" order="after PlatformProjectCheckoutListener"/>
   </extensions>
 
   <actions>
@@ -39,4 +40,4 @@
     </action>
     <action id="Github.Rebase.Internal" class="org.jetbrains.plugins.github.GithubRebase"/>
   </actions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>