gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 12:58:07 +01:00
Code Issues Projects Releases Wiki Activity

Don't build C extensions modules in main setup.py

Browse Source 
Give WirelessInformationDialog a parent.
This commit is contained in:
Dan O'Reilly
2009-04-11 18:04:22 -04:00
parent 52a613cf04
commit 8ecd9ec029
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
setup.py
View File

@@ -20,7 +20,6 @@ from distutils.core import setup, Command
from distutils.extension import Extension from distutils.extension import Extension
import os import os
import shutil import shutil
import sys
import subprocess import subprocess
# Be sure to keep this updated! # Be sure to keep this updated!
@@ -383,7 +382,6 @@ class uninstall(Command):
def run(self): def run(self):
os.system("./uninstall.sh") os.system("./uninstall.sh")
try: try:
import wpath import wpath
except ImportError: except ImportError:
@@ -477,13 +475,13 @@ except Exception, e:
python setup.py configure has not yet been run.''' python setup.py configure has not yet been run.'''
wpactrl_ext = Extension(name = 'wpactrl', wpactrl_ext = Extension(name='wpactrl',
sources = ['depends/python-wpactrl/wpa_ctrl.c', sources=['depends/python-wpactrl/wpa_ctrl.c',
'depends/python-wpactrl/wpactrl.c'], 'depends/python-wpactrl/wpactrl.c'],
extra_compile_args = ["-fno-strict-aliasing"]) extra_compile_args=["-fno-strict-aliasing"])
iwscan_ext = Extension(name = 'iwscan', libraries = ['iw'], iwscan_ext = Extension(name='iwscan', libraries=['iw'],
sources = ['depends/python-iwscan/pyiwscan.c']) sources=['depends/python-iwscan/pyiwscan.c'])
setup(cmdclass={'configure' : configure, 'get_translations' : get_translations, setup(cmdclass={'configure' : configure, 'get_translations' : get_translations,
'uninstall' : uninstall, 'test' : test, 'clear_generated' : clear_generated}, 'uninstall' : uninstall, 'test' : test, 'clear_generated' : clear_generated},
@@ -506,6 +504,5 @@ connect at startup to any preferred network within range.
'wicd.wpath','wicd.prefs','wicd.netentry','wicd.dbusmanager', 'wicd.wpath','wicd.prefs','wicd.netentry','wicd.dbusmanager',
'wicd.logfile','wicd.backend','wicd.configmanager', 'wicd.logfile','wicd.backend','wicd.configmanager',
'wicd.guiutil','wicd.translations'], 'wicd.guiutil','wicd.translations'],
ext_modules=[iwscan_ext, wpactrl_ext],
data_files=data data_files=data
) )

6
wicd/netentry.py
View File

@@ -309,7 +309,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
information_button = gtk.Button(stock=gtk.STOCK_INFO) information_button = gtk.Button(stock=gtk.STOCK_INFO)
self.button_hbox.pack_start(information_button, False, False) self.button_hbox.pack_start(information_button, False, False)
information_button.connect('clicked', lambda *a, **k: WirelessInformationDialog(networkID)) information_button.connect('clicked', lambda *a, **k: WirelessInformationDialog(networkID, self))
information_button.show() information_button.show()
# Build the encryption menu # Build the encryption menu
@@ -879,8 +879,8 @@ class WirelessNetworkEntry(NetworkEntry):
class WirelessInformationDialog(gtk.Dialog): class WirelessInformationDialog(gtk.Dialog):
def __init__(self, networkID): def __init__(self, networkID, parent):
gtk.Dialog.__init__(self) gtk.Dialog.__init__(self,parent=parent)
# Make the combo box. # Make the combo box.
self.lbl_strength = gtk.Label() self.lbl_strength = gtk.Label()