Commit 3953463c authored by Michael Meeks's avatar Michael Meeks Committed by Michael Meeks
Browse files

disable the look_for_kdesktop_recursive code, since this takes ~1 second

2002-07-10  Michael Meeks  <michael@ximian.com>

	* src/nautilus-application.c (is_kdesktop_present): disable
	the look_for_kdesktop_recursive code, since this takes ~1 second
	at startup on my Ultra 2.
	(look_for_kdesktop_recursive, has_wm_state, get_self_typed_prop):
	don't compile these either.
parent d9defa5a
2002-07-10 Michael Meeks <michael@ximian.com>
* src/nautilus-application.c (is_kdesktop_present): disable
the look_for_kdesktop_recursive code, since this takes ~1 second
at startup on my Ultra 2.
(look_for_kdesktop_recursive, has_wm_state, get_self_typed_prop):
don't compile these either.
2002-07-09 Damon Chaplin <damon@ximian.com>
 
* src/nautilus-preferences-dialog.c (dialog_button_response_callback):
......
......@@ -984,6 +984,8 @@ init_session (void)
update_session (client);
}
#ifdef UGLY_HACK_TO_DETECT_KDE
static gboolean
get_self_typed_prop (Window xwindow,
Atom atom,
......@@ -1097,16 +1099,20 @@ look_for_kdesktop_recursive (Window xwindow)
return retval;
}
#endif /* UGLY_HACK_TO_DETECT_KDE */
static gboolean
is_kdesktop_present (void)
{
#ifdef UGLY_HACK_TO_DETECT_KDE
/* FIXME this is a pretty lame hack, should be replaced
* eventually with e.g. a requirement that desktop managers
* support a manager selection, ICCCM sec 2.8
*/
return look_for_kdesktop_recursive (GDK_ROOT_WINDOW ());
#else
return FALSE;
#endif
}
static void
......
......@@ -34,7 +34,6 @@
#include "nautilus-application.h"
#include "nautilus-self-check-functions.h"
#include "nautilus-window.h"
#include <X11/Xlib.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-ui-main.h>
......
......@@ -38,7 +38,6 @@
#include "nautilus-switchable-navigation-bar.h"
#include "nautilus-window-manage-views.h"
#include "nautilus-zoom-control.h"
#include <X11/Xatom.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-ui-util.h>
#include <eel/eel-debug.h>
......
......@@ -38,7 +38,6 @@
#include "nautilus-switchable-navigation-bar.h"
#include "nautilus-window-manage-views.h"
#include "nautilus-zoom-control.h"
#include <X11/Xatom.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-ui-util.h>
#include <eel/eel-debug.h>
......
......@@ -38,7 +38,6 @@
#include "nautilus-switchable-navigation-bar.h"
#include "nautilus-window-manage-views.h"
#include "nautilus-zoom-control.h"
#include <X11/Xatom.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-ui-util.h>
#include <eel/eel-debug.h>
......
......@@ -38,7 +38,6 @@
#include "nautilus-switchable-navigation-bar.h"
#include "nautilus-window-manage-views.h"
#include "nautilus-zoom-control.h"
#include <X11/Xatom.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-ui-util.h>
#include <eel/eel-debug.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment