updated to latest trunk

(bzr r14876.2.4)

1 files changed, 1 insertions, 34 deletions

diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 036659661..c263eaded 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -10,30 +10,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
 #include "widgets/desktop-widget.h"
-#include <algorithm>
 
 #include "uxmanager.h"
 #include "desktop.h"
 #include "util/ege-tags.h"
 #include "widgets/toolbox.h"
-#include "preferences.h"
-#include "gdkmm/screen.h"
-
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif // GDK_WINDOWING_X11
 
 using std::vector;
 
-
-gchar const* KDE_WINDOW_MANAGER_NAME = "KWin";
-gchar const* UNKOWN_WINDOW_MANAGER_NAME = "unknown";
-
-
 class TrackItem
 {
 public:
@@ -100,11 +88,9 @@ public:
     virtual gint getDefaultTask( SPDesktop *desktop );
     virtual void setTask(SPDesktop* dt, gint val);
 
-    virtual bool isFloatWindowProblem() const;
     virtual bool isWidescreen() const;
 
 private:
-    bool _floatwindowIssues;
     bool _widescreen;
 };
 
@@ -126,7 +112,6 @@ UXManager::~UXManager()
 }
 
 UXManagerImpl::UXManagerImpl() :
-    _floatwindowIssues(false),
     _widescreen(false)
 {
     ege::TagSet tags;
@@ -135,19 +120,6 @@ UXManagerImpl::UXManagerImpl() :
     tags.addTag(ege::Tag("General"));
     tags.addTag(ege::Tag("Icons"));
 
-#if defined(GDK_WINDOWING_X11)
-    char const* wmName = gdk_x11_screen_get_window_manager_name( gdk_screen_get_default() );
-    //g_message("Window manager is [%s]", wmName);
-
-    //if (g_ascii_strcasecmp( wmName, UNKOWN_WINDOW_MANAGER_NAME ) == 0) {
-    if (g_ascii_strcasecmp( wmName, KDE_WINDOW_MANAGER_NAME ) == 0) {
-        _floatwindowIssues = true;
-    }
-#elif defined(GDK_WINDOWING_WIN32)
-    _floatwindowIssues = true;
-#endif // GDK_WINDOWING_WIN32
-
-
     Glib::RefPtr<Gdk::Screen> defaultScreen = Gdk::Screen::get_default();
     if (defaultScreen) {
         int width = defaultScreen->get_width();
@@ -163,11 +135,6 @@ UXManagerImpl::~UXManagerImpl()
 {
 }
 
-bool UXManagerImpl::isFloatWindowProblem() const
-{
-    return _floatwindowIssues;
-}
-
 bool UXManagerImpl::isWidescreen() const
 {
     return _widescreen;