# HG changeset patch
# User Erik Grinaker <erikg@codepoet.no>
# Date 1123182477 0
# Node ID ca2af4e02c4c440ba6e71032ddc0d4a5c2d10d0b
# Parent  ab27d8034e6512b442a7b8a1eeb3b6d46e298366
wrapped panel_applet_request_focus()

diff -r ab27d8034e6512b442a7b8a1eeb3b6d46e298366 -r ca2af4e02c4c440ba6e71032ddc0d4a5c2d10d0b ChangeLog
--- a/ChangeLog	Thu Aug 04 17:13:12 2005 +0000
+++ b/ChangeLog	Thu Aug 04 19:07:57 2005 +0000
@@ -10,6 +10,8 @@
 
 	* rearranged the toolbar layout
 
+	* wrapped panel_applet_request_focus()
+
 2005-08-03  Erik Grinaker <erikg@codepoet.no>
 
 	* cleaned up applet code
diff -r ab27d8034e6512b442a7b8a1eeb3b6d46e298366 -r ca2af4e02c4c440ba6e71032ddc0d4a5c2d10d0b NEWS
--- a/NEWS	Thu Aug 04 17:13:12 2005 +0000
+++ b/NEWS	Thu Aug 04 19:07:57 2005 +0000
@@ -25,6 +25,7 @@
 - moved Timer class from ui module to data module
 - moved the wrap/ directory to src/wrap/
 - renamed the authmanager module to gnomemisc
+- wrapped panel_applet_request_focus()
 
 
 2005-03-31: Revelation 0.4.3
diff -r ab27d8034e6512b442a7b8a1eeb3b6d46e298366 -r ca2af4e02c4c440ba6e71032ddc0d4a5c2d10d0b acinclude.m4
--- a/acinclude.m4	Thu Aug 04 17:13:12 2005 +0000
+++ b/acinclude.m4	Thu Aug 04 19:07:57 2005 +0000
@@ -67,6 +67,22 @@
 	AM_GCONF_SOURCE_2
 ])
 
+AC_DEFUN(RVL_PYGTK, [
+	PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= 2.3.90)
+	PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.5.90)
+
+	AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
+
+	if test "x$PYGTK_CODEGEN" = "xno"; then
+		AC_MSG_ERROR(pygtk-codegen-2.0 not found in your path)
+	fi
+
+	AC_MSG_CHECKING(path to pygtk defs)
+	PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+	AC_SUBST(PYGTK_DEFSDIR)
+	AC_MSG_RESULT($PYGTK_DEFSDIR)
+])
+
 AC_DEFUN(RVL_PYTHON_MODULE, [
 	AC_MSG_CHECKING(python module $1)
 
diff -r ab27d8034e6512b442a7b8a1eeb3b6d46e298366 -r ca2af4e02c4c440ba6e71032ddc0d4a5c2d10d0b configure.ac
--- a/configure.ac	Thu Aug 04 17:13:12 2005 +0000
+++ b/configure.ac	Thu Aug 04 19:07:57 2005 +0000
@@ -12,10 +12,11 @@
 
 dnl check for dependencies
 AC_PROG_CC()
+
 RVL_PYTHON_PATH(2.3)
 RVL_PYTHON_MODULE(Crypto, yes)
-PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= 2.3.90)
-PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.5.90)
+
+RVL_PYGTK()
 RVL_CRACKLIB()
 RVL_GCONF()
 RVL_FDO_MIME()
diff -r ab27d8034e6512b442a7b8a1eeb3b6d46e298366 -r ca2af4e02c4c440ba6e71032ddc0d4a5c2d10d0b src/revelation-applet.in
--- a/src/revelation-applet.in	Thu Aug 04 17:13:12 2005 +0000
+++ b/src/revelation-applet.in	Thu Aug 04 19:07:57 2005 +0000
@@ -38,7 +38,7 @@
 if "@pythondir@" not in sys.path:
 	sys.path.insert(0, "@pythondir@")
 
-from revelation import config, data, datahandler, dialog, entry, io, ui, util
+from revelation import config, data, datahandler, dialog, entry, gnomemisc, io, ui, util
 
 
 class RevelationApplet(object):
@@ -230,8 +230,8 @@
 		self.locktimer.reset()
 
 		# from gnome 2.10, the panel doesn't receive focus when clicked
-		if data.button == 1 and hasattr(self.applet, "request_focus") == True:
-			self.applet.request_focus(data.time)
+		if data.button == 1 and hasattr(gnomemisc, "panel_applet_request_focus") == True:
+			gnomemisc.panel_applet_request_focus(self.applet, long(data.time))
 
 
 	def __cb_file_autolock(self, widget, data = None):
@@ -331,8 +331,8 @@
 	def __focus_entry(self):
 		"Gives focus to the entry"
 
-		if hasattr(self.applet, "request_focus") == True:
-			self.request_focus(0)
+		if hasattr(gnomemisc, "panel_applet_request_focus") == True:
+			gnomemisc.panel_applet_request_focus(self.applet, long(0))
 
 		self.entry.grab_focus()
 
diff -r ab27d8034e6512b442a7b8a1eeb3b6d46e298366 -r ca2af4e02c4c440ba6e71032ddc0d4a5c2d10d0b src/wrap/gnomemisc/Makefile.am
--- a/src/wrap/gnomemisc/Makefile.am	Thu Aug 04 17:13:12 2005 +0000
+++ b/src/wrap/gnomemisc/Makefile.am	Thu Aug 04 19:07:57 2005 +0000
@@ -14,7 +14,13 @@
 
 
 gnomemisc.c: gnomemisc.defs gnomemisc.override
-	pygtk-codegen-2.0 --prefix gnomemisc \
+	$(PYGTK_CODEGEN) --prefix gnomemisc \
+		--register $(PYGTK_DEFSDIR)/applet.defs \
+		--register $(PYGTK_DEFSDIR)/pango-types.defs \
+		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
+		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
+		--register $(PYGTK_DEFSDIR)/bonobo-types.defs \
+		--register $(PYGTK_DEFSDIR)/bonoboui-types.defs \
 		--override gnomemisc.override \
 		gnomemisc.defs > $@
 
diff -r ab27d8034e6512b442a7b8a1eeb3b6d46e298366 -r ca2af4e02c4c440ba6e71032ddc0d4a5c2d10d0b src/wrap/gnomemisc/gnomemisc.override
--- a/src/wrap/gnomemisc/gnomemisc.override	Thu Aug 04 17:13:12 2005 +0000
+++ b/src/wrap/gnomemisc/gnomemisc.override	Thu Aug 04 19:07:57 2005 +0000
@@ -7,6 +7,6 @@
 %%
 modulename gnomemisc
 %%
-import gnomeapplet.Applet as PanelApplet_Type
+import gnomeapplet.Applet as PyPanelApplet_Type
 %%
 %%