gnome-mount r183 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Fri Jun 27 10:05:54 2008
New Revision: 183
URL: http://svn.gnome.org/viewvc/gnome-mount?rev=183&view=rev

Log:
2008-06-27  Cosimo Cecchi  <cosimoc gnome org>

	* src/gnome-mount.c: (volume_mount), (main):
	Plug some memory leaks. (#474563, Kjartan Maraas).


Modified:
   trunk/ChangeLog
   trunk/src/gnome-mount.c

Modified: trunk/src/gnome-mount.c
==============================================================================
--- trunk/src/gnome-mount.c	(original)
+++ trunk/src/gnome-mount.c	Fri Jun 27 10:05:54 2008
@@ -1136,7 +1136,6 @@
 	char *mount_point;
 	char *fstype_override;
 	GPtrArray *mount_options;
-	char **valid_options;
 	char *key;
 	gboolean ret;
 	const char *fstype;
@@ -1234,8 +1233,6 @@
 		fstype = NULL;
 	}
 	
-	valid_options = libhal_device_get_property_strlist (hal_ctx, udi, "volume.mount.valid_options", NULL);
-
 	mount_options = g_ptr_array_new ();
 	mount_point = NULL;
 	fstype_override = NULL;
@@ -3040,12 +3037,17 @@
 
 
 	/* infer from commandline */
-	if (strcmp (g_path_get_basename (argv[0]), "gnome-umount") == 0) {
+	char *basename;
+
+	basename  = g_path_get_basename (argv[0]);
+	if (strcmp (basename, "gnome-umount") == 0) {
 		opt_unmount = TRUE;
-	} else if (strcmp (g_path_get_basename (argv[0]), "gnome-eject") == 0) {
+	} else if (strcmp (basename, "gnome-eject") == 0) {
 		opt_eject = TRUE;
 	}
 
+	g_free (basename);
+
 	if (opt_unmount && opt_eject) {
                 if (opt_verbose)
                         g_message (_("Cannot unmount and eject simultaneously"));