# HG changeset patch # User Erik Grinaker # Date 1139243979 0 # Node ID c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 # Parent abbd35ed4b61accd13a9b3201604b3949ab40912 use gnomeapplet.Applet.request_focus() and removed gnomemisc module diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 ChangeLog --- a/ChangeLog Mon Feb 06 16:25:45 2006 +0000 +++ b/ChangeLog Mon Feb 06 16:39:39 2006 +0000 @@ -14,6 +14,10 @@ * use gnome.ui.authentication_manager_init() instead of wrapping it + * use gnomeapplet.Applet.request_focus() instead of wrapping it + + * removed gnomemisc module + ---------------[ 2006-02-06 : 0.4.7 ]--------------- 2006-02-03 Erik Grinaker diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 NEWS --- a/NEWS Mon Feb 06 16:25:45 2006 +0000 +++ b/NEWS Mon Feb 06 16:39:39 2006 +0000 @@ -8,6 +8,7 @@ - removed the Help > Homepage menu item Code changes: +- removed gnomemisc module - don't use deprecated gnome-python modules - moved preference dialog from dialog module to main script diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 acinclude.m4 --- a/acinclude.m4 Mon Feb 06 16:25:45 2006 +0000 +++ b/acinclude.m4 Mon Feb 06 16:39:39 2006 +0000 @@ -67,10 +67,6 @@ AM_GCONF_SOURCE_2 ]) -AC_DEFUN([RVL_LIBPANELAPPLET], [ - PKG_CHECK_MODULES(LIBPANELAPPLET, libpanelapplet-2.0 >= 2.9.4, [ AC_DEFINE(HAVE_REQUEST_FOCUS) ], [ true ]) -]) - 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) diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 configure.ac --- a/configure.ac Mon Feb 06 16:25:45 2006 +0000 +++ b/configure.ac Mon Feb 06 16:39:39 2006 +0000 @@ -17,7 +17,6 @@ RVL_PYGTK() RVL_CRACKLIB() RVL_GCONF() -RVL_LIBPANELAPPLET() RVL_FDO_MIME() RVL_PYTHON_MODULE(Crypto, yes) @@ -49,6 +48,5 @@ src/lib/datahandler/Makefile src/wrap/Makefile src/wrap/crack/Makefile - src/wrap/gnomemisc/Makefile ]) diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 src/lib/__init__.py --- a/src/lib/__init__.py Mon Feb 06 16:25:45 2006 +0000 +++ b/src/lib/__init__.py Mon Feb 06 16:39:39 2006 +0000 @@ -26,7 +26,6 @@ import crack import util import config -import gnomemisc import datahandler import io import entry diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 src/revelation-applet.in --- a/src/revelation-applet.in Mon Feb 06 16:25:45 2006 +0000 +++ b/src/revelation-applet.in Mon Feb 06 16:39:39 2006 +0000 @@ -30,7 +30,7 @@ if "@pyexecdir@" not in sys.path: sys.path.insert(0, "@pyexecdir@") -from revelation import config, data, datahandler, dialog, entry, gnomemisc, io, ui, util +from revelation import config, data, datahandler, dialog, entry, io, ui, util @@ -238,15 +238,8 @@ self.locktimer.reset() - # from gnome 2.10, the panel doesn't receive focus when clicked - # (the OverflowError exception is a workaround for what I suspect - # is a pygtk bug - see pygtk bug #300012) - try: - if data.button == 1 and hasattr(gnomemisc, "panel_applet_request_focus") == True: - gnomemisc.panel_applet_request_focus(self.applet, long(data.time)) - - except OverflowError: - gnomemisc.panel_applet_request_focus(self.applet, 0L) + if data.button == 1: + self.applet.request_focus(data.time) def __cb_file_autolock(self, widget, data = None): @@ -378,8 +371,7 @@ def __focus_entry(self): "Gives focus to the entry" - if hasattr(gnomemisc, "panel_applet_request_focus") == True: - gnomemisc.panel_applet_request_focus(self.applet, long(0)) + self.applet.request_focus(long(0)) def __generate_entrymenu(self, entrystore, parent = None): diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 src/revelation.in --- a/src/revelation.in Mon Feb 06 16:25:45 2006 +0000 +++ b/src/revelation.in Mon Feb 06 16:39:39 2006 +0000 @@ -27,7 +27,7 @@ if "@pyexecdir@" not in sys.path: sys.path.insert(0, "@pyexecdir@") -from revelation import gnomemisc, config, data, datahandler, dialog, entry, io, ui, util +from revelation import config, data, datahandler, dialog, entry, io, ui, util class Revelation(ui.App): diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 src/wrap/Makefile.am --- a/src/wrap/Makefile.am Mon Feb 06 16:25:45 2006 +0000 +++ b/src/wrap/Makefile.am Mon Feb 06 16:39:39 2006 +0000 @@ -5,5 +5,5 @@ # $Id$ # -SUBDIRS = crack gnomemisc +SUBDIRS = crack diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 src/wrap/gnomemisc/Makefile.am --- a/src/wrap/gnomemisc/Makefile.am Mon Feb 06 16:25:45 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -## Process this file with automake to produce Makefile.in -# -# src/wrap/gnomemisc/Makefile.am -# -# $Id$ -# - -module_PROGRAMS = gnomemisc.so -moduledir = $(pyexecdir)/revelation -CLEANFILES = gnomemisc.c - -AM_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 libgnomeui-2.0 gnome-vfs-2.0 gnome-keyring-1 libpanelapplet-2.0` -AM_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 libgnomeui-2.0 gnome-vfs-2.0 gnome-keyring-1 libpanelapplet-2.0` -fPIC -I${PYTHON_INCLUDE} -I. - - -gnomemisc.c: gnomemisc.defs gnomemisc.override - $(PYGTK_CODEGEN) --prefix gnomemisc \ - $(DEFS) \ - --register $(PYGTK_DEFSDIR)/applet.defs \ - --register $(PYGTK_DEFSDIR)/bonobo-types.defs \ - --override gnomemisc.override \ - gnomemisc.defs > $@ - -gnomemisc.so: gnomemisc.o gnomemiscmodule.o - $(CC) $(AM_LDFLAGS) -shared $^ -o $@ - diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 src/wrap/gnomemisc/gnomemisc.defs --- a/src/wrap/gnomemisc/gnomemisc.defs Mon Feb 06 16:25:45 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -;; -*- scheme -*- - -(ifdef HAVE_REQUEST_FOCUS - (define-function panel_applet_request_focus - (c-name "panel_applet_request_focus") - (return-type "none") - (parameters - ("PanelApplet*" "applet") - ("guint32" "timestamp") - ) - ) -) - diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 src/wrap/gnomemisc/gnomemisc.override --- a/src/wrap/gnomemisc/gnomemisc.override Mon Feb 06 16:25:45 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -%% -headers -#include "pygobject.h" - -#ifdef HAVE_REQUEST_FOCUS -#include -#endif -%% -modulename gnomemisc -%% -import gnomeapplet.Applet as PyPanelApplet_Type -%% -%% diff -r abbd35ed4b61accd13a9b3201604b3949ab40912 -r c46bd5f2a327d626f1bbc7dec45a442d71bf4f58 src/wrap/gnomemisc/gnomemiscmodule.c --- a/src/wrap/gnomemisc/gnomemiscmodule.c Mon Feb 06 16:25:45 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -#include -#include "pygobject.h" - -void gnomemisc_register_classes (PyObject *d); -extern PyMethodDef gnomemisc_functions[]; - -DL_EXPORT(void) initgnomemisc(void) { - PyObject *m, *d; - - init_pygobject(); - m = Py_InitModule("gnomemisc", gnomemisc_functions); - d = PyModule_GetDict(m); - - gnomemisc_register_classes(d); -} -