diff options
| author | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2008-10-05 11:04:26 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2008-10-05 11:04:26 +0200 |
| commit | d0caac91ac0a03e021d50d1de978733e11ba2ccd (patch) | |
| tree | b763e376e8f289baaccf332398d9354663115792 /gvfs/gvfs.c | |
| parent | c41d3e7d896492dd70cd1d548ef4fd5b3cbe4954 (diff) | |
| download | tuxcmd-modules-d0caac91ac0a03e021d50d1de978733e11ba2ccd.tar.xz | |
VFS API break: Introduce FDisplayName propertyv0.6.52
Diffstat (limited to 'gvfs/gvfs.c')
| -rw-r--r-- | gvfs/gvfs.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gvfs/gvfs.c b/gvfs/gvfs.c index 54ff29f..c9a8a7e 100644 --- a/gvfs/gvfs.c +++ b/gvfs/gvfs.c @@ -31,8 +31,8 @@ -#define VERSION "0.0.5" -#define BUILD_DATE "2008-09-03" +#define VERSION "0.1.0" +#define BUILD_DATE "2008-10-05" #define DEFAULT_BLOCK_SIZE 0x10000 /* 64kB */ #define CONST_DEFAULT_QUERY_INFO_ATTRIBUTES G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_NAME "," \ @@ -167,7 +167,7 @@ mount_done_cb (GObject *object, globs = (struct TVFSGlobs*) user_data; g_assert (globs != NULL); - + succeeded = g_file_mount_enclosing_volume_finish (G_FILE (object), res, &error); if (! succeeded) { @@ -326,7 +326,7 @@ VFSOpen (struct TVFSGlobs *globs, char *sName) if (seg == 4 && uri_schema && uri_username && uri_password && uri_service) uri = g_strdup_printf ("%s://%s@%s", uri_schema, uri_username, uri_service); } - + // g_print ("uri_schema = '%s', uri_username = '%s', uri_password = '%s', uri_service = '%s'\n", uri_schema, uri_username, uri_password, uri_service); // g_print ("uri = '%s'\n", uri); if (uri_schema) @@ -338,7 +338,7 @@ VFSOpen (struct TVFSGlobs *globs, char *sName) if (uri_service) free (uri_service); } - + g_print ("(II) VFSOpen: opening URI '%s'\n", uri ? uri : sName); f = g_file_new_for_commandline_arg (uri ? uri : sName); @@ -418,7 +418,7 @@ VFSGetPath (struct TVFSGlobs *globs) g_free (path); g_object_unref (root); return s; - } + } else return NULL; } @@ -557,7 +557,8 @@ g_file_info_to_TVFSItem (GFileInfo *info, struct TVFSItem *Item) g_assert (info != NULL); g_assert (Item != NULL); - Item->sFileName = g_strdup (g_file_info_get_name (info)); + Item->FName = g_strdup (g_file_info_get_name (info)); + Item->FDisplayName = g_strdup (g_file_info_get_display_name (info)); Item->sLinkTo = g_file_info_get_symlink_target (info) == NULL ? NULL : g_strdup (g_file_info_get_symlink_target (info)); Item->iSize = g_file_info_get_size (info); Item->iMode = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE); @@ -595,7 +596,7 @@ g_file_info_to_TVFSItem (GFileInfo *info, struct TVFSItem *Item) default: Item->ItemType = vRegular; } } - + /* fallback to default file mode if read fails */ if (Item->iMode == 0) { if (Item->ItemType == vDirectory) |