SF.net SVN: geany-plugins:[644] trunk/geanyvc/geanyvc.c

[frlan at users.sourceforge.net]

Revision: 644
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=644&view=rev
Author:   frlan
Date:     2009-05-13 22:22:28 +0000 (Wed, 13 May 2009)

Log Message:
-----------
GeanyVC: Fix a minor issue with not correct updated editor menu items

Modified Paths:
--------------
    trunk/geanyvc/geanyvc.c

Modified: trunk/geanyvc/geanyvc.c
===================================================================
--- trunk/geanyvc/geanyvc.c	2009-05-13 22:21:46 UTC (rev 643)
+++ trunk/geanyvc/geanyvc.c	2009-05-13 22:22:28 UTC (rev 644)
@@ -2165,27 +2165,27 @@
 	tooltips = gtk_tooltips_new();
 
 	/* Add file menu also to editor menu (at mouse cursor) */
-	if (set_editor_menu_entries == TRUE)
+	if (set_editor_menu_entries == TRUE && editor_menu_vc == NULL)
 	{
 		menu_item_sep = gtk_separator_menu_item_new();
 		gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), menu_item_sep);
 		do_current_file_menu(&editor_menu_vc, &tooltips, TRUE);
 		gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), editor_menu_vc);
+		gtk_widget_show_all(editor_menu_vc);
+		gtk_widget_show_all(menu_item_sep);
 	}
 
 	/* Add commit item zo editor menu */
-	if (set_editor_menu_entries == TRUE)
+	if (set_editor_menu_entries == TRUE && editor_menu_commit == NULL)
 	{
 		editor_menu_commit = gtk_menu_item_new_with_mnemonic(_("VC _Commit"));
 		gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), editor_menu_commit);
+		g_signal_connect((gpointer) editor_menu_commit, "activate",
+			G_CALLBACK(vccommit_activated), NULL);
+		gtk_widget_show_all(editor_menu_commit);
 	}
 
-	g_signal_connect((gpointer) editor_menu_commit, "activate",
-		 G_CALLBACK(vccommit_activated), NULL);
 
-	gtk_widget_show_all(editor_menu_vc);
-	gtk_widget_show_all(editor_menu_commit);
-	gtk_widget_show_all(menu_item_sep);
 }
 
 static void


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.