[maemo-commits] [maemo-commits] r13545 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-08-31 18:46:54 +0300 (Fri, 31 Aug 2007)
New Revision: 13545

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-storage-dialog.c
Log:
	* hildon-fm/hildon-file-system-storage-dialog.c: do not statfs()
	remote paths. Fixes #61944.
	(file_system_storage_dialog_stats_get_apps): Reject any URI type
	except URI_TYPE_FILE_SYSTEM.  Applications are never anywhere
	else.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-08-31 15:45:49 UTC (rev 13544)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-08-31 15:46:54 UTC (rev 13545)
@@ -1,5 +1,15 @@
 2007-08-31  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-system-storage-dialog.c: do not statfs()
+	remote paths. Fixes #61944.
+	(file_system_storage_dialog_stats_get_apps): Reject any URI type
+	except URI_TYPE_FILE_SYSTEM.  Applications are never anywhere
+	else.
+
+        * hildon-fm/hildon-file-system-model.c
+        (hildon_file_system_model_row_draggable): ask whether the row
+	content is available before allowing DnD on it. Fixes NB65966.
+	
         Make nodes reload on rescan. Fix NB64425.
 
         * hildon-fm/hildon-file-system-private.c (create_child_location)

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-08-31 15:45:49 UTC (rev 13544)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-08-31 15:46:54 UTC (rev 13545)
@@ -5,6 +5,7 @@
     Fixes: NB#62319.
   * Correct sort order of top-level items.  Fixes: NB#65611.
   * Fixes: NB#65543, NB#67080, NB#66863, NB#64420, NB#64425.
+  * Fixes: NB#65966, NB#61944.
   
  -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 14 Aug 2007 19:48:47 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-storage-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-storage-dialog.c	2007-08-31 15:45:49 UTC (rev 13544)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-storage-dialog.c	2007-08-31 15:46:54 UTC (rev 13545)
@@ -102,7 +102,7 @@
 static void     file_system_storage_dialog_stats_clear            (GtkWidget                          *widget);
 static gboolean file_system_storage_dialog_stats_collect          (GtkWidget                          *widget,
 								   GnomeVFSURI                        *uri);
-static gboolean file_system_storage_dialog_stats_get_disk         (const gchar                        *path,
+static gboolean file_system_storage_dialog_stats_get_disk         (GnomeVFSURI                        *uri,
 								   GnomeVFSFileSize                   *total,
 								   GnomeVFSFileSize                   *available);
 static void     file_system_storage_dialog_stats_get_contacts     (GtkWidget                          *widget);
@@ -586,13 +586,14 @@
 } 
 
 static gboolean
-file_system_storage_dialog_stats_get_disk (const gchar      *path,
+file_system_storage_dialog_stats_get_disk (GnomeVFSURI      *uri,
 					   GnomeVFSFileSize *total,
 					   GnomeVFSFileSize *available)
 {
         struct statfs st;
 
-        if (statfs (path, &st) == 0) {
+        if (gnome_vfs_uri_is_local (uri) &&
+	    statfs (gnome_vfs_uri_get_path (uri), &st) == 0) {
                 if (total) {
                         *total = st.f_blocks;
 			*total *= st.f_bsize;
@@ -830,7 +831,7 @@
                 priv->get_apps_id = 0;
         }
         
-	if (priv->uri_type != URI_TYPE_FILE_SYSTEM && priv->uri_type != URI_TYPE_UNKNOWN) {
+	if (priv->uri_type != URI_TYPE_FILE_SYSTEM) {
 		return;
 	}
 
@@ -1274,7 +1275,7 @@
         /* Set volume stats */
 	uri = gnome_vfs_uri_new (priv->uri_str);
 
-        if (file_system_storage_dialog_stats_get_disk (gnome_vfs_uri_get_path (uri),
+        if (file_system_storage_dialog_stats_get_disk (uri,
 						       &total_size,
 						       &available_size)) {
 		total = file_system_storage_dialog_get_size_string (total_size);