[anjuta] Continued reorganization of git menu

[Johannes Schmid <jhs src gnome org>]

commit 2b0127ea5e308374b2970d6c33f5aa401df6d62f
Author: Johannes Schmid <jhs gnome org>
Date:   Fri Apr 17 23:05:55 2009 +0200

    Continued reorganization of git menu
---
 plugins/git/anjuta-git.ui |   26 ++++++++++++--------------
 plugins/git/plugin.c      |   10 +++++++++-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index 231090b..ea45b59 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -6,10 +6,9 @@
 			<placeholder name="PlaceholderGitMenus">
 				<menuitem name="Commit..." action="ActionGitCommit" />
 				<menuitem name="Fetch" action="ActionGitFetch" />
-				
 				<menuitem name="Pull..." action="ActionGitPull" />
-				<placeholder name="PlaceholderBranches"/>
-				<menu name="BranchesMenu">
+				<placeholder name="PlaceholderBranches">
+				<menu name="BranchesMenu" action="ActionMenuGitBranches">
 				  <menuitem name="Create branch..." action="ActionGitCreateBranch" />
 				  <menuitem name="Delete branch..." action="ActionGitDeleteBranch" />
 				  <menuitem name="Switch to another branch..." action="ActionGitSwitch" />
@@ -31,13 +30,20 @@
   				</placeholder>
   		  </menu>
   		  </placeholder>
-				<menuitem name="Unstage files..." action="ActionGitUnstageFiles" />
-				<menuitem name="Check out files..." action="ActionGitCheckoutFiles" />
-				<menuitem name="Resolve conflicts..." action="ActionGitResolve" />
 				<menuitem name="Create patch series..." action="ActionGitCreatePatchSeries" />
+				<menuitem name="Diff uncommitted changes" action="ActionGitDiffUncommitted" />
+  		  <separator />
+				<menuitem name="Check out files..." action="ActionGitCheckoutFiles" />
 				<separator name="separator1" />
+				<menuitem name="Unstage files..." action="ActionGitUnstageFiles" />
 				<menuitem name="Reset tree..." action="ActionGitReset" />
 				<menuitem name="Revert commit..." action="ActionGitRevert" />
+				<menuitem name="Resolve conflicts..." action="ActionGitResolve" />
+				<separator name="separator4" />
+				<menuitem name="Add..." action="ActionGitAdd" />
+				<menuitem name="Remove..." action="ActionGitRemove" />
+				<menuitem name="Ignore..." action="ActionGitIgnore" />
+				<menuitem name="Create tag..." action="ActionGitCreateTag" />
 				<separator name="separator2" />
 				<placeholder name="PlaceholderBisectMenu">
 					<menu name="Bisect" action="ActionMenuGitBisect">
@@ -50,14 +56,6 @@
 				</placeholder>
 				<separator name="separator3" />
 				<menuitem name="View log..." action="ActionGitLog" />
-				<separator name="separator4" />
-				<menuitem name="Add..." action="ActionGitAdd" />
-				<menuitem name="Remove..." action="ActionGitRemove" />
-				<menuitem name="Ignore..." action="ActionGitIgnore" />
-				<separator name="separator6" />
-				<menuitem name="Create tag..." action="ActionGitCreateTag" />
-				<separator name="separator7" />
-				<menuitem name="Diff uncommitted changes" action="ActionGitDiffUncommitted" />
 			</placeholder>
 		</menu>
 		</placeholder>
diff --git a/plugins/git/plugin.c b/plugins/git/plugin.c
index dc3b2d5..e7c7146 100644
--- a/plugins/git/plugin.c
+++ b/plugins/git/plugin.c
@@ -173,9 +173,17 @@ static GtkActionEntry actions_git[] =
 		G_CALLBACK (on_menu_git_revert)    /* action callback */
 	},
 	{
+		"ActionMenuGitBranches",                       /* Action name */
+		NULL,                            /* Stock icon, if any */
+		N_("_Branches"),                     /* Display label */
+		NULL,                                     /* short-cut */
+		NULL,                      /* Tooltip */
+		NULL    /* action callback */
+	},
+	{
 		"ActionMenuGitBisect",                       /* Action name */
 		NULL,                            /* Stock icon, if any */
-		N_("_Bisect"),                     /* Display label */
+		N_("Bisect"),                     /* Display label */
 		NULL,                                     /* short-cut */
 		NULL,                      /* Tooltip */
 		NULL    /* action callback */