diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-03-03 15:58:58 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2009-03-03 15:58:58 +0000 |
| commit | 5838b96c55de01abb76a9e3b0c52858d3462fa10 (patch) | |
| tree | 835bf2cc4060d8f5de05ce7bc198cdb58f5d0725 | |
| parent | 84b77418010aef78f7e1946b940efd91304708e1 (diff) | |
| download | gvfs-5838b96c55de01abb76a9e3b0c52858d3462fa10.tar.gz | |
Make argument const char * as per the glib change.
2009-03-03 Alexander Larsson <alexl@redhat.com>
* client/gdaemonfileinputstream.c:
* client/gdaemonfileoutputstream.c:
Make argument const char * as per the glib change.
svn path=/trunk/; revision=2282
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | client/gdaemonfileinputstream.c | 10 | ||||
| -rw-r--r-- | client/gdaemonfileoutputstream.c | 14 |
3 files changed, 18 insertions, 12 deletions
@@ -1,3 +1,9 @@ +2009-03-03 Alexander Larsson <alexl@redhat.com> + + * client/gdaemonfileinputstream.c: + * client/gdaemonfileoutputstream.c: + Make argument const char * as per the glib change. + 2009-03-02 Ryan Lortie <desrt@desrt.ca> * daemon/trashlib/trashitem.c (trash_item_restore): set 'error' on diff --git a/client/gdaemonfileinputstream.c b/client/gdaemonfileinputstream.c index 63ad5ecc..db7c3abf 100644 --- a/client/gdaemonfileinputstream.c +++ b/client/gdaemonfileinputstream.c @@ -233,7 +233,7 @@ static gboolean g_daemon_file_input_stream_close (GInputStream GCancellable *cancellable, GError **error); static GFileInfo *g_daemon_file_input_stream_query_info (GFileInputStream *stream, - char *attributes, + const char *attributes, GCancellable *cancellable, GError **error); static goffset g_daemon_file_input_stream_tell (GFileInputStream *stream); @@ -271,7 +271,7 @@ static gboolean g_daemon_file_input_stream_close_finish (GInputStream GAsyncResult *result, GError **error); static void g_daemon_file_input_stream_query_info_async (GFileInputStream *stream, - char *attributes, + const char *attributes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -1591,7 +1591,7 @@ iterate_query_state_machine (GDaemonFileInputStream *file, static GFileInfo * g_daemon_file_input_stream_query_info (GFileInputStream *stream, - char *attributes, + const char *attributes, GCancellable *cancellable, GError **error) { @@ -1606,7 +1606,7 @@ g_daemon_file_input_stream_query_info (GFileInputStream *stream, memset (&op, 0, sizeof (op)); op.state = QUERY_STATE_INIT; if (attributes) - op.attributes = attributes; + op.attributes = (char *)attributes; else op.attributes = ""; @@ -2074,7 +2074,7 @@ async_query_done (GInputStream *stream, static void g_daemon_file_input_stream_query_info_async (GFileInputStream *stream, - char *attributes, + const char *attributes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, diff --git a/client/gdaemonfileoutputstream.c b/client/gdaemonfileoutputstream.c index c03eb0dd..27992bf8 100644 --- a/client/gdaemonfileoutputstream.c +++ b/client/gdaemonfileoutputstream.c @@ -180,7 +180,7 @@ static gboolean g_daemon_file_output_stream_close (GOutputStream GCancellable *cancellable, GError **error); static GFileInfo *g_daemon_file_output_stream_query_info (GFileOutputStream *stream, - char *attributes, + const char *attributes, GCancellable *cancellable, GError **error); static char *g_daemon_file_output_stream_get_etag (GFileOutputStream *stream); @@ -210,7 +210,7 @@ static gboolean g_daemon_file_output_stream_close_finish (GOutputStream GAsyncResult *result, GError **error); static void g_daemon_file_output_stream_query_info_async (GFileOutputStream *stream, - char *attributes, + const char *attributes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -1143,8 +1143,8 @@ iterate_query_state_machine (GDaemonFileOutputStream *file, } static GFileInfo * -g_daemon_file_output_stream_query_info (GFileOutputStream *stream, - char *attributes, +g_daemon_file_output_stream_query_info (GFileOutputStream *stream, + const char *attributes, GCancellable *cancellable, GError **error) { @@ -1159,7 +1159,7 @@ g_daemon_file_output_stream_query_info (GFileOutputStream *stream, memset (&op, 0, sizeof (op)); op.state = QUERY_STATE_INIT; if (attributes) - op.attributes = attributes; + op.attributes = (char *)attributes; else op.attributes = ""; @@ -1602,8 +1602,8 @@ async_query_done (GOutputStream *stream, } static void -g_daemon_file_output_stream_query_info_async (GFileOutputStream *stream, - char *attributes, +g_daemon_file_output_stream_query_info_async (GFileOutputStream *stream, + const char *attributes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, |