Attachment #51492 for bug #78193

View | Details | Raw Unified | Return to bug 78193
Collapse All | Expand All




#

PORTNAME=	gdesklets
PORTVERSION=	0.34
PORTREVISION=	1
CATEGORIES=	deskutils gnome
MASTER_SITES=	http://www.pycage.de/download/${PORTNAME}/
DISTNAME=	gDesklets-${PORTVERSION}

BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
RUN_DEPENDS=	${PYXML} \
		${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2 \
		${PYTHON_SITELIBDIR}/gtk-2.0/gtkhtml2.so:${PORTSDIR}/x11-toolkits/py-gnome-extras

USE_BZIP2=	yes
USE_GMAKE=	yes

post-install:
	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays
	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/data
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/desktop
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/display
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/factory
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/libdesklets
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/main
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/sensor
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/utils
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)gdesklets/distinfo (-2 / +2 lines)
1	MD5 (gDesklets-0.33.1.tar.bz2) = db252b31b56b1c2f49312d5837c311b8	1	MD5 (gDesklets-0.34.tar.bz2) = 26300dd23f06bb41b08ce0cd3979d1e5
2	SIZE (gDesklets-0.33.1.tar.bz2) = 690678	2	SIZE (gDesklets-0.34.tar.bz2) = 724198




--- Controls/ArrayBuffer/__init__.py.orig	Mon Feb 28 14:07:04 2005
+++ Controls/ArrayBuffer/__init__.py	Mon Feb 28 14:07:25 2005
@@ -3,6 +3,10 @@
 # ArrayBuffer Class
 #
 #
+
+from libdesklets.controls import Control
+from IArrayBuffer import *
+
 class ArrayBuffer(Control, IArrayBuffer):
 
         #




--- main/__init__.py.orig	Mon Feb 28 12:11:37 2005
+++ main/__init__.py	Mon Feb 28 12:12:18 2005
@@ -20,7 +20,7 @@
     USERHOME = os.path.join(os.environ["APPDATA"], "gDesklets")
 else:
     USERHOME = os.path.join(os.path.expanduser("~"), ".gdesklets")
-OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gdesklets")
+OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gnome", "gdesklets")
 
 
 # we need the DISPLAY variable
 try:

Lines 1-5 Link Here

(-)gdesklets/files/patch-utils::utils.c (-3 / +3 lines)
1	--- utils/utils.c.orig Thu Dec 16 19:02:08 2004	1	--- utils/utils.c.orig Sun Feb 6 22:11:42 2005
2	+++ utils/utils.c Thu Feb 17 21:28:55 2005	2	+++ utils/utils.c Mon Feb 28 12:15:54 2005
3	@@ -12,14 +12,14 @@	3	@@ -12,14 +12,14 @@
4		4
5	if(G_UNLIKELY(PyGObject_Type == NULL))	5	if(G_UNLIKELY(PyGObject_Type == NULL))
Lines 10-16 Link Here
10	module = PyImport_ImportModule("gobject");	10	module = PyImport_ImportModule("gobject");
11		11
12	if(!module)	12	if(!module)
13	goto err_gobject;	13	goto err_gobject;
14		14
15	- PyObject *moddict = PyModule_GetDict(module);	15	- PyObject *moddict = PyModule_GetDict(module);
16	+ moddict = PyModule_GetDict(module);	16	+ moddict = PyModule_GetDict(module);

Lines 1-5 Link Here

(-)gdesklets/pkg-plist (-15 / +53 lines)
1	bin/gdesklets	1	bin/gdesklets
2	bin/gdesklets-display-thumbnailer	2	bin/gdesklets-display-thumbnailer
		3	lib/gdesklets/Controls/ArrayBuffer/__init__.py
		4	lib/gdesklets/Controls/ArrayBuffer/__init__.pyc
		5	lib/gdesklets/Controls/ArrayBuffer/IArrayBuffer.py
		6	lib/gdesklets/Controls/ArrayBuffer/IArrayBuffer.pyc
		7	lib/gdesklets/Controls/EventPipe/__init__.py
		8	lib/gdesklets/Controls/EventPipe/__init__.pyc
		9	lib/gdesklets/Controls/EventPipe/IEventPipe.py
		10	lib/gdesklets/Controls/EventPipe/IEventPipe.pyc
3	lib/gdesklets/Controls/Calendar/ICalendar.py	11	lib/gdesklets/Controls/Calendar/ICalendar.py
4	lib/gdesklets/Controls/Calendar/ICalendar.pyc	12	lib/gdesklets/Controls/Calendar/ICalendar.pyc
5	lib/gdesklets/Controls/Calendar/ICalendar.pyo	13	lib/gdesklets/Controls/Calendar/ICalendar.pyo
Lines 60-65 Link Here
60	lib/gdesklets/config/ConfigDialog.py	68	lib/gdesklets/config/ConfigDialog.py
61	lib/gdesklets/config/ConfigDialog.pyc	69	lib/gdesklets/config/ConfigDialog.pyc
62	lib/gdesklets/config/ConfigDialog.pyo	70	lib/gdesklets/config/ConfigDialog.pyo
		71	lib/gdesklets/config/ConfigDPI.py
		72	lib/gdesklets/config/ConfigDPI.pyc
		73	lib/gdesklets/config/ConfigDPI.pyo
63	lib/gdesklets/config/ConfigEnum.py	74	lib/gdesklets/config/ConfigEnum.py
64	lib/gdesklets/config/ConfigEnum.pyc	75	lib/gdesklets/config/ConfigEnum.pyc
65	lib/gdesklets/config/ConfigEnum.pyo	76	lib/gdesklets/config/ConfigEnum.pyo
Lines 75-83 Link Here
75	lib/gdesklets/config/ConfigManager.py	86	lib/gdesklets/config/ConfigManager.py
76	lib/gdesklets/config/ConfigManager.pyc	87	lib/gdesklets/config/ConfigManager.pyc
77	lib/gdesklets/config/ConfigManager.pyo	88	lib/gdesklets/config/ConfigManager.pyo
78	lib/gdesklets/config/ConfigSettings.py	89	lib/gdesklets/config/ConfigUnit.py
79	lib/gdesklets/config/ConfigSettings.pyc	90	lib/gdesklets/config/ConfigUnit.pyc
80	lib/gdesklets/config/ConfigSettings.pyo	91	lib/gdesklets/config/ConfigUnit.pyo
81	lib/gdesklets/config/ConfigString.py	92	lib/gdesklets/config/ConfigString.py
82	lib/gdesklets/config/ConfigString.pyc	93	lib/gdesklets/config/ConfigString.pyc
83	lib/gdesklets/config/ConfigString.pyo	94	lib/gdesklets/config/ConfigString.pyo
Lines 90-101 Link Here
90	lib/gdesklets/config/ConfigWidget.py	101	lib/gdesklets/config/ConfigWidget.py
91	lib/gdesklets/config/ConfigWidget.pyc	102	lib/gdesklets/config/ConfigWidget.pyc
92	lib/gdesklets/config/ConfigWidget.pyo	103	lib/gdesklets/config/ConfigWidget.pyo
		104	lib/gdesklets/config/DaemonConfigger.py
		105	lib/gdesklets/config/DaemonConfigger.pyc
		106	lib/gdesklets/config/DaemonConfigger.pyo
		107	lib/gdesklets/config/DisplayConfigger.py
		108	lib/gdesklets/config/DisplayConfigger.pyc
		109	lib/gdesklets/config/DisplayConfigger.pyo
93	lib/gdesklets/config/GConfBackend.py	110	lib/gdesklets/config/GConfBackend.py
94	lib/gdesklets/config/GConfBackend.pyc	111	lib/gdesklets/config/GConfBackend.pyc
95	lib/gdesklets/config/GConfBackend.pyo	112	lib/gdesklets/config/GConfBackend.pyo
96	lib/gdesklets/config/StateSaver.py	113	lib/gdesklets/config/StateSaver.py
97	lib/gdesklets/config/StateSaver.pyc	114	lib/gdesklets/config/StateSaver.pyc
98	lib/gdesklets/config/StateSaver.pyo	115	lib/gdesklets/config/StateSaver.pyo
		116	lib/gdesklets/config/Win32Backend.py
		117	lib/gdesklets/config/Win32Backend.pyc
		118	lib/gdesklets/config/Win32Backend.pyo
99	lib/gdesklets/config/__init__.py	119	lib/gdesklets/config/__init__.py
100	lib/gdesklets/config/__init__.pyc	120	lib/gdesklets/config/__init__.pyc
101	lib/gdesklets/config/__init__.pyo	121	lib/gdesklets/config/__init__.pyo
Lines 125-130 Link Here
125	lib/gdesklets/display/GlassWindow.py	145	lib/gdesklets/display/GlassWindow.py
126	lib/gdesklets/display/GlassWindow.pyc	146	lib/gdesklets/display/GlassWindow.pyc
127	lib/gdesklets/display/GlassWindow.pyo	147	lib/gdesklets/display/GlassWindow.pyo
		148	lib/gdesklets/display/Layouter.py
		149	lib/gdesklets/display/Layouter.pyc
		150	lib/gdesklets/display/Layouter.pyo
128	lib/gdesklets/display/Plug.py	151	lib/gdesklets/display/Plug.py
129	lib/gdesklets/display/Plug.pyc	152	lib/gdesklets/display/Plug.pyc
130	lib/gdesklets/display/Plug.pyo	153	lib/gdesklets/display/Plug.pyo
Lines 179-187 Link Here
179	lib/gdesklets/display/__init__.py	202	lib/gdesklets/display/__init__.py
180	lib/gdesklets/display/__init__.pyc	203	lib/gdesklets/display/__init__.pyc
181	lib/gdesklets/display/__init__.pyo	204	lib/gdesklets/display/__init__.pyo
182	lib/gdesklets/display/layouters.py
183	lib/gdesklets/display/layouters.pyc
184	lib/gdesklets/display/layouters.pyo
185	lib/gdesklets/display/targetregistry.py	205	lib/gdesklets/display/targetregistry.py
186	lib/gdesklets/display/targetregistry.pyc	206	lib/gdesklets/display/targetregistry.pyc
187	lib/gdesklets/display/targetregistry.pyo	207	lib/gdesklets/display/targetregistry.pyo
Lines 278-286 Link Here
278	lib/gdesklets/main/DisplayList.py	298	lib/gdesklets/main/DisplayList.py
279	lib/gdesklets/main/DisplayList.pyc	299	lib/gdesklets/main/DisplayList.pyc
280	lib/gdesklets/main/DisplayList.pyo	300	lib/gdesklets/main/DisplayList.pyo
281	lib/gdesklets/main/LogViewer.py
282	lib/gdesklets/main/LogViewer.pyc
283	lib/gdesklets/main/LogViewer.pyo
284	lib/gdesklets/main/MetaData.py	301	lib/gdesklets/main/MetaData.py
285	lib/gdesklets/main/MetaData.pyc	302	lib/gdesklets/main/MetaData.pyc
286	lib/gdesklets/main/MetaData.pyo	303	lib/gdesklets/main/MetaData.pyo
Lines 314-328 Link Here
314	lib/gdesklets/plugin/__init__.py	331	lib/gdesklets/plugin/__init__.py
315	lib/gdesklets/plugin/__init__.pyc	332	lib/gdesklets/plugin/__init__.pyc
316	lib/gdesklets/plugin/__init__.pyo	333	lib/gdesklets/plugin/__init__.pyo
		334	lib/gdesklets/scripting/ElementWrapper.py
		335	lib/gdesklets/scripting/ElementWrapper.pyc
		336	lib/gdesklets/scripting/ElementWrapper.pyo
317	lib/gdesklets/scripting/ControlWrapper.py	337	lib/gdesklets/scripting/ControlWrapper.py
318	lib/gdesklets/scripting/ControlWrapper.pyc	338	lib/gdesklets/scripting/ControlWrapper.pyc
319	lib/gdesklets/scripting/ControlWrapper.pyo	339	lib/gdesklets/scripting/ControlWrapper.pyo
320	lib/gdesklets/scripting/Script.py	340	lib/gdesklets/scripting/Script.py
321	lib/gdesklets/scripting/Script.pyc	341	lib/gdesklets/scripting/Script.pyc
322	lib/gdesklets/scripting/Script.pyo	342	lib/gdesklets/scripting/Script.pyo
323	lib/gdesklets/scripting/TargetWrapper.py	343	lib/gdesklets/scripting/Scriptlet.py
324	lib/gdesklets/scripting/TargetWrapper.pyc	344	lib/gdesklets/scripting/Scriptlet.pyc
325	lib/gdesklets/scripting/TargetWrapper.pyo	345	lib/gdesklets/scripting/Scriptlet.pyo
326	lib/gdesklets/scripting/Vault.py	346	lib/gdesklets/scripting/Vault.py
327	lib/gdesklets/scripting/Vault.pyc	347	lib/gdesklets/scripting/Vault.pyc
328	lib/gdesklets/scripting/Vault.pyo	348	lib/gdesklets/scripting/Vault.pyo
Lines 427-432 Link Here
427	lib/gdesklets/shell/plugins/gDeskletsClient/__init__.pyc	447	lib/gdesklets/shell/plugins/gDeskletsClient/__init__.pyc
428	lib/gdesklets/shell/plugins/gDeskletsClient/__init__.pyo	448	lib/gdesklets/shell/plugins/gDeskletsClient/__init__.pyo
429	lib/gdesklets/test-control.py	449	lib/gdesklets/test-control.py
		450	lib/gdesklets/test-control.pyc
		451	lib/gdesklets/utils/DOM.py
		452	lib/gdesklets/utils/DOM.pyc
		453	lib/gdesklets/utils/DOM.pyo
		454	lib/gdesklets/utils/Element.py
		455	lib/gdesklets/utils/Element.pyc
		456	lib/gdesklets/utils/Element.pyo
		457	lib/gdesklets/utils/ErrorFormatter.py
		458	lib/gdesklets/utils/ErrorFormatter.pyc
		459	lib/gdesklets/utils/ErrorFormatter.pyo
430	lib/gdesklets/utils/BGWatcher.py	460	lib/gdesklets/utils/BGWatcher.py
431	lib/gdesklets/utils/BGWatcher.pyc	461	lib/gdesklets/utils/BGWatcher.pyc
432	lib/gdesklets/utils/BGWatcher.pyo	462	lib/gdesklets/utils/BGWatcher.pyo
Lines 436-441 Link Here
436	lib/gdesklets/utils/HIGDialog.py	466	lib/gdesklets/utils/HIGDialog.py
437	lib/gdesklets/utils/HIGDialog.pyc	467	lib/gdesklets/utils/HIGDialog.pyc
438	lib/gdesklets/utils/HIGDialog.pyo	468	lib/gdesklets/utils/HIGDialog.pyo
		469	lib/gdesklets/utils/LogView.py
		470	lib/gdesklets/utils/LogView.pyc
		471	lib/gdesklets/utils/LogView.pyo
439	lib/gdesklets/utils/Observable.py	472	lib/gdesklets/utils/Observable.py
440	lib/gdesklets/utils/Observable.pyc	473	lib/gdesklets/utils/Observable.pyc
441	lib/gdesklets/utils/Observable.pyo	474	lib/gdesklets/utils/Observable.pyo
Lines 454-462 Link Here
454	lib/gdesklets/utils/Trie.py	487	lib/gdesklets/utils/Trie.py
455	lib/gdesklets/utils/Trie.pyc	488	lib/gdesklets/utils/Trie.pyc
456	lib/gdesklets/utils/Trie.pyo	489	lib/gdesklets/utils/Trie.pyo
457	lib/gdesklets/utils/TypeConverter.py
458	lib/gdesklets/utils/TypeConverter.pyc
459	lib/gdesklets/utils/TypeConverter.pyo
460	lib/gdesklets/utils/Unit.py	490	lib/gdesklets/utils/Unit.py
461	lib/gdesklets/utils/Unit.pyc	491	lib/gdesklets/utils/Unit.pyc
462	lib/gdesklets/utils/Unit.pyo	492	lib/gdesklets/utils/Unit.pyo
Lines 490-495 Link Here
490	lib/gdesklets/utils/svg.so	520	lib/gdesklets/utils/svg.so
491	lib/gdesklets/utils/systray.so	521	lib/gdesklets/utils/systray.so
492	lib/gdesklets/utils/tiling.so	522	lib/gdesklets/utils/tiling.so
		523	lib/gdesklets/utils/typeconverter.py
		524	lib/gdesklets/utils/typeconverter.pyc
		525	lib/gdesklets/utils/typeconverter.pyo
		526	lib/gdesklets/utils/vfs.py
		527	lib/gdesklets/utils/vfs.pyc
		528	lib/gdesklets/utils/vfs.pyo
493	lib/gdesklets/utils/wallpaper.py	529	lib/gdesklets/utils/wallpaper.py
494	lib/gdesklets/utils/wallpaper.pyc	530	lib/gdesklets/utils/wallpaper.pyc
495	lib/gdesklets/utils/wallpaper.pyo	531	lib/gdesklets/utils/wallpaper.pyo
Lines 581-586 Link Here
581	@dirrm lib/gdesklets/Controls/Sensors	617	@dirrm lib/gdesklets/Controls/Sensors
582	@dirrm lib/gdesklets/Controls/HDDTemp	618	@dirrm lib/gdesklets/Controls/HDDTemp
583	@dirrm lib/gdesklets/Controls/Calendar	619	@dirrm lib/gdesklets/Controls/Calendar
		620	@dirrm lib/gdesklets/Controls/EventPipe
		621	@dirrm lib/gdesklets/Controls/ArrayBuffer
584	@dirrm lib/gdesklets/Controls	622	@dirrm lib/gdesklets/Controls
585	@dirrm lib/gdesklets	623	@dirrm lib/gdesklets
586	@exec update-mime-database %D/share/mime	624	@exec update-mime-database %D/share/mime

Return to bug 78193

Lines 6-13 Link Here

(-)gdesklets/Makefile (-12 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= gdesklets	8	PORTNAME= gdesklets
9	PORTVERSION= 0.33.1	9	PORTVERSION= 0.34
10	PORTREVISION= 1
11	CATEGORIES= deskutils gnome	10	CATEGORIES= deskutils gnome
12	MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/	11	MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/
13	DISTNAME= gDesklets-${PORTVERSION}	12	DISTNAME= gDesklets-${PORTVERSION}
Lines 18-24 Link Here
18	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2	17	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
19	LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2	18	LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
20	RUN_DEPENDS= ${PYXML} \	19	RUN_DEPENDS= ${PYXML} \
21	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2	20	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2 \
		21	${PYTHON_SITELIBDIR}/gtk-2.0/gtkhtml2.so:${PORTSDIR}/x11-toolkits/py-gnome-extras
22		22
23	USE_BZIP2= yes	23	USE_BZIP2= yes
24	USE_GMAKE= yes	24	USE_GMAKE= yes
Lines 36-50 Link Here
36	post-install:	36	post-install:
37	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays	37	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays
38	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors	38	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors
39	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/config	39	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets
40	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/data
41	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/desktop
42	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/display
43	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/factory
44	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/libdesklets
45	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/main
46	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/sensor
47	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/utils
48	@${CAT} ${PKGMESSAGE}	40	@${CAT} ${PKGMESSAGE}
49		41
50	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Line 0 Link Here

(-)gdesklets/files/patch-Controls::ArrayBuffer::__init__.py (+13 lines)
	1	--- Controls/ArrayBuffer/__init__.py.orig Mon Feb 28 14:07:04 2005
	2	+++ Controls/ArrayBuffer/__init__.py Mon Feb 28 14:07:25 2005
	3	@@ -3,6 +3,10 @@
	4	# ArrayBuffer Class
	5	#
	6	#
	7	+
	8	+from libdesklets.controls import Control
	9	+from IArrayBuffer import *
	10	+
	11	class ArrayBuffer(Control, IArrayBuffer):
	12
	13	#

Lines 1-11 Link Here

(-)gdesklets/files/patch-main::__init__.py (-7 / +7 lines)
1	--- main/__init__.py.orig Sun Jan 30 22:40:29 2005	1	--- main/__init__.py.orig Mon Feb 28 12:11:37 2005
2	+++ main/__init__.py Sun Jan 30 22:40:54 2005	2	+++ main/__init__.py Mon Feb 28 12:12:18 2005
3	@@ -4,7 +4,7 @@	3	@@ -20,7 +20,7 @@
4	# gDesklets home paths	4	USERHOME = os.path.join(os.environ["APPDATA"], "gDesklets")
5	HOME = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))	5	else:
6	USERHOME = os.path.join(os.path.expanduser("~"), ".gdesklets")	6	USERHOME = os.path.join(os.path.expanduser("~"), ".gdesklets")
7	-OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gdesklets")	7	-OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gdesklets")
8	+OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gnome", "gdesklets")	8	+OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gnome", "gdesklets")
9		9
		10
10	# we need the DISPLAY variable	11	# we need the DISPLAY variable
11	try: