extensionSystem: Replace Shell.write_soup_message_to_stream with GBytes usage
https://bugzilla.gnome.org/show_bug.cgi?id=676837
This commit is contained in:
parent
0c736c4561
commit
96396163cf
@ -102,7 +102,8 @@ function gotExtensionZipFile(session, message, uuid) {
|
|||||||
|
|
||||||
let [file, stream] = Gio.File.new_tmp('XXXXXX.shell-extension.zip');
|
let [file, stream] = Gio.File.new_tmp('XXXXXX.shell-extension.zip');
|
||||||
let dir = ExtensionUtils.userExtensionsDir.get_child(uuid);
|
let dir = ExtensionUtils.userExtensionsDir.get_child(uuid);
|
||||||
Shell.write_soup_message_to_stream(stream.output_stream, message);
|
let contents = message.response_body.flatten().as_bytes();
|
||||||
|
stream.output_stream.write_bytes(contents, null);
|
||||||
stream.close(null);
|
stream.close(null);
|
||||||
let [success, pid] = GLib.spawn_async(null,
|
let [success, pid] = GLib.spawn_async(null,
|
||||||
['unzip', '-uod', dir.get_path(), '--', file.get_path()],
|
['unzip', '-uod', dir.get_path(), '--', file.get_path()],
|
||||||
|
@ -592,29 +592,6 @@ shell_util_get_week_start ()
|
|||||||
return week_start;
|
return week_start;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* shell_write_soup_message_to_stream:
|
|
||||||
* @stream: a #GOutputStream
|
|
||||||
* @message: a #SoupMessage
|
|
||||||
* @error: location to store GError
|
|
||||||
*
|
|
||||||
* Write a string to a GOutputStream as binary data. This is a
|
|
||||||
* workaround for the lack of proper binary strings in GJS.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
shell_write_soup_message_to_stream (GOutputStream *stream,
|
|
||||||
SoupMessage *message,
|
|
||||||
GError **error)
|
|
||||||
{
|
|
||||||
SoupMessageBody *body;
|
|
||||||
|
|
||||||
body = message->response_body;
|
|
||||||
|
|
||||||
g_output_stream_write_all (stream,
|
|
||||||
body->data, body->length,
|
|
||||||
NULL, NULL, error);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* shell_write_string_to_stream:
|
* shell_write_string_to_stream:
|
||||||
* @stream: a #GOutputStream
|
* @stream: a #GOutputStream
|
||||||
|
@ -25,10 +25,6 @@ char *shell_util_normalize_and_casefold (const char *str);
|
|||||||
char *shell_util_format_date (const char *format,
|
char *shell_util_format_date (const char *format,
|
||||||
gint64 time_ms);
|
gint64 time_ms);
|
||||||
|
|
||||||
void shell_write_soup_message_to_stream (GOutputStream *stream,
|
|
||||||
SoupMessage *message,
|
|
||||||
GError **error);
|
|
||||||
|
|
||||||
gboolean shell_write_string_to_stream (GOutputStream *stream,
|
gboolean shell_write_string_to_stream (GOutputStream *stream,
|
||||||
const char *str,
|
const char *str,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
Loading…
Reference in New Issue
Block a user