diff options
| author | Michael Meeks <michael@ximian.com> | 2002-07-10 10:19:34 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-07-10 10:19:34 +0000 |
| commit | 3953463c36b99218559f4c3e1fdc50d15317cc91 (patch) | |
| tree | 5beb092961800de86784d20170791bbf770fd968 | |
| parent | d9defa5a5dd252eb193ed128b6af6444ddab8fdf (diff) | |
| download | nautilus-3953463c36b99218559f4c3e1fdc50d15317cc91.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/nautilus-application.c | 8 | ||||
| -rw-r--r-- | src/nautilus-main.c | 1 | ||||
| -rw-r--r-- | src/nautilus-navigation-window.c | 1 | ||||
| -rw-r--r-- | src/nautilus-object-window.c | 1 | ||||
| -rw-r--r-- | src/nautilus-spatial-window.c | 1 | ||||
| -rw-r--r-- | src/nautilus-window.c | 1 |
7 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,11 @@ +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): diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 6edb77ac0..508d3d087 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -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 diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 546cb5809..acda7d647 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -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> diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 6aea39211..0fb94e49d 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -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> diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index 6aea39211..0fb94e49d 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -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> diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index 6aea39211..0fb94e49d 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -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> diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 6aea39211..0fb94e49d 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -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> |