2007-08-16 Murray Cumming <murrayc@murrayc.com>
+ * src/modest-tny-account-store.c: (volume_path_is_mounted):
+ Check the GnomeVFSVolume activation path instead of the device path,
+ so that the memory card is really really shown in the UI.
+
+2007-08-16 Murray Cumming <murrayc@murrayc.com>
+
* src/maemo/easysetup/modest-easysetup-wizard.c:
(get_entered_account_title), (on_before_next), (entry_is_empty),
(create_account):
gboolean volume_path_is_mounted (const gchar* path)
{
+ g_return_val_if_fail (path, FALSE);
+
gboolean result = FALSE;
+ gchar * path_as_uri = g_filename_to_uri (path, NULL, NULL);
+ g_return_val_if_fail (path_as_uri, FALSE);
/* Get the monitor singleton: */
GnomeVFSVolumeMonitor *monitor = gnome_vfs_get_volume_monitor();
char *display_name =
gnome_vfs_volume_get_display_name (volume);
printf ("volume display name=%s\n", display_name);
+ g_free (display_name);
*/
-
- char *device_path =
- gnome_vfs_volume_get_device_path (volume);
- /* printf (" device path=%s\n", device_path); */
- if (device_path && (strcmp (device_path, path) == 0))
+
+ char *uri =
+ gnome_vfs_volume_get_activation_uri (volume);
+ /* printf (" uri=%s\n", uri); */
+ if (uri && (strcmp (uri, path_as_uri) == 0))
result = TRUE;
- /* g_free (display_name); */
- g_free (device_path);
+ g_free (uri);
gnome_vfs_volume_unref (volume);
}
g_list_free (list);
+ g_free (path_as_uri);
+
return result;
}