rename broadwayd -> cdkbroadwayd

NEWS

@@ -2804,7 +2804,7 @@ Overview of Changes in CTK+ 3.19.7
  759898 W32: There's a gap between tooltip window and its shadow
  760350 Cast the return value of g_array_free to void* before casting to...
  760388 MS lib files cannot be generated (with patch)
- 760416 broadwayd --help shows translated characters as question marks o...
+ 760416 cdkbroadwayd --help shows translated characters as question marks o...
  760427 Adwaita: Separators in popovers shouldn't always have margins
  760445 regression: openQA no longer able to press ctrl-alt-del to get t...
  760509 CdkWindow positions/sizes include css margins
@@ -4593,7 +4593,7 @@ Overview of Changes in CTK+ 3.15.1
  738886 Out of bounds access in MyEnhancedXkbTranslateKeyCode
  738955 Client-side decoration window menus appear at wrong positio...
  738982 Add support for ATK_STATE_HAS_TOOLTIP
- 739001 Fix Build of broadwayd on Visual Studio
+ 739001 Fix Build of cdkbroadwayd on Visual Studio
  739005 ctkstatusicon.c won't build with both X11 and Quartz backen...
  739111 CtkFontChooserDialog fixes
  739150 Dragging bookmark crashes nautilus
@@ -6919,7 +6919,7 @@ Overview of Changes in CTK+ 3.7.6
 
 * CtkFrame now draws a background.
 
-* The Broadway backend now installs a separate server: broadwayd.
+* The Broadway backend now installs a separate server: cdkbroadwayd.
 
 * Bug fixes:
  687025 iconhelper: Treat empty string as NULL stock-id

cdk/broadway/Makefile.am

@@ -21,13 +21,13 @@ LDADDS = $(CDK_DEP_LIBS) -lrt
 
 noinst_LTLIBRARIES = libcdk-broadway.la
 
-bin_PROGRAMS = broadwayd
+bin_PROGRAMS = cdkbroadwayd
 
 libcdkinclude_HEADERS = 	\
 	cdkbroadway.h
 
 libcdkbroadwayinclude_HEADERS = 	\
-	cdkbroadwaydisplay.h		\
+	cdkcdkbroadwaydisplay.h		\
 	cdkbroadwaywindow.h		\
 	cdkbroadwaycursor.h		\
 	cdkbroadwaymonitor.h		\
@@ -87,9 +87,9 @@ libcdk_broadway_la_LIBADD = \
 	$(NULL)
 endif
 
-broadwayd_SOURCES = \
+cdkbroadwayd_SOURCES = \
 	broadway-protocol.h		\
-	broadwayd.c 			\
+	cdkbroadwayd.c 			\
 	broadway-server.h		\
 	broadway-server.c		\
 	broadway-buffer.c		\
@@ -98,9 +98,9 @@ broadwayd_SOURCES = \
 	broadway-output.c
 
 if OS_WIN32
-broadwayd_LDADD = $(CDK_DEP_LIBS) -lws2_32
+cdkbroadwayd_LDADD = $(CDK_DEP_LIBS) -lws2_32
 else
-broadwayd_LDADD = $(CDK_DEP_LIBS) @SHM_LIBS@
+cdkbroadwayd_LDADD = $(CDK_DEP_LIBS) @SHM_LIBS@
 endif
 
 MAINTAINERCLEANFILES = $(broadway_built_sources)
@@ -113,7 +113,7 @@ EXTRA_DIST += \
 	gen-c-array.py
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = cdk3-broadway broadwayd
+MSVCPROJS = cdk3-broadway cdkbroadwayd
 
 cdk3_broadway_FILES = $(libcdk_broadway_la_SOURCES)
 cdk3_broadway_EXCLUDES = dummy
@@ -123,14 +123,14 @@ cdk3_broadway_HEADERS_INST = $(libcdkbroadwayinclude_HEADERS)
 
 cdk3_broadway_HEADERS_EXCLUDES = dummy
 
-broadwayd_FILES = $(broadwayd_SOURCES)
-broadwayd_EXCLUDES = dummy
+cdkbroadwayd_FILES = $(cdkbroadwayd_SOURCES)
+cdkbroadwayd_EXCLUDES = dummy
 
 include $(top_srcdir)/win32/Makefile.msvcproj
 
 dist-hook: \
 	$(top_builddir)/win32/vs9/cdk3-broadway.vcproj		\
-	$(top_builddir)/win32/vs9/broadwayd.vcproj		\
+	$(top_builddir)/win32/vs9/cdkbroadwayd.vcproj		\
 	$(top_builddir)/win32/vs9/cdk3-broadway.headers
 
 -include $(top_srcdir)/git.mk

cdk/broadway/cdkbroadway.h

@@ -29,7 +29,7 @@
 
 #define __CDKBROADWAY_H_INSIDE__
 
-#include <cdk/broadway/cdkbroadwaydisplay.h>
+#include <cdk/broadway/cdkcdkbroadwaydisplay.h>
 #include <cdk/broadway/cdkbroadwaywindow.h>
 #include <cdk/broadway/cdkbroadwaycursor.h>
 #include <cdk/broadway/cdkbroadwaymonitor.h>

cdk/broadway/broadwayd.c → cdk/broadway/cdkbroadwayd.c

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

cdk/broadway/cdkbroadwaydisplaymanager.h

@@ -1,4 +1,4 @@
-/* cdkbroadwaydisplaymanager.h
+/* cdkcdkbroadwaydisplaymanager.h
  *
  * Copyright (C) 2005-2007  Imendio AB
  * Copyright 2010 Red Hat, Inc.

cdk/broadway/cdkdisplay-broadway.h

@@ -22,7 +22,7 @@
 #ifndef __CDK_BROADWAY_DISPLAY__
 #define __CDK_BROADWAY_DISPLAY__
 
-#include "cdkbroadwaydisplay.h"
+#include "cdkcdkbroadwaydisplay.h"
 
 #include "cdkdisplayprivate.h"
 #include "cdkkeys.h"

cdk/broadway/cdkwindow-broadway.c

@@ -28,7 +28,7 @@
 #include "cdkwindow-broadway.h"
 #include "cdkscreen-broadway.h"
 
-#include "cdkbroadwaydisplay.h"
+#include "cdkcdkbroadwaydisplay.h"
 #include "cdkdisplay.h"
 #include "cdkwindow.h"
 #include "cdkwindowimpl.h"

cdk/broadway/meson.build

@@ -18,7 +18,7 @@ cdk_broadway_sources = files(
 )
 
 cdk_broadway_public_headers = files(
-  'cdkbroadwaydisplay.h',
+  'cdkcdkbroadwaydisplay.h',
   'cdkbroadwaywindow.h',
   'cdkbroadwaycursor.h',
   'cdkbroadwaymonitor.h',
@@ -65,14 +65,14 @@ libcdk_broadway = static_library('cdk-broadway',
   link_args: common_ldflags,
   dependencies: [cdk_deps, cdk_broadway_deps])
 
-# ctk4-broadwayd
+# ctk4-cdkbroadwayd
 
-broadwayd_syslib = os_win32 ? cc.find_library('ws2_32') : shmlib
+cdkbroadwayd_syslib = os_win32 ? cc.find_library('ws2_32') : shmlib
 
-executable('broadwayd',
+executable('cdkbroadwayd',
   clienthtml_h, broadwayjs_h,
-  'broadwayd.c', 'broadway-server.c', 'broadway-buffer.c', 'broadway-output.c',
+  'cdkbroadwayd.c', 'broadway-server.c', 'broadway-buffer.c', 'broadway-output.c',
   include_directories: [confinc, cdkinc, include_directories('.')],
   c_args: ['-DCDK_COMPILATION', '-DG_LOG_DOMAIN="Cdk"', ],
-  dependencies : [broadwayd_syslib, cdk_deps],
+  dependencies : [cdkbroadwayd_syslib, cdk_deps],
   install : true)

cdk/meson.build

@@ -124,7 +124,7 @@ cdk_broadway_sources = files([
   'broadway/cdkglobals-broadway.c',
   'broadway/cdkeventsource.c',
   'broadway/cdkdnd-broadway.c',
-  'broadway/broadwayd.c',
+  'broadway/cdkbroadwayd.c',
   'broadway/cdkdevicemanager-broadway.c',
   'broadway/cdkdevice-broadway.c',
   'broadway/broadway-buffer.c',

ctk/ctkselection.c

@@ -1187,7 +1187,7 @@ ctk_selection_convert (CtkWidget *widget,
 
 #if defined CDK_WINDOWING_BROADWAY
   /* This patch is a workaround to circumvent unimplemented
-     clipboard functionality in broadwayd. It eliminates
+     clipboard functionality in cdkbroadwayd. It eliminates
      35s delay on popup menu before first clipboard copy,
      by preventing conversion to be started.
    

docs/reference/ctk/Makefile.am

@@ -281,7 +281,7 @@ MKDB_OPTIONS=--output-format=xml --name-space=ctk --default-includes=ctk/ctk.h
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
 	broadway.xml				\
-	broadwayd.xml				\
+	cdkbroadwayd.xml				\
 	building.sgml				\
 	compiling.sgml				\
 	css-overview.xml			\
@@ -509,7 +509,7 @@ man_MANS = 				\
 	ctk3-demo-application.1		\
 	ctk3-widget-factory.1		\
 	ctk3-icon-browser.1		\
-	broadwayd.1			\
+	cdkbroadwayd.1			\
 	ctk-builder-tool.1 		\
 	ctk-query-settings.1
 

docs/reference/ctk/broadway.xml

@@ -38,10 +38,10 @@ port that you want to use.
 <para>
 It is also possible to use multiple CTK+ applications in the same
 web browser window, by using the Broadway server,
-<command>broadwayd</command>, that ships with CTK+.
-To use broadwayd, start it like this:
+<command>cdkbroadwayd</command>, that ships with CTK+.
+To use cdkbroadwayd, start it like this:
 <programlisting>
-broadwayd :5
+cdkbroadwayd :5
 </programlisting>
 Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
 Start your applications like this:

docs/reference/ctk/broadwayd.xml → docs/reference/ctk/cdkbroadwayd.xml

@@ -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="cdkbroadwayd">
 
 <refentryinfo>
-  <title>broadwayd</title>
+  <title>cdkbroadwayd</title>
   <productname>CTK+</productname>
   <authorgroup>
     <author>
@@ -17,19 +17,19 @@
 </refentryinfo>
 
 <refmeta>
-  <refentrytitle>broadwayd</refentrytitle>
+  <refentrytitle>cdkbroadwayd</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>broadwayd</refname>
+  <refname>cdkbroadwayd</refname>
   <refpurpose>Broadway display server</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>broadwayd</command>
+<command>cdkbroadwayd</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>cdkbroadwayd</command> is a display server for the Broadway
 CDK backend. It allows multiple CTK+ applications to display their
-windows in the same web browser, by connecting to broadwayd.
+windows in the same web browser, by connecting to cdkbroadwayd.
 </para>
 <para>
-When using broadwayd, specify the display number to use, prefixed
+When using cdkbroadwayd, specify the display number to use, prefixed
 with a colon, similar to X. The default display number is 0.
 <programlisting>
-broadwayd :5
+cdkbroadwayd :5
 </programlisting>
 Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
 Start your applications like this:

docs/reference/ctk/ctk-docs.sgml

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

docs/reference/ctk/meson.build

@@ -381,7 +381,7 @@ images = [
 
 content_files = [
   'broadway.xml',
-  'broadwayd.xml',
+  'cdkbroadwayd.xml',
   'building.sgml',
   'css-overview.xml',
   'css-properties.xml',
@@ -512,7 +512,7 @@ if get_option('man') and xsltproc.found()
   ]
 
   if broadway_enabled
-    man_files += [[ 'broadwayd', '1', ]]
+    man_files += [[ 'cdkbroadwayd', '1', ]]
   endif
 
   foreach man: man_files

win32/vs10/Makefile.am

@@ -5,8 +5,8 @@ GENERATED_ITEMS = \
 	cdk3-win32.vcxproj.filters		\
 	cdk3-broadway.vcxproj			\
 	cdk3-broadway.vcxproj.filters		\
-	broadwayd.vcxproj			\
-	broadwayd.vcxproj.filters		\
+	cdkbroadwayd.vcxproj			\
+	cdkbroadwayd.vcxproj.filters		\
 	cdk-3.vcxproj				\
 	cdk-3.vcxproj.filters			\
 	ctk-3.vcxproj				\
@@ -37,8 +37,8 @@ EXTRA_DIST += \
 	cdk3-win32.vcxproj.filtersin		\
 	cdk3-broadway.vcxprojin			\
 	cdk3-broadway.vcxproj.filtersin		\
-	broadwayd.vcxprojin			\
-	broadwayd.vcxproj.filtersin		\
+	cdkbroadwayd.vcxprojin			\
+	cdkbroadwayd.vcxproj.filtersin		\
 	cdk-3.vcxprojin				\
 	cdk-3.vcxproj.filtersin			\
 	ctk-3.vcxprojin				\

win32/vs10/broadwayd.vcxproj.filtersin → win32/vs10/cdkbroadwayd.vcxproj.filtersin

@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "broadwayd.vs10.sourcefiles.filters"
+#include "cdkbroadwayd.vs10.sourcefiles.filters"
   </ItemGroup>
 </Project>

win32/vs10/broadwayd.vcxprojin → win32/vs10/cdkbroadwayd.vcxprojin

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}</ProjectGuid>
-    <RootNamespace>broadwayd</RootNamespace>
+    <RootNamespace>cdkbroadwayd</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -163,7 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "broadwayd.vs10.sourcefiles"
+#include "cdkbroadwayd.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="ctk3-prebuild.vcxproj">

win32/vs10/ctk+.sln

@@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdk3-win32", "cdk3-win32.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdk3-broadway", "cdk3-broadway.vcxproj", "{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxproj", "{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdkbroadwayd", "cdkbroadwayd.vcxproj", "{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdk-3", "cdk-3.vcxproj", "{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
 EndProject

win32/vs10/ctk3-install.propsin

@@ -46,8 +46,8 @@ if exist $(BinDir)\Ctk-3.0.typelib copy "$(BinDir)\Ctk-3.0.typelib" $(CopyDir)\l
 goto DONE_BIN
 
 :DO_BROADWAY_BIN
-copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin
-copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin
+copy "$(BinDir)\cdkbroadwayd.exe" $(CopyDir)\bin
+copy "$(BinDir)\cdkbroadwayd.pdb" $(CopyDir)\bin
 
 if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG

win32/vs10/ctk3-install.vcxproj

@@ -241,7 +241,7 @@
       <Project>{343333c4-d46c-4c97-a986-959cca6f1de0}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="broadwayd.vcxproj">
+    <ProjectReference Include="cdkbroadwayd.vcxproj">
       <Project>{e9687d21-e214-4a0c-9eb4-8b38ebb783e5}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>

win32/vs11/Makefile.am

@@ -29,8 +29,8 @@ EXTRA_DIST +=	\
 	ctk3-install.vcxproj	\
 	ctk3-install.vcxproj.filters	\
 	ctk3-introspect.vcxproj		\
-	broadwayd.vcxproj	\
-	broadwayd.vcxproj.filters	\
+	cdkbroadwayd.vcxproj	\
+	cdkbroadwayd.vcxproj.filters	\
 	cdk3-broadway.vcxproj	\
 	cdk3-broadway.vcxproj.filters	\
 	ctk3-build-defines.props	\

win32/vs12/Makefile.am

@@ -29,8 +29,8 @@ EXTRA_DIST +=	\
 	ctk3-install.vcxproj	\
 	ctk3-install.vcxproj.filters	\
 	ctk3-introspect.vcxproj		\
-	broadwayd.vcxproj	\
-	broadwayd.vcxproj.filters	\
+	cdkbroadwayd.vcxproj	\
+	cdkbroadwayd.vcxproj.filters	\
 	cdk3-broadway.vcxproj	\
 	cdk3-broadway.vcxproj.filters	\
 	ctk3-build-defines.props	\