aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-25 06:49:46 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-25 06:49:46 (GMT)
commit35d1017959512acd9c2547d0eef76d73660c972e (patch)
treeb5e650eaeb97bce4521426e21698a55bdafe3070
parent1bcc966153a557b6ab3ba236c9e468dbf0a2620e (diff)
downloadfluxbox_paul-35d1017959512acd9c2547d0eef76d73660c972e.zip
fluxbox_paul-35d1017959512acd9c2547d0eef76d73660c972e.tar.bz2
removed KDE configure option
-rw-r--r--ChangeLog2
-rw-r--r--README4
-rw-r--r--configure.in16
-rw-r--r--src/Slit.cc15
-rw-r--r--src/main.cc5
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 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/12/25: 3*07/12/25:
4 * Removed KDE configure option, since it didn't do anything (Mark)
5 configure.in config.h.in main.cc
4 * Added resource session.screen<N>.slit.acceptKdeDockapps: <boolean> (Mark) 6 * Added resource session.screen<N>.slit.acceptKdeDockapps: <boolean> (Mark)
5 Screen.cc Slit.cc/hh 7 Screen.cc Slit.cc/hh
6*07/12/23: 8*07/12/23:
diff --git a/README b/README
index 78a11f5..9ed654c 100644
--- a/README
+++ b/README
@@ -20,10 +20,6 @@ Compile and Install:
20 20
21Configuration options: 21Configuration options:
22 22
23For KDE slitsupport (default, does not require any kde libraries):
24( Allows kde tray icons to be placed in systray inside the toolbar )
25 ./configure --enable-kde
26
27 For Gnome support ( default, does not require any gnome libraries ): 23 For Gnome support ( default, does not require any gnome libraries ):
28 ./configure --enable-gnome 24 ./configure --enable-gnome
29 25
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(
364 AC_DEFINE(TIMEDCACHE, 1, "timed cache") 364 AC_DEFINE(TIMEDCACHE, 1, "timed cache")
365) 365)
366 366
367dnl Check KDE
368AC_MSG_CHECKING([whether to have KDE slit support])
369AC_ARG_ENABLE(
370 kde,
371[ --enable-kde KDE slit support ([default=yes])],
372 if test x$enableval = "xyes"; then
373 AC_MSG_RESULT([yes])
374 AC_DEFINE(KDE, 1, "KDE slit support")
375 else
376 AC_MSG_RESULT([no])
377 fi,
378 AC_MSG_RESULT([yes])
379 AC_DEFINE(KDE, 1, "KDE slit support")
380)
381
382
383dnl Check GNOME 367dnl Check GNOME
384 368
385AC_MSG_CHECKING([whether to have GNOME support]) 369AC_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) {
515 515
516 XWindowAttributes attrib; 516 XWindowAttributes attrib;
517 517
518#ifdef KDE
519 if (screen().isKdeDockapp(w)) 518 if (screen().isKdeDockapp(w))
520 client->resize(24, 24); 519 client->resize(24, 24);
521 else 520 else if (XGetWindowAttributes(disp, client->window(), &attrib))
522#endif // KDE 521 client->resize(attrib.width, attrib.height);
523 522 else // set default size if we failed to get window attributes
524 { 523 client->resize(64, 64);
525 if (XGetWindowAttributes(disp, client->window(), &attrib)) {
526 client->resize(attrib.width, attrib.height);
527 } else { // set default size if we failed to get window attributes
528 client->resize(64, 64);
529 }
530 }
531 524
532 // disable border for client window 525 // disable border for client window
533 XSetWindowBorderWidth(disp, client->window(), 0); 526 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) {
126#endif // HAVE_IMLIB2 126#endif // HAVE_IMLIB2
127 "IMLIB2"<<endl<< 127 "IMLIB2"<<endl<<
128 128
129#ifndef KDE
130 NOT<<
131#endif // KDE
132 "KDE"<<endl<<
133
134#ifndef NLS 129#ifndef NLS
135 NOT<< 130 NOT<<
136#endif // NLS 131#endif // NLS