1999-01-02 Miguel de Icaza <miguel@nuclecu.unam.mx>

* gmetadata.c (gmeta_get_icon_pos): Fixed the memory leak here.

	* gicon.c (gicon_get_icon_for_file): Actually return a value
	here.

Editor fixes, vfs warning fixes;

gnome/ChangeLog

@@ -1,3 +1,10 @@
+1999-01-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gmetadata.c (gmeta_get_icon_pos): Fixed the memory leak here. 
+
+	* gicon.c (gicon_get_icon_for_file): Actually return a value
+	here. 
+
 1999-01-01  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* gscreen.c (panel_fill_panel_list): Assertion that will pin point

gnome/Makefile.in

@@ -237,7 +237,7 @@ TAGS: $(GNOMESRCS)
 	etags $(GNOMESRCS)
 
 clean:
-	$(RMF) @gmc@ *.o core a.out mx @LIBVFS@ libgtkedit.a libmcslang.a
+	$(RMF) gmc corba-gmc *.o core a.out mx @LIBVFS@ libgtkedit.a libmcslang.a
 
 realclean: clean
 	$(RMF) .depend

gnome/gicon.c

@@ -286,5 +286,5 @@ gicon_get_icon_for_file_speed (file_entry *fe, gboolean do_quick)
 GdkImlibImage *
 gicon_get_icon_for_file (file_entry *fe)
 {
-	gicon_get_icon_for_file_speed (fe, TRUE);
+	return gicon_get_icon_for_file_speed (fe, TRUE);
 }

gnome/gmetadata.c

@@ -41,11 +41,17 @@ gmeta_get_icon_pos (char *filename, int *x, int *y)
 	if (gnome_metadata_get (filename, ICON_POSITION, &size, &buf) != 0)
 		return FALSE;
 
-	if (!buf || (sscanf (buf, "%d%d", &tx, &ty) != 2)) {
+	if (!buf){
 		g_warning ("Invalid metadata for \"%s\"'s icon position, using auto-placement", filename);
 		return FALSE;
 	}
 
+
+	if ((sscanf (buf, "%d%d", &tx, &ty) != 2)) {
+		g_free (buf);
+		return FALSE;
+	}
+	g_free (buf);
 	*x = tx;
 	*y = ty;
 	return TRUE;

gtkedit/editcmd.c

@@ -2547,7 +2547,7 @@ void edit_goto_cmd (WEdit *edit)
 #if 0
     f = gtk_edit_dialog_input ("goto", 150, l ? itoa (l) : "", _(" Goto line "), _(" Enter line: "));
 #else
-    /* *** */
+    f = input_dialog (_(" Goto line "), _(" Enter line: "), l ? s : "");
 #endif
 #else
     f = CInputDialog ("goto", WIN_MESSAGES, 150, l ? itoa (l) : "", _(" Goto line "), _(" Enter line: "));

src/ChangeLog

@@ -1,3 +1,7 @@
+1999-01-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* main.c (main): Do not load the hotlist here anymore.
+
 1998-12-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* main.c (main): Removed old, unused code.

src/main.c

@@ -2960,9 +2960,6 @@ int main (int argc, char *argv [])
         application_keypad_mode ();
 #   endif
 
-    /* The directory hot list */
-    load_hotlist ();
-
     if (show_change_notice){
 	message (1, _(" Notice "),
 		 _(" The Midnight Commander configuration files \n"

vfs/direntry.c

@@ -734,6 +734,7 @@ int vfs_s_read (void *fh, char *buffer, int count)
 	return n;
     }
     vfs_die( "vfs_s_read: This should not happen\n" );
+    return -1;
 }
 
 int vfs_s_write (void *fh, char *buffer, int count)
@@ -752,6 +753,7 @@ int vfs_s_write (void *fh, char *buffer, int count)
 	return n;
     }
     vfs_die( "vfs_s_write: This should not happen\n" );
+    return 0;
 }
 
 int vfs_s_lseek (void *fh, off_t offset, int whence)

vfs/extfs.c

@@ -906,7 +906,7 @@ static int extfs_init (vfs *me)
         char key[256];
 	char *c;
 
-        if (!fgets( key, 250, cfg ))
+        if (!fgets( key, sizeof (key)-1, cfg ))
 	    break;
 
 	/* Handle those with a trailing ':', those flag that the