From: Enrico Zini <enrico@enricozini.org>
Date: Tue, 28 Jul 2009 17:55:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ciapino/root/zavai
X-Git-Url: https://git.toastfreeware.priv.at/gregoa/zavai.git/commitdiff_plain/29ad47a796b5a1b6aeb053128a07d0827ee25c6e?hp=017bfb0af9521f38137d4308591e414e051c1c89

Merge branch 'master' of ssh://ciapino/root/zavai
---

diff --git a/configure.ac b/configure.ac
index 4b44d8b..cb545ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,10 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16.0)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+PKG_CHECK_MODULES(WNCK, libwnck-1.0 >= 2.26.0)
+AC_SUBST(WNCK_CFLAGS)
+AC_SUBST(WNCK_LIBS)
+
 AC_CONFIG_FILES([Makefile
            src/Makefile])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index defbcbd..cc687ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-VFLAGS=-g --pkg gee-1.0 --pkg dbus-glib-1 --pkg gtk+-2.0 --pkg posix
+VFLAGS=-g --pkg gee-1.0 --pkg dbus-glib-1 --pkg gtk+-2.0 --pkg posix --pkg libwnck-1.0
 
 #zavai: $(SOURCES)
 #	valac -o zavai $(VFLAGS) $^
@@ -18,7 +18,9 @@ AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GEE_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(WNCK_CFLAGS) \
+	-DWNCK_I_KNOW_THIS_IS_UNSTABLE
 
 BUILT_SOURCES = zavai.vala.stamp
 
@@ -49,7 +51,8 @@ zavai_LDADD = \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(GEE_LIBS) \
-	$(GTK_LIBS)
+	$(GTK_LIBS) \
+	$(WNCK_LIBS)
 
 #vapidir = $(datadir)/vala/vapi
 
diff --git a/src/app_wm.vala b/src/app_wm.vala
index 4a55917..2100b0d 100644
--- a/src/app_wm.vala
+++ b/src/app_wm.vala
@@ -121,8 +121,22 @@ public class CloseOrBack : Gtk.StatusIcon
 	}
 }
 
+public class WindowList : Applet
+{
+	Wnck.Tasklist selector;
+
+	public WindowList(string label)
+	{
+		_label = label;
+		selector = new Wnck.Tasklist(Wnck.Screen.get_default());
+		pack_start(selector, true, true, 0);
+	}
+}
+
+
 RaiseIcon raise_icon;
 CloseOrBack close_or_back;
+WindowList window_list;
 
 public void init()
 {
@@ -131,6 +145,10 @@ public void init()
 
 	close_or_back = new CloseOrBack();
 	close_or_back.set_visible(true);
+
+	window_list = new WindowList("Current apps");
+	zavai.registry.register_applet("wm.list", window_list);
+	zavai.registry.getmenu("menu.main").add_applet("wm.list");
 }
 
 }