From 32bb288389e2b598f9dcf59e766d8e3aaad67ec8 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 20 Jul 2006 16:49:11 +0200
Subject: [PATCH] Some build fixes. pygtk.require at least one time for
 process.

---
 shell/Makefile.am            |  2 +-
 shell/Shell.py               | 14 ++++++++++----
 shell/sugar-activity-factory |  2 ++
 sugar/Makefile.am            |  1 -
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 05fa2c48..4bdb3462 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -11,7 +11,7 @@ sugar_PYTHON =				\
 	__init__.py			\
 	ActivitiesModel.py		\
 	ActivityRegistry.py		\
-	ConsoleLogger.py		\
+	ConsoleWindow.py		\
 	Emulator.py			\
 	Owner.py			\
 	HomeWindow.py			\
diff --git a/shell/Shell.py b/shell/Shell.py
index bc426451..2dc411c2 100755
--- a/shell/Shell.py
+++ b/shell/Shell.py
@@ -1,6 +1,8 @@
 import os
 
 import dbus
+import pygtk
+pygtk.require('2.0')
 import gtk
 import wnck
 import gobject
@@ -69,10 +71,14 @@ class Shell:
 
 	def get_current_activity(self):
 		window = self._screen.get_active_window()
-		if window and window.get_window_type() == wnck.WINDOW_NORMAL:
-			return ActivityHost(window.get_xid())
-		else:
-			return None
+		if window:
+			if window.get_window_type() == wnck.WINDOW_NORMAL:
+				return ActivityHost(window.get_xid())
+			elif window.get_window_type() == wnck.WINDOW_DIALOG:
+				parent = window.get_transient()
+				if not parent is None:
+					return ActivityHost(parent.get_xid())
+		return None
 
 	def show_people(self):
 		activity = self.get_current_activity()
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index b572c122..1b42fbf6 100755
--- a/shell/sugar-activity-factory
+++ b/shell/sugar-activity-factory
@@ -2,6 +2,8 @@
 
 import sys
 
+import pygtk
+pygtk.require('2.0')
 import gobject
 
 from sugar.activity import Activity
diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index 228c6244..4d25d657 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -6,7 +6,6 @@ sugar_PYTHON =			\
 	__installed__.py	\
 	bots.py				\
 	env.py				\
-	keybindings.py		\
 	theme.py			\
 	util.py				\
 	LogWriter.py