Revision: 451 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=451&view=rev Author: yurand Date: 2009-02-06 21:41:40 +0000 (Fri, 06 Feb 2009)

Log Message: ----------- GeanyVC: remove word 'Current' from menu

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

Modified: trunk/geanyvc/geanyvc.c =================================================================== --- trunk/geanyvc/geanyvc.c 2009-02-06 11:15:05 UTC (rev 450) +++ trunk/geanyvc/geanyvc.c 2009-02-06 21:41:40 UTC (rev 451) @@ -875,8 +875,8 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, question, - (flags & (FLAG_DIR | FLAG_BASEDIR) ? dir : doc-> - file_name)); + (flags & (FLAG_DIR | FLAG_BASEDIR) ? dir : + doc->file_name)); result = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } @@ -1921,7 +1921,7 @@ /* Menu which will hold the items in the current file menu */ cur_file_menu = gtk_menu_new();

- *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _File")); + *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("_File")); g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL);

/* Diff of current file */ @@ -2006,7 +2006,7 @@ /* Menu which will hold the items in the current file menu */ cur_dir_menu = gtk_menu_new();

- *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _Directory")); + *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("_Directory")); g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); /* Diff of the current dir */ menu_vc_diff_dir = gtk_menu_item_new_with_mnemonic(_("_Diff")); @@ -2046,7 +2046,7 @@ /* Menu which will hold the items in the current file menu */ basedir_menu = gtk_menu_new();

- *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _Basedirectory")); + *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("_Base Directory")); g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL);

/* Complete diff of base directory */

Modified: trunk/geanyvc/vc_git.c =================================================================== --- trunk/geanyvc/vc_git.c 2009-02-06 11:15:05 UTC (rev 450) +++ trunk/geanyvc/vc_git.c 2009-02-06 21:41:40 UTC (rev 451) @@ -64,6 +64,7 @@ }

static const gchar *GIT_ENV_SHOW[] = { "PAGER=cat", NULL }; + static gint git_show(gchar ** std_out, gchar ** std_err, const gchar * filename, GSList * list, const gchar * message) @@ -89,11 +90,13 @@ static const gchar *GIT_CMD_DIFF_FILE[] = { "git", "diff", "HEAD", "--", BASENAME, NULL }; static const gchar *GIT_CMD_DIFF_DIR[] = { "git", "diff", "HEAD", NULL }; static const gchar *GIT_CMD_REVERT_FILE[] = { "git", "checkout", "--", BASENAME, NULL }; + static const gchar *GIT_CMD_REVERT_DIR[] = { "git", "reset", "--", BASE_DIRNAME, CMD_SEPARATOR, "git", "checkout", "HEAD", "--", BASE_DIRNAME, NULL }; static const gchar *GIT_CMD_STATUS[] = { "git", "status", NULL }; static const gchar *GIT_CMD_ADD[] = { "git", "add", "--", BASENAME, NULL }; + static const gchar *GIT_CMD_REMOVE[] = { "git", "rm", "-f", "--", BASENAME, CMD_SEPARATOR, "git", "reset", "HEAD", "--", BASENAME, NULL

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