[devhelp] build: libwnck is no longer used



commit 83b91dbd46b4cf09514a2edcaf8dfa54ace5bb35
Author: Saleem Abdulrasool <compnerd compnerd org>
Date:   Wed Mar 30 18:59:52 2011 -0700

    build: libwnck is no longer used

 configure.ac  |   12 ---------
 src/dh-base.c |   73 ---------------------------------------------------------
 2 files changed, 0 insertions(+), 85 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 62288b4..c2ac3a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,19 +50,12 @@ dnl -----------------------------------------------------------
 IGE_PLATFORM_CHECK
 if test "x$IGE_PLATFORM" = xx11; then
    gconf_pkgconfig="gconf-2.0 >= 2.6.0"
-   libwnck_pkgconfig=
    gtkmacintegration_pkgconfig=
-   REQUIRES_LIBWNCK=
-   HAVE_WNCK=no
 else
    gconf_pkgconfig=
-   libwnck_pkgconfig=
    gtkmacintegration_pkgconfig="gtk-mac-integration >= 1.0.0"
-   REQUIRES_LIBWNCK=
-   HAVE_WNCK=no
 fi
 AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$IGE_PLATFORM" = xx11)
-AC_SUBST(REQUIRES_LIBWNCK)
 
 PKG_CHECK_MODULES(DEVHELP, [
   gthread-2.0 >= 2.10.0
@@ -74,15 +67,10 @@ PKG_CHECK_MODULES(DEVHELP, [
 PKG_CHECK_MODULES(LIBDEVHELP, [
   gtk+-3.0 >= 3.0.2
   $gconf_pkgconfig
-  $libwnck_pkgconfig
   $gtkmacintegration_pkgconfig
   webkitgtk-3.0
 ])
 
-if test "x$HAVE_WNCK" = "xyes" ; then
-    AC_DEFINE(HAVE_WNCK, 1, [Defined if libwnck is available])
-fi
-
 AC_ARG_WITH(zlib, [  --with-zlib=DIR         use zlib in DIR], zlibdir=$with_zlib)
 have_zlib=no
 if test "x$zlibdir" != x; then
diff --git a/src/dh-base.c b/src/dh-base.c
index ca9b16e..78d704d 100644
--- a/src/dh-base.c
+++ b/src/dh-base.c
@@ -27,10 +27,6 @@
 #ifdef GDK_WINDOWING_X11
 #include <unistd.h>
 #include <gdk/gdkx.h>
-#ifdef HAVE_WNCK
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE
-#include <libwnck/libwnck.h>
-#endif
 #endif
 
 #include "dh-window.h"
@@ -104,22 +100,6 @@ dh_base_init (DhBase *base)
 
         priv->book_manager = dh_book_manager_new ();
         dh_book_manager_populate (priv->book_manager);
-
-#ifdef HAVE_WNCK
-        {
-                gint n_screens, i;
-
-                /* For some reason, libwnck doesn't seem to update its list of
-                 * workspaces etc if we don't do this.
-                 */
-                n_screens = gdk_display_get_n_screens (gdk_display_get_default ());
-                for (i = 0; i < n_screens; i++) {
-                        WnckScreen *screen;
-
-                        screen = wnck_screen_get (i);
-                }
-        }
-#endif
 }
 
 static void
@@ -222,60 +202,7 @@ dh_base_get_window_on_current_workspace (DhBase *base)
         if (!priv->windows) {
                 return NULL;
         }
-
-#ifdef HAVE_WNCK
-        {
-                WnckWorkspace *workspace;
-                WnckScreen    *screen;
-                GtkWidget     *window;
-                GList         *windows, *w;
-                GSList        *l;
-                gulong         xid;
-                pid_t          pid;
-
-                screen = wnck_screen_get (0);
-                if (!screen) {
-                        return NULL;
-                }
-
-                workspace = wnck_screen_get_active_workspace (screen);
-                if (!workspace) {
-                        return NULL;
-                }
-
-                xid = 0;
-                pid = getpid ();
-
-                /* Use _stacked so we can use the one on top. */
-                windows = wnck_screen_get_windows_stacked (screen);
-                windows = g_list_last (windows);
-
-                for (w = windows; w; w = w->prev) {
-                        if (wnck_window_is_on_workspace (w->data, workspace) &&
-                            wnck_window_get_pid (w->data) == pid) {
-                                xid = wnck_window_get_xid (w->data);
-                                break;
-                        }
-                }
-
-                if (!xid) {
-                        return NULL;
-                }
-
-                /* Return the first matching window we have. */
-                for (l = priv->windows; l; l = l->next) {
-                        window = l->data;
-
-                        if (GDK_WINDOW_XID (gtk_widget_get_window (window)) == xid) {
-                                return window;
-                        }
-                }
-        }
-
-        return NULL;
-#else
         return priv->windows->data;
-#endif
 }
 
 GtkWidget *



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]