Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-10-16 08:32:03 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-10-16 08:32:03 (GMT)
commit087856f23317537dbc6b112564c64db68601410e (patch)
tree8f92d86e6cff36c87cba07d6eb04ea0e860d0c25
parent16fa7ff673a2a2ebf2134c8ebb0251f6bd585b64 (diff)
Remove ltihooks since we are not loading from the source
directory at the moment.
-rwxr-xr-xsugar-emulator1
-rw-r--r--sugar/Makefile.am1
-rw-r--r--sugar/ltihooks.py70
3 files changed, 0 insertions, 72 deletions
diff --git a/sugar-emulator b/sugar-emulator
index 599d647..12779dc 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -31,7 +31,6 @@ import gtk
import gobject
from sugar import env
-from sugar import ltihooks
def _get_display_number():
"""Find a free display number trying to connect to 6000+ ports"""
diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index d54ea93..0f5da84 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = activity bundle clipboard graphics objects presence datastore
sugardir = $(pythondir)/sugar
sugar_PYTHON = \
env.py \
- ltihooks.py \
network.py \
profile.py \
util.py \
diff --git a/sugar/ltihooks.py b/sugar/ltihooks.py
deleted file mode 100644
index d2e6b1f..0000000
--- a/sugar/ltihooks.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- Mode: Python -*-
-# vi:si:et:sw=4:sts=4:ts=4
-
-# ltihooks.py: python import hooks that understand libtool libraries.
-# Copyright (C) 2000-2007 James Henstridge.
-# renamed to gstltihooks.py so it does not accidentally get imported by
-# an installed copy of gtk
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-import os, ihooks
-
-class LibtoolHooks(ihooks.Hooks):
- def get_suffixes(self):
- """Like normal get_suffixes, but adds .la suffixes to list"""
- ret = ihooks.Hooks.get_suffixes(self)
- ret.insert(0, ('module.la', 'rb', 3))
- ret.insert(0, ('.la', 'rb', 3))
- return ret
-
- def load_dynamic(self, name, filename, file=None):
- """Like normal load_dynamic, but treat .la files specially"""
- if len(filename) > 3 and filename[-3:] == '.la':
- fp = open(filename, 'r')
- dlname = ''
- installed = 1
- line = fp.readline()
- while line:
- # dlname: the name that we can dlopen
- if len(line) > 7 and line[:7] == 'dlname=':
- dlname = line[8:-2]
- # installed: whether it's already installed
- elif len(line) > 10 and line[:10] == 'installed=':
- installed = line[10:-1] == 'yes'
- line = fp.readline()
- fp.close()
- if dlname:
- if installed:
- filename = os.path.join(os.path.dirname(filename),
- dlname)
- else:
- # if .libs already there, don't need to add it again
- if os.path.dirname(filename).endswith('.libs'):
- filename = os.path.join(os.path.dirname(filename),
- dlname)
- else:
- filename = os.path.join(os.path.dirname(filename),
- '.libs', dlname)
- return ihooks.Hooks.load_dynamic(self, name, filename, file)
-
-importer = ihooks.ModuleImporter()
-importer.set_hooks(LibtoolHooks())
-
-def install():
- print 'Installed ltihooks.'
- importer.install()
-def uninstall():
- importer.uninstall()