mirror of
https://github.com/gryf/wicd.git
synced 2025-12-20 04:48:00 +01:00
Don't build C extensions modules in main setup.py
Give WirelessInformationDialog a parent.
This commit is contained in:
13
setup.py
13
setup.py
@@ -20,7 +20,6 @@ from distutils.core import setup, Command
|
||||
from distutils.extension import Extension
|
||||
import os
|
||||
import shutil
|
||||
import sys
|
||||
import subprocess
|
||||
|
||||
# Be sure to keep this updated!
|
||||
@@ -383,7 +382,6 @@ class uninstall(Command):
|
||||
|
||||
def run(self):
|
||||
os.system("./uninstall.sh")
|
||||
|
||||
try:
|
||||
import wpath
|
||||
except ImportError:
|
||||
@@ -477,13 +475,13 @@ except Exception, e:
|
||||
python setup.py configure has not yet been run.'''
|
||||
|
||||
|
||||
wpactrl_ext = Extension(name = 'wpactrl',
|
||||
sources = ['depends/python-wpactrl/wpa_ctrl.c',
|
||||
wpactrl_ext = Extension(name='wpactrl',
|
||||
sources=['depends/python-wpactrl/wpa_ctrl.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'],
|
||||
sources = ['depends/python-iwscan/pyiwscan.c'])
|
||||
iwscan_ext = Extension(name='iwscan', libraries=['iw'],
|
||||
sources=['depends/python-iwscan/pyiwscan.c'])
|
||||
|
||||
setup(cmdclass={'configure' : configure, 'get_translations' : get_translations,
|
||||
'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.logfile','wicd.backend','wicd.configmanager',
|
||||
'wicd.guiutil','wicd.translations'],
|
||||
ext_modules=[iwscan_ext, wpactrl_ext],
|
||||
data_files=data
|
||||
)
|
||||
|
||||
@@ -309,7 +309,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
|
||||
|
||||
information_button = gtk.Button(stock=gtk.STOCK_INFO)
|
||||
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()
|
||||
|
||||
# Build the encryption menu
|
||||
@@ -879,8 +879,8 @@ class WirelessNetworkEntry(NetworkEntry):
|
||||
|
||||
|
||||
class WirelessInformationDialog(gtk.Dialog):
|
||||
def __init__(self, networkID):
|
||||
gtk.Dialog.__init__(self)
|
||||
def __init__(self, networkID, parent):
|
||||
gtk.Dialog.__init__(self,parent=parent)
|
||||
|
||||
# Make the combo box.
|
||||
self.lbl_strength = gtk.Label()
|
||||
|
||||
Reference in New Issue
Block a user