Sync

ChangeLog

@@ -1,3 +1,8 @@
+1999-02-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtkedit/editwidget.c (selection_send): Use the proper type for
+	64-bit cleanliness (Patch from George Lebl).
+
 Tue Feb 16 21:24:43 1999  David Martin <dmartina@usa.net>
 
 	* gtkedit/gtkedit.c: Hack to get one more string defined in a macro 

gnome/ChangeLog

@@ -1,5 +1,9 @@
 1999-02-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
+	* gdesktop.c (desktop_reload_icons): Fix memory leak.
+
+	* glayout.c (create_new_menu_from): Fix memory leak.
+
 	* gdesktop.c (desktop_icon_info_open): Launch a panel at the
 	location of the mount point.
 

gnome/gdesktop.c

@@ -448,8 +448,6 @@ desktop_reload_icons (int user_pos, int xpos, int ypos)
 		if (have_pos) {
 			dii = desktop_icon_info_new (dirent->d_name, desktop_url, caption, x, y);
 			gtk_widget_show (dii->dicon);
-
-			g_free (full_name);
 		} else {
 			file_and_url_t *fau;
 
@@ -462,6 +460,8 @@ desktop_reload_icons (int user_pos, int xpos, int ypos)
 			need_position_list = g_slist_prepend (need_position_list, fau);
 		}
 
+		g_free (full_name);
+		
 		if (desktop_url)
 			g_free (desktop_url);
 
@@ -1499,6 +1499,7 @@ icon_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, gu
 				       dii->selected);
 
 	gdk_drag_status (context, action, time);
+	file_entry_free (fe);
 	return TRUE;
 }
 

gnome/glayout.c

@@ -460,9 +460,10 @@ create_new_menu_from (GnomeApp *app, WPanel *panel, char *file)
 				continue;
 			}
 
-			if (!gnome_is_program_in_path (gde->tryexec)){
+			path = gnome_is_program_in_path (gde->tryexec);
+			g_free (path);
+			if (!path){
 				g_free (file2);
-				g_print ("yes!\n");
 				continue;
 			}
 			

gnome/gpopup.c

@@ -377,7 +377,7 @@ create_actions (GtkWidget *menu, WPanel *panel,
 				fullname = g_concat_dir_and_file (desktop_directory, dii->filename);
 				fe = file_entry_from_file (fullname);
 				if (fe){
-					v = is_mountable (fullname, fe, &is_mounted);
+					v = is_mountable (fullname, fe, &is_mounted, NULL);
 					file_entry_free (fe);
 					g_free (fullname);
 					
@@ -404,7 +404,7 @@ create_actions (GtkWidget *menu, WPanel *panel,
 				fullname = g_concat_dir_and_file (desktop_directory, dii->filename);
 				fe = file_entry_from_file (fullname);
 				if (fe){
-					v = is_mountable (fullname, fe, &is_mounted);
+					v = is_mountable (fullname, fe, &is_mounted, NULL);
 					file_entry_free (fe);
 					g_free (fullname);
 					

icons/Makefile.in

@@ -34,9 +34,8 @@ ALLICONS = a.xpm application.xpm binary.xpm bitmap.xpm blackhole.xpm \
 # are obtained
 #
 DECENTICONS = \
-	compressed.xpm o.xpm 	\
-	sound.xpm makefile.xpm word.xpm tex.xpm man.xpm 	\
-	postscript.xpm tex.xpm text.xpm trash.xpm
+	sound.xpm makefile.xpm \
+	  trash.xpm
 
 all:
 

src/main.c

@@ -2347,10 +2347,8 @@ OS_Setup ()
     if (!shell || !*shell)
 	shell = "/bin/sh";
 
-#ifndef HAVE_GNOME
     g_snprintf (control_file, sizeof (control_file), CONTROL_FILE, getpid ());
     my_putenv ("MC_CONTROL_FILE", control_file);
-#endif
     
     /* This is the directory, where MC was installed, on Unix this is LIBDIR */
     /* and can be overriden by the MC_LIBDIR environment variable */