[nautilus-actions] NadpReader: reset the writability status if import source is read-only



commit 1dd65b1c73d2abca7ecee43a9b5265a45ee6bcba
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 1 20:38:45 2012 +0100

    NadpReader: reset the writability status if import source is read-only

 ChangeLog                    |    5 +++++
 src/io-desktop/nadp-reader.c |    6 ++++++
 2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a94f440..8164192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-02-01 Pierre Wieser <pwieser trychlos org>
 
+	* src/io-desktop/nadp-reader.c
+	(item_from_desktop_file): Fix a small memory leak.
+	(nadp_reader_iimporter_import_from_uri): Reset writability status in the
+	case where import source is read-only.
+
 	* src/plugin-menu/nautilus-actions.c: Only expands candidate items.
 
 	* src/core/na-tokens.c (execute_action_command): Parse working dir.
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index dde79cd..f36b792 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -309,6 +309,8 @@ item_from_desktop_file( const NadpDesktopProvider *provider, NadpDesktopFile *nd
 		g_free( reader_data );
 	}
 
+	g_free( type );
+
 	return( item );
 }
 
@@ -397,6 +399,10 @@ nadp_reader_iimporter_import_from_uri( const NAIImporter *instance, void *parms_
 			g_object_weak_unref( G_OBJECT( parms->imported ), ( GWeakNotify ) desktop_weak_notify, ndf );
 			g_object_unref( ndf );
 
+			/* also remove the 'writable' status'
+			 */
+			na_object_set_readonly( parms->imported, FALSE );
+
 			code = IMPORTER_CODE_OK;
 		}
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]