3 files changed, 34 insertions, 32 deletions
diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 3a3930f1263f..a8b019fd1859 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.46 2005/08/26 22:36:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.47 2005/08/30 19:29:27 nixphoeni Exp $
+
+  30 Aug 2005; Joe Sapp <nixphoeni@gentoo.org>
+  files/gdesklets-control-getid:
+  Added revision information to gdesklets-control-getid
+  Removed the 'I' part from the folder created by a Control installation
 
   26 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   gdesklets-core-0.35.2-r1.ebuild:
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index ceaf88750ec5..46dc64428413 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,40 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 66248fdce375bd90c09ad12b210d353f gdesklets-core-0.35-r1.ebuild 2282
+MD5 4705e343fef6901429f4e28aaa891f27 gdesklets-core-0.35.2-r1.ebuild 2426
+MD5 a0740066aed09e15019eb17ce383e541 gdesklets-core-0.35_rc1.ebuild 2060
 MD5 f8a0b9310dac5018eb5ba6cb1d3c628c gdesklets-core-0.35.1.ebuild 2077
+MD5 120d0db4044c02b9a260350c1045ed35 gdesklets-core-0.26.2.ebuild 1872
+MD5 e339012b85e0b107e59eb1f9b97ff310 gdesklets-core-0.35.1-r1.ebuild 2284
 MD5 9a88e3777b00b5f3324d99e7b9afadb1 gdesklets-core-0.34.3-r1.ebuild 2389
-MD5 4705e343fef6901429f4e28aaa891f27 gdesklets-core-0.35.2-r1.ebuild 2426
-MD5 eca6c0fae552cb6b88412c77b87f3d14 gdesklets-core-0.35_rc1-r1.ebuild 2153
+MD5 b60b8c0d1d2d5e1dcc1d0497f78a0cbc gdesklets-core-0.35.ebuild 2075
+MD5 1abc1899afda317cf51bc2b19353b945 ChangeLog 8240
+MD5 a98089d6b170082dad015493bddd2e7e gdesklets-core-0.33.1.ebuild 2434
 MD5 7acaefbf35696571fb6c2981644e3b51 gdesklets-core-0.26.1.ebuild 1871
 MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
-MD5 a98089d6b170082dad015493bddd2e7e gdesklets-core-0.33.1.ebuild 2434
-MD5 7fb230f59a573afeee91d1055877d4e9 ChangeLog 8029
-MD5 b60b8c0d1d2d5e1dcc1d0497f78a0cbc gdesklets-core-0.35.ebuild 2075
-MD5 120d0db4044c02b9a260350c1045ed35 gdesklets-core-0.26.2.ebuild 1872
+MD5 eca6c0fae552cb6b88412c77b87f3d14 gdesklets-core-0.35_rc1-r1.ebuild 2153
 MD5 7de752dcb5d871ca8a6bd77e674ceccf gdesklets-core-0.32.ebuild 2050
-MD5 66248fdce375bd90c09ad12b210d353f gdesklets-core-0.35-r1.ebuild 2282
-MD5 a0740066aed09e15019eb17ce383e541 gdesklets-core-0.35_rc1.ebuild 2060
-MD5 e339012b85e0b107e59eb1f9b97ff310 gdesklets-core-0.35.1-r1.ebuild 2284
-MD5 ca60272587dbc0bfcdaa066753437811 files/digest-gdesklets-core-0.35.1-r1 131
 MD5 c4920c1829bd34f15ee1b85539dd3d4a files/digest-gdesklets-core-0.26.1 69
+MD5 26c6bbd356a7de3f57ffe9036275a5e5 files/digest-gdesklets-core-0.26.2 69
+MD5 312fdc938b56dedf0fab04efe6266cb1 files/digest-gdesklets-core-0.33.1 131
+MD5 ca60272587dbc0bfcdaa066753437811 files/digest-gdesklets-core-0.35.1 131
+MD5 ac3a171744ef9b36bed102088be244a9 files/digest-gdesklets-core-0.35_rc1 132
+MD5 66ab1d1c9445bb382edafdb15eee161d files/digest-gdesklets-core-0.35-r1 129
 MD5 ac3a171744ef9b36bed102088be244a9 files/digest-gdesklets-core-0.35_rc1-r1 132
+MD5 ac425079423c7c93f931c3f4df0dc598 files/digest-gdesklets-core-0.32 67
 MD5 66ab1d1c9445bb382edafdb15eee161d files/digest-gdesklets-core-0.35 129
+MD5 8293012469f5859ebfb450e81f87a165 files/digest-gdesklets-core-0.34.3-r1 131
+MD5 ca60272587dbc0bfcdaa066753437811 files/digest-gdesklets-core-0.35.1-r1 131
 MD5 1646a2250df551ca17b94641f23b0201 files/digest-gdesklets-core-0.35.2-r1 131
-MD5 3407f6fa18c84e9c85b7f9321a158ad3 files/gdesklets-migration-tool 7343
-MD5 b9861538d27ddcccf566148374dcd22a files/gdesklets-control-getid 745
-MD5 ca60272587dbc0bfcdaa066753437811 files/digest-gdesklets-core-0.35.1 131
+MD5 71bc511d49da32bc50a59ba5f51d7e24 files/gdesklets-control-getid 1146
 MD5 8e873c3bd94ee7756f3caf1c0f5b9398 files/dst-fix-0.34.3.patch 1269
-MD5 ac425079423c7c93f931c3f4df0dc598 files/digest-gdesklets-core-0.32 67
-MD5 8293012469f5859ebfb450e81f87a165 files/digest-gdesklets-core-0.34.3-r1 131
-MD5 26c6bbd356a7de3f57ffe9036275a5e5 files/digest-gdesklets-core-0.26.2 69
-MD5 ac3a171744ef9b36bed102088be244a9 files/digest-gdesklets-core-0.35_rc1 132
+MD5 3407f6fa18c84e9c85b7f9321a158ad3 files/gdesklets-migration-tool 7343
 MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230
-MD5 66ab1d1c9445bb382edafdb15eee161d files/digest-gdesklets-core-0.35-r1 129
-MD5 312fdc938b56dedf0fab04efe6266cb1 files/digest-gdesklets-core-0.33.1 131
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDD5l5BXaUFmZvwyMRAsfuAKC5p0P1JdjcncSu6MuyPeryOhZh4QCeLJCb
-MksAoMGn8ONs7EjYpRh0tC8=
-=gfWO
------END PGP SIGNATURE-----
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-control-getid b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
index 88b4fccd53aa..8b309a2c98b9 100755
--- a/gnome-extra/gdesklets-core/files/gdesklets-control-getid
+++ b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
@@ -1,4 +1,8 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.3 2005/08/30 19:29:27 nixphoeni Exp $
+# 
 # A simple script to get the name and id from a Control.
 # Pretty much copied from test-control.py
 
@@ -29,4 +33,7 @@ except IOError:
     #sys.exit("Could not load control %s." % (path))
     print folder
 
-print Interface.get_id(Interface.get_interfaces(clss)[0]).replace(":", "_")
+# Get the string in the form of "IMyControl:hash" and translate it to
+# "MyControl_hash"
+# gDesklets needs it in the form of a valid python module name
+print (Interface.get_id(Interface.get_interfaces(clss)[0]).replace(":", "_"))[1:]