From 46850422d6f857317455a6f7682bda9af4ba77f8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:46:38 -0600 Subject: Rename additional instances of KDE to TDE --- kinit/CMakeLists.txt | 4 ++-- kinit/Makefile.am | 8 ++++---- kinit/configure.in.in | 38 +++++++++++++++++++------------------- kinit/kinit.cpp | 18 +++++++++--------- kinit/klauncher_cmds.h | 4 ++-- kinit/start_tdeinit.c | 2 +- kinit/start_tdeinit_wrapper.c | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) (limited to 'kinit') diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt index d5b637ee4..b2680ece0 100644 --- a/kinit/CMakeLists.txt +++ b/kinit/CMakeLists.txt @@ -131,9 +131,9 @@ tde_add_executable( ${target} AUTOMOC set( target start_tdeinit ) -if( KDEINIT_SETUID ) +if( TDEINIT_SETUID ) set( _setuid SETUID ) -endif( KDEINIT_SETUID ) +endif( TDEINIT_SETUID ) tde_add_executable( ${target} ${_setuid} SOURCES start_tdeinit.c diff --git a/kinit/Makefile.am b/kinit/Makefile.am index 952f32a46..ef329980a 100644 --- a/kinit/Makefile.am +++ b/kinit/Makefile.am @@ -15,7 +15,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(KDEINIT_XFT_INCLUDES) +INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(TDEINIT_XFT_INCLUDES) SUBDIRS = . tests @@ -56,7 +56,7 @@ kwrapper_SOURCES = kwrapper.c kwrapper_LDADD = $(LIBSOCKET) klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version -klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) +klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp kstartupconfig_SOURCES = kstartupconfig.cpp @@ -64,7 +64,7 @@ kstartupconfig_LDADD = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT) kdostartupconfig_SOURCES = kdostartupconfig.cpp kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) -kdostartupconfig_LDADD = $(LIB_KDECORE) +kdostartupconfig_LDADD = $(LIB_TDECORE) start_tdeinit_SOURCES = start_tdeinit.c tdeinitpath = $(bindir)/tdeinit @@ -85,7 +85,7 @@ dummy.cpp: echo > dummy.cpp install-exec-hook: - @if test \${KDEINIT_SETUID} != 0; then \ + @if test \${TDEINIT_SETUID} != 0; then \ (chown 0 $(DESTDIR)$(bindir)/start_tdeinit && chmod 4755 $(DESTDIR)$(bindir)/start_tdeinit) || echo "Please make start_tdeinit setuid root" ; \ fi diff --git a/kinit/configure.in.in b/kinit/configure.in.in index 6330594b6..1d14ee592 100644 --- a/kinit/configure.in.in +++ b/kinit/configure.in.in @@ -1,6 +1,6 @@ -KDEINIT_USE_XFT=1 +TDEINIT_USE_XFT=1 dnl check if Qt is linked against Xft -KDE_CHECK_LIB(qt-mt,XftInit,[],[KDEINIT_USE_XFT=]) +KDE_CHECK_LIB(qt-mt,XftInit,[],[TDEINIT_USE_XFT=]) dnl Xft requires freetype to compile KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) @@ -12,7 +12,7 @@ if test -n "$PKGCONFIG"; then if test -n "$vers" && test "$vers" -ge 1000000 then FONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`" - KDEINIT_FONTCONFIG=1 + TDEINIT_FONTCONFIG=1 fi fi @@ -21,39 +21,39 @@ if test -n "$FONTCONFIG_CONFIG"; then if test -n "$vers" && test "$vers" -ge 1000000 then FONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`" - KDEINIT_FONTCONFIG=1 + TDEINIT_FONTCONFIG=1 fi fi -KDE_FIND_PATH(freetype-config, KDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin]) -if test -n "$KDEINIT_FREETYPE_CONFIG"; then - KDEINIT_XFT_INCLUDES="`$KDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS" +KDE_FIND_PATH(freetype-config, TDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin]) +if test -n "$TDEINIT_FREETYPE_CONFIG"; then + TDEINIT_XFT_INCLUDES="`$TDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS" tdeinit_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $KDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS" - KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[KDEINIT_USE_XFT=]) + CPPFLAGS="$CPPFLAGS $TDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS" + KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[TDEINIT_USE_XFT=]) CPPFLAGS=$tdeinit_cppflags else - KDEINIT_USE_XFT= + TDEINIT_USE_XFT= fi -if test -n "$KDEINIT_USE_XFT"; then - AC_DEFINE(KDEINIT_USE_XFT,1,[Use Xft preinitialization in tdeinit]) +if test -n "$TDEINIT_USE_XFT"; then + AC_DEFINE(TDEINIT_USE_XFT,1,[Use Xft preinitialization in tdeinit]) fi -if test -n "$KDEINIT_FONTCONFIG"; then - AC_DEFINE(KDEINIT_USE_FONTCONFIG,1,[Use FontConfig in tdeinit]) +if test -n "$TDEINIT_FONTCONFIG"; then + AC_DEFINE(TDEINIT_USE_FONTCONFIG,1,[Use FontConfig in tdeinit]) fi -AC_SUBST(KDEINIT_XFT_INCLUDES) +AC_SUBST(TDEINIT_XFT_INCLUDES) AC_MSG_CHECKING(whether to make tdeinit setuid root in order to protect it from bad Linux OOM-killer) tdeinit_setuid= case $target_os in linux*) AC_MSG_RESULT(yes) - KDEINIT_SETUID=1 - AC_DEFINE(KDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux OOM-killer]) + TDEINIT_SETUID=1 + AC_DEFINE(TDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux OOM-killer]) ;; *) AC_MSG_RESULT(no) - KDEINIT_SETUID=0 + TDEINIT_SETUID=0 ;; esac -AC_SUBST(KDEINIT_SETUID) +AC_SUBST(TDEINIT_SETUID) diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 2527dfb56..16e4e60ef 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -97,7 +97,7 @@ # endif #endif -#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG) +#if defined(TDEINIT_USE_XFT) && defined(TDEINIT_USE_FONTCONFIG) #include extern "C" FcBool XftInitFtLibrary (void); #include @@ -386,7 +386,7 @@ TQCString execpath_avoid_loops( const TQCString& exec, int envc, const char* env return execpath; } -#ifdef KDEINIT_OOM_PROTECT +#ifdef TDEINIT_OOM_PROTECT static int oom_pipe = -1; static void oom_protect_sighandler( int ) { @@ -892,7 +892,7 @@ static void init_tdeinit_socket() { fprintf(stderr, "tdeinit: Shutting down running client.\n"); klauncher_header request_header; - request_header.cmd = LAUNCHER_TERMINATE_KDEINIT; + request_header.cmd = LAUNCHER_TERMINATE_TDEINIT; request_header.arg_length = 0; write(s, &request_header, sizeof(request_header)); sleep(1); // Give it some time @@ -1298,7 +1298,7 @@ static void handle_launcher_request(int sock = -1) tdeinit_xio_errhandler( 0L ); #endif } - else if (request_header.cmd == LAUNCHER_TERMINATE_KDEINIT) + else if (request_header.cmd == LAUNCHER_TERMINATE_TDEINIT) { #ifndef NDEBUG fprintf(stderr,"tdeinit: Killing tdeinit/klauncher.\n"); @@ -1401,7 +1401,7 @@ static void handle_requests(pid_t waitForPid) int sock = accept(d.wrapper, (struct sockaddr *)&client, &sClient); if (sock >= 0) { -#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG) +#if defined(TDEINIT_USE_XFT) && defined(TDEINIT_USE_FONTCONFIG) if( FcGetVersion() < 20390 && !FcConfigUptoDate(NULL)) FcInitReinitialize(); #endif @@ -1422,7 +1422,7 @@ static void handle_requests(pid_t waitForPid) int sock = accept(d.wrapper_old, (struct sockaddr *)&client, &sClient); if (sock >= 0) { -#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG) +#if defined(TDEINIT_USE_XFT) && defined(TDEINIT_USE_FONTCONFIG) if( FcGetVersion() < 20390 && !FcConfigUptoDate(NULL)) FcInitReinitialize(); #endif @@ -1708,7 +1708,7 @@ int main(int argc, char **argv, char **envp) keep_running = 0; if (strcmp(safe_argv[i], "--new-startup") == 0) new_startup = 1; -#ifdef KDEINIT_OOM_PROTECT +#ifdef TDEINIT_OOM_PROTECT if (strcmp(safe_argv[i], "--oom-pipe") == 0 && i+1 #include -#ifdef KDEINIT_OOM_PROTECT +#ifdef TDEINIT_OOM_PROTECT /* Prevent getting killed by bad heuristic in Linux OOM-killer. diff --git a/kinit/start_tdeinit_wrapper.c b/kinit/start_tdeinit_wrapper.c index eb26b0387..0328f3e43 100644 --- a/kinit/start_tdeinit_wrapper.c +++ b/kinit/start_tdeinit_wrapper.c @@ -23,7 +23,7 @@ #include #include -#ifdef KDEINIT_OOM_PROTECT +#ifdef TDEINIT_OOM_PROTECT /* The start_tdeinit wrapper is setuid, which means some shell variables like LD_LIBRARY_PATH -- cgit v1.2.1