DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Use a single tag for the standard error stream

Browse Source
This commit is contained in:
Pierre Pronchery 2015-10-04 12:12:35 +02:00
parent 1c67ae9260
commit ad7088f015
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/common.c
View File

@ -50,6 +50,7 @@ struct _CommonTask
/* stderr */ /* stderr */
gint e_fd; gint e_fd;
GIOChannel * e_channel; GIOChannel * e_channel;
GtkTextTag * e_tag;
guint e_source; guint e_source;
/* widgets */ /* widgets */
@ -257,6 +258,9 @@ static CommonTask * _common_task_new(BrowserPluginHelper * helper,
1); 1);
g_error_free(error); g_error_free(error);
} }
task->e_tag = gtk_text_buffer_create_tag(
_common_task_get_buffer(task), "stderr",
"foreground", "red", NULL);
task->e_source = g_io_add_watch(task->e_channel, G_IO_IN, task->e_source = g_io_add_watch(task->e_channel, G_IO_IN,
_common_task_on_io_can_read, task); _common_task_on_io_can_read, task);
_common_task_set_status(task, _("Running command...")); _common_task_set_status(task, _("Running command..."));
@ -542,9 +546,7 @@ static gboolean _common_task_on_io_can_read(GIOChannel * channel,
{ {
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(task->view)); tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(task->view));
gtk_text_buffer_get_end_iter(tbuf, &iter); gtk_text_buffer_get_end_iter(tbuf, &iter);
tag = (channel == task->e_channel) tag = (channel == task->e_channel) ? task->e_tag : NULL;
? gtk_text_buffer_create_tag(tbuf, NULL, "foreground",
"red", NULL) : NULL;
gtk_text_buffer_insert_with_tags(tbuf, &iter, buf, cnt, tag, gtk_text_buffer_insert_with_tags(tbuf, &iter, buf, cnt, tag,
NULL); NULL);
} }