AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Rename broadwayd to gtk4-broadwayd

Browse Source 
This was the last unprefixed binary, and it was causing file
conflicts between gtk3 and gtk4.
This commit is contained in:
Matthias Clasen 2016-11-18 13:40:37 -05:00
parent 36575a4424
commit b15bc437a6
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/reference/gtk/Makefile.am
View File

@ -278,7 +278,6 @@ MKHTML_OPTIONS="--path=\"$(abs_srcdir):$(top_srcdir)/examples\""
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
content_files = \
broadway.xml \
broadwayd.xml \
building.sgml \
compiling.sgml \
css-overview.xml \
@ -286,6 +285,7 @@ content_files = \
drawing-model.xml \
getting_started.xml \
glossary.xml \
gtk4-broadwayd.xml \
gtk4-demo-application.xml \
gtk4-demo.xml \
gtk4-icon-browser.xml \
@ -486,17 +486,17 @@ EXTRA_DIST += version.xml.in gtk4.types.in
########################################################################
man_MANS = \
gtk4-query-immodules.1 \
gtk4-update-icon-cache.1 \
gtk4-encode-symbolic-svg.1 \
gtk4-launch.1 \
gtk4-broadwayd.1 \
gtk4-builder-tool.1 \
gtk4-demo.1 \
gtk4-demo-application.1 \
gtk4-widget-factory.1 \
gtk4-encode-symbolic-svg.1 \
gtk4-icon-browser.1 \
broadwayd.1 \
gtk4-builder-tool.1 \
gtk4-query-settings.1
gtk4-launch.1 \
gtk4-query-immodules.1 \
gtk4-query-settings.1 \
gtk4-update-icon-cache.1 \
gtk4-widget-factory.1
if ENABLE_MAN

2
docs/reference/gtk/gtk-docs.sgml
View File

@ -364,7 +364,7 @@
<xi:include href="gtk4-builder-tool.xml" />
<xi:include href="gtk4-launch.xml" />
<xi:include href="gtk4-query-settings.xml" />
<xi:include href="broadwayd.xml" />
<xi:include href="gtk4-broadwayd.xml" />
</part>
<part id="platform-support">

18
docs/reference/gtk/broadwayd.xml → docs/reference/gtk/gtk4-broadwayd.xml
View File

@ -2,10 +2,10 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
]>
<refentry id="broadwayd">
<refentry id="gtk4-broadwayd">
<refentryinfo>
<title>broadwayd</title>
<title>gtk4-broadwayd</title>
<productname>GTK+</productname>
<authorgroup>
<author>
@ -17,19 +17,19 @@
</refentryinfo>
<refmeta>
<refentrytitle>broadwayd</refentrytitle>
<refentrytitle>gtk4-broadwayd</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="manual">User Commands</refmiscinfo>
</refmeta>
<refnamediv>
<refname>broadwayd</refname>
<refname>gtk4-broadwayd</refname>
<refpurpose>Broadway display server</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>broadwayd</command>
<command>gtk4-broadwayd</command>
<arg choice="opt">--port <replaceable>PORT</replaceable></arg>
<arg choice="opt">--address <replaceable>ADDRESS</replaceable></arg>
<arg choice="opt">--unixsocket <replaceable>ADDRESS</replaceable></arg>
@ -39,15 +39,15 @@
<refsect1><title>Description</title>
<para>
<command>broadwayd</command> is a display server for the Broadway
<command>gtk4-broadwayd</command> is a display server for the Broadway
GDK backend. It allows multiple GTK+ applications to display their
windows in the same web browser, by connecting to broadwayd.
windows in the same web browser, by connecting to gtk4-broadwayd.
</para>
<para>
When using broadwayd, specify the display number to use, prefixed
When using gtk4-broadwayd, specify the display number to use, prefixed
with a colon, similar to X. The default display number is 0.
<programlisting>
broadwayd :5
gtk4-broadwayd :5
</programlisting>
Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
Start your applications like this:

14
gdk/broadway/Makefile.am
View File

@ -20,7 +20,7 @@ LDADDS = $(GDK_DEP_LIBS) -lrt
noinst_LTLIBRARIES = libgdk-broadway.la
bin_PROGRAMS = broadwayd
bin_PROGRAMS = gtk4-broadwayd
libgdkinclude_HEADERS = \
gdkbroadway.h
@ -84,7 +84,7 @@ libgdk_broadway_la_LIBADD = \
$(NULL)
endif
broadwayd_SOURCES = \
gtk4_broadwayd_SOURCES = \
broadway-protocol.h \
broadwayd.c \
broadway-server.h \
@ -95,9 +95,9 @@ broadwayd_SOURCES = \
broadway-output.c
if OS_WIN32
broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
gtk4_broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
else
broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@
gtk4_broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@
endif
MAINTAINERCLEANFILES = $(broadway_built_sources)
@ -106,7 +106,7 @@ EXTRA_DIST += $(broadway_built_sources)
BUILT_SOURCES = $(broadway_built_sources)
# ------------------- MSVC Build Items ----------------
MSVCPROJS = gdk4-broadway broadwayd
MSVCPROJS = gdk4-broadway gtk4-broadwayd
gdk4_broadway_FILES = $(libgdk_broadway_la_SOURCES)
gdk4_broadway_EXCLUDES = dummy
@ -116,8 +116,8 @@ gdk4_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
gdk4_broadway_HEADERS_EXCLUDES = dummy
broadwayd_FILES = $(broadwayd_SOURCES)
broadwayd_EXCLUDES = dummy
gtk4_broadwayd_FILES = $(broadwayd_SOURCES)
gtk4_broadwayd_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj

2
gdk/broadway/broadwayd.c
View File

@ -449,7 +449,7 @@ main (int argc, char *argv[])
{
if (*argv[1] != ':')
{
g_printerr ("Usage broadwayd [:DISPLAY]\n");
g_printerr ("Usage gtk4-broadwayd [:DISPLAY]\n");
exit (1);
}
display = argv[1];