Browse Source

More makefile fixes -mig

Miguel de Icaza 26 years ago
parent
commit
8fac5dd743
7 changed files with 281 additions and 246 deletions
  1. 1 1
      configure.in
  2. 5 0
      doc/mc.1.in
  3. 1 1
      gnome/glayout.c
  4. 4 2
      gnome/gmain.c
  5. 1 1
      gtkedit/Makefile.in
  6. 266 238
      po/mc.pot
  7. 3 3
      vfs/README.fish

+ 1 - 1
configure.in

@@ -5,7 +5,7 @@ AC_INIT(create_vcs)
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.1.35
+VERSION=4.5.0
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)

+ 5 - 0
doc/mc.1.in

@@ -2922,6 +2922,11 @@ and unused keys everywhere).
 .PP
 .SH ""
 .SH FILES
+.PP
+The program will retrieve all of its information relative to the
+MCHOME environment variable, if this variable is not set, then it will
+fall back to the @prefix@ directory.
+.PP
 @prefix@/lib/mc.hlp
 .IP
 The help file for the program.

+ 1 - 1
gnome/glayout.c

@@ -342,7 +342,7 @@ GnomeUIInfo gnome_panel_about_menu [] = {
 };
 
 GnomeUIInfo gnome_panel_menu [] = {
-	{ GNOME_APP_UI_SUBTREE, N_("File"),     NULL, &gnome_panel_file_menu },
+	{ GNOME_APP_UI_SUBTREE, N_("_File"),     NULL, &gnome_panel_file_menu },
 	{ GNOME_APP_UI_SUBTREE, N_("Window"),    NULL, &gnome_panel_panel_menu },
 	{ GNOME_APP_UI_SUBTREE, N_("Commands"), NULL, &gnome_panel_commands_menu },
 	{ GNOME_APP_UI_SUBTREE, N_("Options"),  NULL, &gnome_panel_options_menu },

+ 4 - 2
gnome/gmain.c

@@ -137,8 +137,10 @@ dialog_key_pressed (GtkWidget *win, GdkEventKey *event, Dlg_head *h)
 	}
 	
 	gtk_signal_emit_stop_by_name (GTK_OBJECT (win), "key_press_event");
-	dlg_key_event (h, key);
-	return TRUE;
+	if (dlg_key_event (h, key))
+		return TRUE;
+	else
+		return FALSE;
 }
 
 void

+ 1 - 1
gtkedit/Makefile.in

@@ -77,7 +77,7 @@ uninstall:
 	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
 
 distcopy:
-	$(CP) $(DIST) ../../mc-$(VERSION)/edit
+	$(CP) $(DIST) ../../mc-$(VERSION)/gtkedit
 
 depend dep: mcdep
 

File diff suppressed because it is too large
+ 266 - 238
po/mc.pot


+ 3 - 3
vfs/README.fish

@@ -2,9 +2,9 @@
 		FIles transferred over SHell protocol (V 0.0.2)
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-This protocol was designed for transferring files over secureshell
-(ssh) connection. It can be as well used for transfers over rsh, and
-there may be other uses.
+This protocol was designed for transferring files over a remote shell
+connection (rsh and compatibles). It can be as well used for transfers over 
+rsh, and there may be other uses.
 
 Client sends requests of following form:
 

Some files were not shown because too many files changed in this diff