From 35d1017959512acd9c2547d0eef76d73660c972e Mon Sep 17 00:00:00 2001 From: Mark Tiefenbruck <mark@fluxbox.org> Date: Mon, 24 Dec 2007 22:49:46 -0800 Subject: removed KDE configure option --- ChangeLog | 2 ++ README | 4 ---- configure.in | 16 ---------------- src/Slit.cc | 15 ++++----------- src/main.cc | 5 ----- 5 files changed, 6 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index de91ee6..440a1e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ (Format: Year/Month/Day) Changes for 1.0.1: *07/12/25: + * Removed KDE configure option, since it didn't do anything (Mark) + configure.in config.h.in main.cc * Added resource session.screen<N>.slit.acceptKdeDockapps: <boolean> (Mark) Screen.cc Slit.cc/hh *07/12/23: diff --git a/README b/README index 78a11f5..9ed654c 100644 --- a/README +++ b/README @@ -20,10 +20,6 @@ Compile and Install: Configuration options: -For KDE slitsupport (default, does not require any kde libraries): -( Allows kde tray icons to be placed in systray inside the toolbar ) - ./configure --enable-kde - For Gnome support ( default, does not require any gnome libraries ): ./configure --enable-gnome diff --git a/configure.in b/configure.in index 2241bde..6e6e7d0 100644 --- a/configure.in +++ b/configure.in @@ -364,22 +364,6 @@ AC_ARG_ENABLE( AC_DEFINE(TIMEDCACHE, 1, "timed cache") ) -dnl Check KDE -AC_MSG_CHECKING([whether to have KDE slit support]) -AC_ARG_ENABLE( - kde, -[ --enable-kde KDE slit support ([default=yes])], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE(KDE, 1, "KDE slit support") - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([yes]) - AC_DEFINE(KDE, 1, "KDE slit support") -) - - dnl Check GNOME AC_MSG_CHECKING([whether to have GNOME support]) diff --git a/src/Slit.cc b/src/Slit.cc index dbbb3ac..7716813 100644 --- a/src/Slit.cc +++ b/src/Slit.cc @@ -515,19 +515,12 @@ void Slit::addClient(Window w) { XWindowAttributes attrib; -#ifdef KDE if (screen().isKdeDockapp(w)) client->resize(24, 24); - else -#endif // KDE - - { - if (XGetWindowAttributes(disp, client->window(), &attrib)) { - client->resize(attrib.width, attrib.height); - } else { // set default size if we failed to get window attributes - client->resize(64, 64); - } - } + else if (XGetWindowAttributes(disp, client->window(), &attrib)) + client->resize(attrib.width, attrib.height); + else // set default size if we failed to get window attributes + client->resize(64, 64); // disable border for client window XSetWindowBorderWidth(disp, client->window(), 0); diff --git a/src/main.cc b/src/main.cc index 677ed0e..01b7d6e 100644 --- a/src/main.cc +++ b/src/main.cc @@ -126,11 +126,6 @@ static void showInfo(ostream &ostr) { #endif // HAVE_IMLIB2 "IMLIB2"<<endl<< -#ifndef KDE - NOT<< -#endif // KDE - "KDE"<<endl<< - #ifndef NLS NOT<< #endif // NLS -- cgit v0.11.2