X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgresourcefile.c;h=380095c468268f64cef0527166d0d657f7f7255a;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=82993278854ca6ce57f94d2cba59e307a9396dd8;hpb=e041843b3e70df95c8909cf4e35728d0d88c1530;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gresourcefile.c b/gio/gresourcefile.c
index 8299327..380095c 100644
--- a/gio/gresourcefile.c
+++ b/gio/gresourcefile.c
@@ -13,9 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
@@ -72,6 +70,8 @@ static void g_resource_file_file_iface_init (GFileIface *iface);
static GFileAttributeInfoList *resource_writable_attributes = NULL;
static GFileAttributeInfoList *resource_writable_namespaces = NULL;
+static GType _g_resource_file_enumerator_get_type (void);
+
#define G_TYPE_RESOURCE_FILE_ENUMERATOR (_g_resource_file_enumerator_get_type ())
#define G_RESOURCE_FILE_ENUMERATOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_RESOURCE_FILE_ENUMERATOR, GResourceFileEnumerator))
#define G_RESOURCE_FILE_ENUMERATOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_RESOURCE_FILE_ENUMERATOR, GResourceFileEnumeratorClass))
@@ -289,7 +289,7 @@ g_resource_file_get_parent (GFile *file)
parent = g_object_new (G_TYPE_RESOURCE_FILE, NULL);
parent->path = g_strndup (resource->path,
- end - resource->path - 1);
+ end - resource->path);
return G_FILE (parent);
}
@@ -453,8 +453,8 @@ g_resource_file_query_info (GFile *file,
resource->path);
}
else
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
- my_error->message);
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ my_error->message);
g_clear_error (&my_error);
return FALSE;
}
@@ -465,6 +465,7 @@ g_resource_file_query_info (GFile *file,
info = g_file_info_new ();
base = g_resource_file_get_basename (file);
g_file_info_set_name (info, base);
+ g_file_info_set_display_name (info, base);
_g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_READ, TRUE);
_g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_WRITE, FALSE);
@@ -553,8 +554,8 @@ g_resource_file_read (GFile *file,
resource->path);
}
else
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
- my_error->message);
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ my_error->message);
g_clear_error (&my_error);
return NULL;
}
@@ -827,9 +828,9 @@ g_resource_file_input_stream_close (GInputStream *stream,
static goffset
g_resource_file_input_stream_tell (GFileInputStream *stream)
{
- GResourceFileInputStream *file = G_RESOURCE_FILE_INPUT_STREAM (stream);;
+ GResourceFileInputStream *file = G_RESOURCE_FILE_INPUT_STREAM (stream);
- if (!G_IS_SEEKABLE (file->stream));
+ if (!G_IS_SEEKABLE (file->stream))
return 0;
return g_seekable_tell (G_SEEKABLE (file->stream));