keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #230 from cgwalters/app-use-libglnx-console

Browse Source 
app: Use libglnx console API
This commit is contained in:
Colin Walters 2016-03-10 19:33:30 -05:00
commit aa3f7700f8
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit 8a7943fef6061a4e9ca368e0042a8a3924affb99 Subproject commit 08ae6639e522e9b11765245fbecdbbe474ccde98

11
src/app/rpmostree-dbus-helpers.c
View File

@ -306,7 +306,7 @@ transaction_get_progress_line (guint64 start_time,
typedef struct typedef struct
{ {
GSConsole *console; GLnxConsoleRef console;
gboolean in_status_line; gboolean in_status_line;
GError *error; GError *error;
GMainLoop *loop; GMainLoop *loop;
@ -320,7 +320,6 @@ transaction_progress_new (void)
TransactionProgress *self; TransactionProgress *self;
self = g_slice_new0 (TransactionProgress); self = g_slice_new0 (TransactionProgress);
self->console = gs_console_get ();
self->loop = g_main_loop_new (NULL, FALSE); self->loop = g_main_loop_new (NULL, FALSE);
return self; return self;
@ -342,7 +341,7 @@ end_status_line (TransactionProgress *self)
if (self->in_status_line) if (self->in_status_line)
{ {
ret = gs_console_end_status_line (self->console, NULL, NULL); glnx_console_unlock (&self->console);
self->in_status_line = FALSE; self->in_status_line = FALSE;
} }
@ -354,12 +353,11 @@ static gboolean
add_status_line (TransactionProgress *self, add_status_line (TransactionProgress *self,
const char *line) const char *line)
{ {
if (self->console) if (self->console.is_tty)
{ {
self->in_status_line = TRUE; self->in_status_line = TRUE;
return gs_console_begin_status_line (self->console, line, NULL, NULL); glnx_console_text (line);
} }
else
return TRUE; return TRUE;
} }
@ -368,7 +366,6 @@ static void
transaction_progress_end (TransactionProgress *self) transaction_progress_end (TransactionProgress *self)
{ {
end_status_line (self); end_status_line (self);
self->console = NULL;
g_main_loop_quit (self->loop); g_main_loop_quit (self->loop);
} }