From 192bf09529663427e84df7de6e36df25e8a87ebc Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 25 Apr 2019 09:25:49 +0100 Subject: [PATCH] =?UTF-8?q?general:=20Remove=20a=20few=20unhelpful=20refer?= =?UTF-8?q?ences=20to=20=E2=80=98master=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of these have a negative master/slave connotation, and they add no value. Change or drop them. Signed-off-by: Philip Withnall --- docs/reference/gobject/tut_tools.xml | 2 +- gio/gnetworkaddress.c | 2 +- gio/tests/gapplication.c | 6 +++--- gio/tests/socket-client.c | 2 +- gio/tests/socket-server.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/reference/gobject/tut_tools.xml b/docs/reference/gobject/tut_tools.xml index 000366f19..f1076e832 100644 --- a/docs/reference/gobject/tut_tools.xml +++ b/docs/reference/gobject/tut_tools.xml @@ -94,7 +94,7 @@ break g_object_unref if _object == 0xcafebabe libraries is built with a combination of complex tools. Typically, the part of the documentation which describes the behavior of each function is extracted from the specially-formatted source code comments by a tool named gtk-doc which - generates DocBook XML and merges this DocBook XML with a set of master XML + generates DocBook XML and merges this DocBook XML with a set of template XML DocBook files. These XML DocBook files are finally processed with xsltproc (a small program part of the libxslt library) to generate the final HTML output. Other tools can be used to generate PDF output from the source XML. diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c index df1bc3158..7e46f5e4a 100644 --- a/gio/gnetworkaddress.c +++ b/gio/gnetworkaddress.c @@ -1108,7 +1108,7 @@ g_network_address_address_enumerator_next (GSocketAddressEnumerator *enumerator /* * Each enumeration lazily initializes the internal address list from the - * master list. It does this since addresses come in asynchronously and + * main list. It does this since addresses come in asynchronously and * they need to be resorted into the list already in use. */ static GSocketAddress * diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c index ec57977a5..900e7ac97 100644 --- a/gio/tests/gapplication.c +++ b/gio/tests/gapplication.c @@ -140,7 +140,7 @@ basic (void) main_loop = g_main_loop_new (NULL, 0); - /* spawn the master */ + /* spawn the main instance */ spawn ("activated\n" "open file:///a file:///b\n" "exit status: 0\n", NULL, @@ -191,7 +191,7 @@ test_remote_command_line (void) NULL); g_object_unref (file); - /* spawn the master */ + /* spawn the main instance */ spawn (replies, NULL, "./cmd", NULL); @@ -255,7 +255,7 @@ test_remote_actions (void) main_loop = g_main_loop_new (NULL, 0); - /* spawn the master */ + /* spawn the main instance */ spawn ("got ./cmd 0\n" "activate action1\n" "change action2 1\n" diff --git a/gio/tests/socket-client.c b/gio/tests/socket-client.c index 803f4d6e9..8df1c28f3 100644 --- a/gio/tests/socket-client.c +++ b/gio/tests/socket-client.c @@ -431,7 +431,7 @@ main (int argc, { if (!g_socket_close (socket, &error)) { - g_printerr ("Error closing master socket: %s\n", + g_printerr ("Error closing socket: %s\n", error->message); return 1; } diff --git a/gio/tests/socket-server.c b/gio/tests/socket-server.c index decf3ecd1..24cf0182e 100644 --- a/gio/tests/socket-server.c +++ b/gio/tests/socket-server.c @@ -356,7 +356,7 @@ main (int argc, if (!g_socket_close (socket, &error)) { - g_printerr ("Error closing master socket: %s\n", + g_printerr ("Error closing socket: %s\n", error->message); return 1; }