--- system-config-bind-4.0.0/DNSsec.py~ 2005-04-01 15:19:38.841345992 +1000
+++ system-config-bind-4.0.0/DNSsec.py 2005-04-01 15:19:44.568475336 +1000
@@ -255,7 +255,7 @@ def KeyGenerationDialog( bind, zone, gen
info.progressBar.set_fraction(0.0)
info.progressBar.set_pulse_step(0.1)
info.dialog.vbox.pack_start( info.progressBar )
- info.dialog.set_response_sensitive(gtk.RESPONSE_OK, gtk.FALSE)
+ info.dialog.set_response_sensitive(gtk.RESPONSE_OK, False)
info.dialog.resize_children()
info.dialog.show_all()
info.pid = os.fork()
@@ -348,7 +348,7 @@ def SignZoneDialogDone( info, keyName, e
os.kill(info.zskPID,signal.SIGTERM)
except OSError:
pass
- info.dialog.set_response_sensitive(gtk.RESPONSE_OK, gtk.TRUE)
+ info.dialog.set_response_sensitive(gtk.RESPONSE_OK, True)
kd = None
try:
kd = getattr(info, keyName +'Dialog')
@@ -382,7 +382,7 @@ def SignZoneDialogDone( info, keyName, e
info.zone.save()
if len(info.zone.errors):
info.errorText.set_text(txt + '\n' +_('Save of Zone with new keys failed:\n') + string.join(zone.errors,"\n"))
- info.dialog.set_response_sensitive(gtk.RESPONSE_OK, gtk.TRUE)
+ info.dialog.set_response_sensitive(gtk.RESPONSE_OK, True)
info.dialog.resize_children()
info.dialog.show_all()
return
@@ -392,7 +392,7 @@ def SignZoneDialogDone( info, keyName, e
else:
info.errorText.set_text(txt + '\n' + _('Zone Signing Failed:\n') + str(status) + ': ' + out)
if (not hasattr(bind,'onExit')) or not bind.onExit:
- info.dialog.set_response_sensitive(gtk.RESPONSE_OK, gtk.TRUE)
+ info.dialog.set_response_sensitive(gtk.RESPONSE_OK, True)
info.dialog.resize_children()
info.dialog.show_all()
else:
@@ -422,7 +422,7 @@ def SignZoneDialog( bind, zone ):
info.progressBar.set_fraction(0.0)
info.progressBar.set_pulse_step(0.1)
info.dialog.vbox.pack_start( info.progressBar )
- info.dialog.set_response_sensitive(gtk.RESPONSE_OK, gtk.FALSE)
+ info.dialog.set_response_sensitive(gtk.RESPONSE_OK, False)
info.dialog.resize_children()
info.ksk = None
info.zsk = None
@@ -724,7 +724,7 @@ class TrustedKeys:
+ s.importEntryLabels[s.azMethodCombo.get_active()].get_text()[6:]
+ ' ' + _('and Zone Origin strings.')
)
- return gtk.FALSE
+ return False
ks=[]
if method == 0:
error=[]
@@ -734,7 +734,7 @@ class TrustedKeys:
_('This zone contained no keys.')+'\n'+string.join(error,'\n')+'\n'
+_('Did you enter the DNS server and origin correctly?')
)
- return gtk.FALSE
+ return False
elif method == 1:
ks = sshGetKeys(s.importEntry.get_text(), s.originEntry.get_text())
if ( (ks==None) or (len(ks)==0)):
@@ -743,7 +743,7 @@ class TrustedKeys:
+ _('has zone') + ' ' + s.originEntry.get_text() +
_('Key files') + '\n' + _('in its $ROOTDIR/var/named directory.')
)
- return gtk.FALSE
+ return False
elif method == 2:
ks = FindZoneKeys(s.bind,s.originEntry.get_text(),otherDir=s.importEntry.get_text())
if ( (ks==None) or (len(ks)==0)):
@@ -752,7 +752,7 @@ class TrustedKeys:
+ _('contains zone') + ' ' + s.originEntry.get_text() +
_('Key Files.')
)
- return gtk.FALSE
+ return False
for k in ks:
kt='ZSK'
if k.FLAGS.flags & k.FLAGS.Mnemonics['SEP']:
@@ -762,7 +762,7 @@ class TrustedKeys:
s.zoneList.append([str(k.name), kt, ('%0.5u' % KeyTag(k)), k])
s.azDialog.hide()
s.azDialog.destroy()
- return gtk.FALSE
+ return False
def addZone(s,b):
s.azDialog = gtk.Dialog(parent=s.dialog,
@@ -810,7 +810,7 @@ class TrustedKeys:
s.zoneHB = gtk.HBox()
s.zoneList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.zoneTree = gtk.TreeView( model=s.zoneList )
- s.zoneTree.set_headers_visible(gtk.FALSE)
+ s.zoneTree.set_headers_visible(False)
s.zoneCell = gtk.CellRendererText()
s.zoneColm = gtk.TreeViewColumn( None, s.zoneCell, text=0 )
s.kCell = gtk.CellRendererText()
@@ -827,11 +827,11 @@ class TrustedKeys:
s.zoneVB=gtk.VBox()
s.addButton = gtk.Button(stock=gtk.STOCK_ADD)
s.addButton.connect('clicked',s.addZone)
- s.zoneVB.pack_start(s.addButton,gtk.FALSE)
+ s.zoneVB.pack_start(s.addButton,False)
s.removeButton=gtk.Button(stock=gtk.STOCK_REMOVE)
s.removeButton.connect('clicked',s.removeZone)
- s.zoneVB.pack_start(s.removeButton,gtk.FALSE)
- s.zoneHB.pack_start(s.zoneVB,gtk.FALSE)
+ s.zoneVB.pack_start(s.removeButton,False)
+ s.zoneHB.pack_start(s.zoneVB,False)
s.zoneFrame.add(s.zoneHB)
s.dialog.vbox.pack_start(s.zoneFrame)
for k in s.keys:
--- system-config-bind-4.0.0/EditDialog.py~ 2005-04-01 15:19:48.365898040 +1000
+++ system-config-bind-4.0.0/EditDialog.py 2005-04-01 15:19:52.978196864 +1000
@@ -87,9 +87,9 @@ class EditDialog:
_('The') + ' ' + s.options.type + ' ' + key + ' ' + _('option') + ' ' +
_('cannot be removed from this') + ' ' + s.options.type + ':\n' + r[1],
fatal=False)
- return gtk.FALSE
+ return False
s.load()
- return gtk.FALSE
+ return False
def add_option(s,b):
key,name,option = s.selected(s.allOptionsTree)
@@ -100,10 +100,10 @@ class EditDialog:
_('The') + ' ' + s.options.type + ' ' + key + ' ' + _('option') + ' ' +
_('cannot be added to this') + ' ' + s.options.type + ':\n' + r[1],
fatal=False)
- return gtk.FALSE
+ return False
debug( 'ADD OPTION: LOAD WITH KEY', key)
s.load(key)
- return gtk.FALSE
+ return False
def end(s):
debug( 'END EditDialog: ',s)
@@ -129,7 +129,7 @@ class EditDialog:
if error != None:
s.bind.gui.modalError(s.editDialog,_("Option Value Error"),error[1])
s.optionWidget.grab_focus()
- return gtk.TRUE
+ return True
debug( 'EditDialog: UPDATE OPTIONS', s.options.key, 'RO:',s.read_only)
if not s.read_only:
s.options.update()
@@ -140,12 +140,12 @@ class EditDialog:
else:
debug( 'RESPONSE: END')
s.end()
- return gtk.TRUE
+ return True
def on_delete(s, w, e):
debug( 'ON DELETE: END')
s.end()
- return gtk.TRUE
+ return True
def __init__(s,bind,obj,read_only=False):
debug( 'EDITDIALOG: me:',s)
@@ -161,7 +161,7 @@ class EditDialog:
s.optionsTree = s.gui.xml.get_widget('CurrentOptionsList')
for col in s.optionsTree.get_columns():
s.optionsTree.remove_column(col)
- s.optionsTree.set_headers_visible(gtk.FALSE)
+ s.optionsTree.set_headers_visible(False)
s.optsList = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
s.olCell = gtk.CellRendererText(family='Monospace')
s.ol2Cell = gtk.CellRendererText()
@@ -175,7 +175,7 @@ class EditDialog:
s.allOptionsTree = s.gui.xml.get_widget('AllOptionsList')
for col in s.allOptionsTree.get_columns():
s.allOptionsTree.remove_column(col)
- s.allOptionsTree.set_headers_visible(gtk.FALSE)
+ s.allOptionsTree.set_headers_visible(False)
s.allOptsList = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
s.aolCell = gtk.CellRendererText(family='Monospace')
s.aol2Cell = gtk.CellRendererText()
@@ -215,7 +215,7 @@ class EditDialog:
s.optionInfo = s.bind.gui.xml.get_widget('OptionInfo')
s.optionInfoLabel=s.bind.gui.xml.get_widget('OptionInfoLabel')
s.optionInfoWindow = s.bind.gui.xml.get_widget('OptionInfoWindow')
- s.optionInfo.set_line_wrap(gtk.TRUE)
+ s.optionInfo.set_line_wrap(True)
s.optionContainer= s.bind.gui.xml.get_widget('OptionFrameHBox')
for c in s.optionContainer.get_children():
s.optionContainer.remove(c)
@@ -223,7 +223,7 @@ class EditDialog:
s.currentOptionWidget = None
s.currentOptionValue=None
s.currentOptionKey=None
- s.optionContainer.pack_start(s.optionWidget,gtk.FALSE)
+ s.optionContainer.pack_start(s.optionWidget,False)
s.removeOptionButton = s.bind.gui.xml.get_widget('RemoveOptionButton')
s.addOptionButton = s.bind.gui.xml.get_widget('AddOptionButton')
s.handlers.append([s.removeOptionButton,s.removeOptionButton.connect('clicked', s.remove_option)])
--- system-config-bind-4.0.0/GUI.py~ 2005-04-01 15:19:59.411218896 +1000
+++ system-config-bind-4.0.0/GUI.py 2005-04-01 15:20:03.190644336 +1000
@@ -46,7 +46,7 @@ class GUI:
if not(s.fatal_error) and s.bind.dirty() and (answer == None):
ask = s.question(s.gui, _('DNS Configuration Modified'), _('The DNS Configuration has been modified.\n Do you really want to exit and discard your changes?'))
ask.question(s.exit)
- return gtk.TRUE
+ return True
else:
if ( answer == None ) or (answer == gtk.RESPONSE_OK):
debug( 'GUI EXITING')
@@ -55,8 +55,8 @@ class GUI:
sys.exit()
elif( answer == gtk.RESPONSE_CANCEL ):
s.bind.zoneTree.SaveClicked(s.gui, onExit = True)
- return gtk.TRUE
- return gtk.FALSE
+ return True
+ return False
def on_exit(s, arg):
return s.exit()
@@ -122,19 +122,19 @@ class GUI:
def about_dialog_close(self, dialog, event=None):
dialog.hide()
debug( 'ABOUT CLOSE')
- return gtk.TRUE
+ return True
def about_dialog_response(self, dialog, response):
if response < 0:
dialog.hide()
dialog.emit_stop_by_name('response')
debug( 'ABOUT CLOSE RESPONSE: ',response)
- return gtk.TRUE
+ return True
def about_dialog_destroy(self, dialog, event=None):
dialog.hide()
debug( 'ABOUT DESTROY')
- return gtk.TRUE
+ return True
if __name__ == '__main__':
--- system-config-bind-4.0.0/Import.py~ 2005-04-01 15:20:06.835090296 +1000
+++ system-config-bind-4.0.0/Import.py 2005-04-01 15:20:11.505380304 +1000
@@ -47,11 +47,11 @@ class Import:
s.sid=gobject.timeout_add(1, s.importHost)
else:
s.bind.gui.modalError(s.bind.gui.gui,_('Filter Error'),_('No hosts are selected by the filter.'))
- return gtk.FALSE
+ return False
def answer( s, response, arg=None):
s.response(s.dialog, int( gtk.RESPONSE_OK ), response)
- return gtk.FALSE
+ return False
def response(s, d, r, answer=None):
debug( 'RESPONSE:',r)
@@ -61,7 +61,7 @@ class Import:
k = s.hosts.keys()
if( len(k) <= 0):
s.bind.gui.modalError(s.bind.gui.gui,_('Import File Error'),_('First choose a valid hosts file.'))
- return gtk.FALSE
+ return False
s.save_filters()
if (len(s.hosts.filters) <= 0):
if(answer == None):
@@ -70,13 +70,13 @@ class Import:
_('File Import'),
_('No filters are defined - ALL hosts in the file will be imported.\nDo you want to import ALL hosts in the file?'), modal=0)
ask.question(s.answer)
- return gtk.FALSE
+ return False
elif (answer == gtk.RESPONSE_CANCEL):
- return gtk.FALSE
+ return False
s.sid = gobject.timeout_add(100,s.doit)
- return gtk.FALSE
+ return False
s.dialog.destroy()
- return gtk.FALSE
+ return False
def file_changed(s, w, e):
debug( 'FILE CHANGED')
@@ -84,7 +84,7 @@ class Import:
if( file != s.file ):
s.fileChooser.set_filename(file)
s.file_chosen(w,gtk.RESPONSE_OK)
- return gtk.FALSE
+ return False
def file_dir(s):
file=s.fileEntry.get_text()
@@ -102,7 +102,7 @@ class Import:
s.bind.gui.modalError(s.bind.gui.gui,_('Import File Error'),_('You must choose a file that exists and that you have read permisssion for.'))
s.fileChooser.set_filename('/etc/hosts')
s.fileEntry.set_text('/etc/hosts')
- return gtk.FALSE
+ return False
filters=[]
if hasattr(s,'hosts'):
filters=s.hosts.filters
@@ -113,11 +113,11 @@ class Import:
s.bind.gui.modalError(s.bind.gui.gui,_('Import File Error'),_('File')+' '+file+' '+('is an invalid hosts file.'))
s.fileChooser.set_filename('/etc/hosts')
s.fileEntry.set_text('/etc/hosts')
- return gtk.FALSE
+ return False
s.file = file
s.fileEntry.set_text(file)
s.fileChooser.hide()
- return gtk.FALSE
+ return False
def hide_chooser(s,w,e):
s.fileChooser.hide()
@@ -170,7 +170,7 @@ class Import:
b.set_label("!")
else:
b.set_label(" ")
- return gtk.FALSE
+ return False
def edit_filter_element(s, attr, iter):
editContainer = gtk.VBox()
@@ -179,10 +179,10 @@ class Import:
debug( 'EDIT:',attr.__class__,iter)
s.notButton = gtk.ToggleButton()
if hasattr(attr,'notted') and attr.notted:
- s.notButton.set_active(gtk.TRUE)
+ s.notButton.set_active(True)
s.notButton.set_label("!")
else:
- s.notButton.set_active(gtk.FALSE)
+ s.notButton.set_active(False)
s.notButton.set_label(" ")
if issubclass(attr.__class__, Filter):
debug( 'EDIT FILTER',attr.__class__,iter)
@@ -224,19 +224,19 @@ class Import:
def filter_element_activated(s,tree,path,column):
s.filter_element_change(tree,path)
- return gtk.FALSE
+ return False
def new_filter_element_activated(s,tree,path,column):
s.filter_element_change(tree)
- return gtk.FALSE
+ return False
def filter_element_selected(s, tree, event):
s.filter_element_change(tree,1)
- return gtk.FALSE
+ return False
def new_filter_element_selected(s, tree, event):
s.filter_element_change(tree)
- return gtk.FALSE
+ return False
def __init__(s,zoneTree,view=None):
s.zoneTree = zoneTree
@@ -279,8 +279,8 @@ class Import:
s.newList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.filterTree = gtk.TreeView( model=s.filterList )
s.newTree = gtk.TreeView( model=s.newList )
- s.filterTree.set_headers_visible(gtk.FALSE)
- s.newTree.set_headers_visible(gtk.FALSE)
+ s.filterTree.set_headers_visible(False)
+ s.newTree.set_headers_visible(False)
s.filterSW = gtk.ScrolledWindow()
s.filterSW.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
s.newSW = gtk.ScrolledWindow()
@@ -321,7 +321,7 @@ class Import:
s.filterOpHB=gtk.HBox()
s.filterOpAND=gtk.RadioButton(label=_('Match ALL Filters'))
s.filterOpOR=gtk.RadioButton(group=s.filterOpAND,label=_('Match ANY Filter'))
- s.filterOpAND.set_active(gtk.TRUE)
+ s.filterOpAND.set_active(True)
s.filterOpHB.pack_start(s.filterOpAND)
s.filterOpHB.pack_start(s.filterOpOR)
s.filterVB.pack_start(s.filterOpHB)
--- system-config-bind-4.0.0/NewView.py~ 2005-04-01 15:20:19.699134664 +1000
+++ system-config-bind-4.0.0/NewView.py 2005-04-01 15:20:22.961638688 +1000
@@ -21,18 +21,18 @@ class NewView:
name = s.nameEntry.get_text()
if (len(name) == 0) :
s.bind.gui.modalError(s.dialog,_('View Name Error'),_('You must specify a name for this view.'),fatal=False)
- return gtk.FALSE
+ return False
if s.bind.views.has_key(name):
s.bind.gui.modalError(s.dialog,_('View Name Error'),_('View') + ' ' + name + ' '+_('already exists.'),fatal=False)
- return gtk.FALSE
+ return False
s.inACLWidget.save()
s.outACLWidget.save()
if( len(s.inACL.addrs) <= 0):
s.bind.gui.modalError(s.dialog,_('View From: ACL Error'),_('You must specify a From: access control list filter.'),fatal=False)
- return gtk.FALSE
+ return False
if( len(s.outACL.addrs) <= 0):
s.bind.gui.modalError(s.dialog,_('View To: ACL Error'),_('You must specify a To: access control list filter.'),fatal=False)
- return gtk.FALSE
+ return False
if (not s.bind.isViewed):
if( answer == None ):
if s.nmdc.objs.has_key('include'):
@@ -40,9 +40,9 @@ class NewView:
_("Warning: DNS Configuration Restructuring Required"),
_("Creating a new view will result in restructuring of your DNS configuration files.\nThe contents of files that are 'include'd in named.conf (except keys) will be moved to named.conf.\nDo you want to proceed with restructuring and create the new view?"))
ask.question(s.answer)
- return gtk.FALSE
+ return False
elif(answer == gtk.RESPONSE_CANCEL):
- return gtk.FALSE
+ return False
s.nmdc.firstView(name,s.inACL.out(),s.outACL.out())
s.bind.load()
else:
@@ -61,7 +61,7 @@ class NewView:
s.bind.copyZone(origin, v, name)
break
s.dialog.destroy()
- return gtk.FALSE
+ return False
def __init__(s,bind):
s.bind = bind
--- system-config-bind-4.0.0/NewZone.py~ 2005-04-01 15:20:26.817052576 +1000
+++ system-config-bind-4.0.0/NewZone.py 2005-04-01 15:20:31.692311424 +1000
@@ -43,10 +43,10 @@ class NewZone:
s.rcdSID=gobject.timeout_add(2000, s.rootCacheDownload,d,True)
d.resize_children()
d.show_all()
- return gtk.FALSE
+ return False
d.hide()
d.destroy()
- return gtk.FALSE
+ return False
def answer(s,ans,arg=None):
s.response(s.dialog,gtk.RESPONSE_OK,answer=ans)
@@ -57,10 +57,10 @@ class NewZone:
dns_name_dialog={}
if (s.zone.type != None) and (s.zone.clas != None) and (
(s.name != None) and hasattr(s,'originWidget') and
- ((not(hasattr(s.originWidget,'focus_out')))or(s.originWidget.focus_out(s.originWidget.entry,None,False,dns_name_dialog)==gtk.FALSE)) and
+ ((not(hasattr(s.originWidget,'focus_out')))or(s.originWidget.focus_out(s.originWidget.entry,None,False,dns_name_dialog)==False)) and
(len(s.originWidget.value())>0)):
if dns_name_dialog.has_key('yes'):
- return gtk.FALSE
+ return False
name = s.originWidget.value()
debug( 'ZONE EXISTS:',s.nmdcKey,name)
s.typeWidget.save()
@@ -70,17 +70,17 @@ class NewZone:
zoneExists = s.bind.zone(name, s.nmdcKey + ['zone'])
if ( zoneExists != None ) and (zoneExists['zone'].clas == s.zone.clas):
s.gui.modalError(s.dialog,_('Zone Origin Error'),_('A zone with origin')+' "'+name+'" '+' '+_('of class') + ' "' + s.zone.clas +'" ' + _('already exists. Specify another Zone Origin.'),fatal=False)
- return gtk.FALSE
+ return False
if( name == '.'):
if( s.options['type'].value() == 'master'):
if(answer==None):
ans = s.gui.question(s.dialog, _("DNS Name Question"), _("Do you really want to create a top level root domain ('.') master server?"))
ans.question(s.answer)
- return gtk.FALSE
+ return False
elif(answer == gtk.RESPONSE_CANCEL):
s.gui.modalError(s.dialog,_("Zone Type Error"),_("You must enter a Zone Origin that is not root ('.')."))
s.originWidget.entry.grab_focus()
- return gtk.FALSE
+ return False
elif( s.options['type'].value() == 'hint' ):
# New Root Cache ...
s.nmdcKey += [ '"." IN' ]
@@ -95,7 +95,7 @@ class NewZone:
d.resize_children()
d.show_all()
s.rcdSID=gobject.timeout_add(2000, s.rootCacheDownload,d,False)
- return gtk.FALSE
+ return False
s.zone.origin = str(s.name)
s.zone.zone_origin=s.zone.origin
s.originWidget.save()
@@ -147,7 +147,7 @@ class NewZone:
debug( 'NAME ORIGIN:',s.name.zone_origin)
s.dialog.show_all()
s.required_records=True
- return gtk.FALSE
+ return False
elif s.options['type'].value() != 'forward':
path_problem={}
debug( 'CHECK FILE:',s.warned)
@@ -155,9 +155,9 @@ class NewZone:
if path_problem.has_key('yes'):
if( s.fileWidget.warned and not s.warned ):
s.warned = True
- return gtk.FALSE
+ return False
elif not s.fileWidget.warned :
- return gtk.FALSE
+ return False
s.fileWidget.save()
if s.options['type'].value() not in [ 'slave', 'stub' ]:
s.soaEdit.save()
@@ -168,12 +168,12 @@ class NewZone:
s.forwardersWidget.save()
if len(s.options['forwarders'].addrs)<= 0:
s.gui.modalError(s.dialog,_('Forward Zone Error'),_('You must specify a non-empty list of forwarder name servers for a forward zone.') ,fatal=False)
- return gtk.FALSE
+ return False
elif (zoneType == 'slave') or (zoneType == 'stub'):
s.mastersWidget.save()
if len(s.options['masters'].addrs)<=0:
s.gui.modalError(s.dialog,_('Slave Zone Error'),_('You must specify a non-empty list of master name servers for a forward zone.') ,fatal=False)
- return gtk.FALSE
+ return False
fname=s.fname.value()
else:
fname=s.fname.value()
@@ -186,7 +186,7 @@ class NewZone:
s.ns = NS( s.zone,s.name, None, None, [ s.name.value(), 'NS', s.soa.MNAME.value() ], [], 2)
s.bind.create_zone( s.nmdcKey, s.zone.clas, s.zone.origin, s.zone.type, s.options['type'].value(), fname, s.soa, s.ns, s.options)
d.destroy()
- return gtk.FALSE
+ return False
elif(s.zone.type == None):
s.gui.modalError(s.dialog,_("Zone Type Error"),_("You must choose a Zone Origin Type and set the Zone Origin."))
s.typeCB.grab_focus()
@@ -196,9 +196,9 @@ class NewZone:
elif( (s.originWidget() == None) or (len(s.originWidget.value())<=0) ):
s.gui.modalError(s.dialog,_("Zone Type Error"),_("You must enter a valid Zone Origin."))
s.originWidget.entry.grab_focus()
- return gtk.FALSE
+ return False
d.destroy()
- return gtk.FALSE
+ return False
def choose_class(s,cb):
s.zone.clas = RR.classes[ s.classCB.get_active() ]
--- system-config-bind-4.0.0/RREdit.py~ 2005-04-01 15:20:37.414441528 +1000
+++ system-config-bind-4.0.0/RREdit.py 2005-04-01 15:20:40.368992368 +1000
@@ -46,11 +46,11 @@ class RREdit:
frame.show_all()
if( rr.Type() in [ 'A','AAAA','NSAP' ]):
s.create_reverse=gtk.CheckButton(label=_('Create Reverse Mapping Record'))
- s.create_reverse.set_active(gtk.TRUE)
+ s.create_reverse.set_active(True)
s.vbox.pack_start(s.create_reverse)
elif( rr.Type() == 'PTR' ):
s.create_forward=gtk.CheckButton(label=_('Create Forward Mapping Record'))
- s.create_forward.set_active(gtk.TRUE)
+ s.create_forward.set_active(True)
s.vbox.pack_start(s.create_forward)
# s.dialog.vbox.pack_start(s.scrolled_window)
if hasattr( s.dialog, 'vbox') :
@@ -107,12 +107,12 @@ class RREdit:
e = s.save()
if e != None:
s.bind.gui.modalError(s.bind.gui.gui,_('Record Save Error'), e)
- return gtk.FALSE
+ return False
else:
s.bind.gui.warning(s.bind.gui.gui,_('Cannot Save'),s.read_only_message)
elif(response_id == gtk.RESPONSE_REJECT):
debug( 'CANCEL')
dialog.destroy()
- return gtk.FALSE
+ return False
--- system-config-bind-4.0.0/RRGUI.py~ 2005-04-01 15:20:44.437373880 +1000
+++ system-config-bind-4.0.0/RRGUI.py 2005-04-01 15:20:48.722722408 +1000
@@ -117,13 +117,13 @@ class DNS_Name(Widget):
s.entry.grab_focus()
if( type(dialogIssued) == dict ):
dialogIssued['yes']=1
- return gtk.FALSE
+ return False
if hasattr(s.rr,'zone') and ( s.rr.zone.type < 0 ) and not isAnswer:
ans = s.gui.question(s.dialog.dialog, _("DNS Name Question"), _("Do you really want to use this domain name:") + '\n' + v + "\n" + _("or should I append a '.'?"))
ans.question(s.answer,vp)
if( type(dialogIssued) == dict ):
dialogIssued['yes']=1
- return gtk.FALSE
+ return False
entry.set_text(v)
if(s.key == 'name') and not s.rr.zone.In(v):
s.gui.modalError(s.dialog.dialog,_("DNS Name Error"), v + _(" is out-of-zone ") + s.rr.zone.zone_origin)
@@ -131,7 +131,7 @@ class DNS_Name(Widget):
entry.grab_focus()
if( type(dialogIssued) == dict ):
dialogIssued['yes']=1
- return gtk.FALSE
+ return False
errors = s.attr.check(v)
if (errors != None) and len(errors):
for code,error in errors:
@@ -144,7 +144,7 @@ class DNS_Name(Widget):
s.gui.modalError(s.dialog.dialog,_("DNS Name Warning"), _('Poor DNS Name: ') + v + "\n" + error,warning=True)
if( type(dialogIssued) == dict ):
dialogIssued['yes']=1
- return gtk.FALSE
+ return False
def value(s):
n = s.entry.get_text()
@@ -231,45 +231,45 @@ class DNS_TTL(Widget):
s.minutes.connect('value_changed',s.M_change)
s.seconds.connect('value_changed',s.S_change)
s.wsb = gtk.SpinButton(s.weeks)
- s.wsb.set_numeric(gtk.TRUE)
+ s.wsb.set_numeric(True)
s.wsb.set_max_length(4)
s.wsb.set_value(float(t['W']))
s.dsb = gtk.SpinButton(s.days)
- s.dsb.set_numeric(gtk.TRUE)
+ s.dsb.set_numeric(True)
s.dsb.set_max_length(1)
s.dsb.set_value(float(t['D']))
s.hsb = gtk.SpinButton(s.hours)
- s.hsb.set_numeric(gtk.TRUE)
+ s.hsb.set_numeric(True)
s.hsb.set_max_length(2)
s.hsb.set_value(float(t['H']))
s.msb = gtk.SpinButton(s.minutes)
- s.msb.set_numeric(gtk.TRUE)
+ s.msb.set_numeric(True)
s.msb.set_max_length(2)
s.msb.set_value(float(t['M']))
s.ssb = gtk.SpinButton(s.seconds)
- s.ssb.set_numeric(gtk.TRUE)
+ s.ssb.set_numeric(True)
s.ssb.set_max_length(2)
s.ssb.set_value(float(t['S']))
vb = gtk.VBox()
- vb.pack_start(gtk.Label(_('weeks')),gtk.FALSE)
- vb.pack_start(s.wsb,gtk.FALSE)
- hb.pack_start(vb,gtk.FALSE)
+ vb.pack_start(gtk.Label(_('weeks')),False)
+ vb.pack_start(s.wsb,False)
+ hb.pack_start(vb,False)
vb = gtk.VBox()
- vb.pack_start(gtk.Label(_('days')),gtk.FALSE)
- vb.pack_start(s.dsb,gtk.FALSE)
- hb.pack_start(vb,gtk.FALSE)
+ vb.pack_start(gtk.Label(_('days')),False)
+ vb.pack_start(s.dsb,False)
+ hb.pack_start(vb,False)
vb = gtk.VBox()
- vb.pack_start(gtk.Label(_('hours')),gtk.FALSE)
- vb.pack_start(s.hsb,gtk.FALSE)
- hb.pack_start(vb,gtk.FALSE)
+ vb.pack_start(gtk.Label(_('hours')),False)
+ vb.pack_start(s.hsb,False)
+ hb.pack_start(vb,False)
vb = gtk.VBox()
- vb.pack_start(gtk.Label(_('minutes')),gtk.FALSE)
- vb.pack_start(s.msb,gtk.FALSE)
- hb.pack_start(vb,gtk.FALSE)
+ vb.pack_start(gtk.Label(_('minutes')),False)
+ vb.pack_start(s.msb,False)
+ hb.pack_start(vb,False)
vb = gtk.VBox()
- vb.pack_start(gtk.Label(_('seconds')),gtk.FALSE)
- vb.pack_start(s.ssb,gtk.FALSE)
- hb.pack_start(vb,gtk.FALSE)
+ vb.pack_start(gtk.Label(_('seconds')),False)
+ vb.pack_start(s.ssb,False)
+ hb.pack_start(vb,False)
hb.show_all()
return hb
@@ -322,9 +322,9 @@ class IPV4_Address(Widget):
bits=0
for o in s.octsb:
if bits >= pfx:
- o.set_sensitive(gtk.FALSE)
+ o.set_sensitive(False)
else:
- o.set_sensitive(gtk.TRUE)
+ o.set_sensitive(True)
bits += 8
def more_octs(s,b):
@@ -332,7 +332,7 @@ class IPV4_Address(Widget):
s.octs.append('0')
adj = gtk.Adjustment(lower=0, upper= 255, step_incr=1, page_incr=1, page_size=1)
sb=gtk.SpinButton(adj)
- sb.set_numeric(gtk.TRUE)
+ sb.set_numeric(True)
sb.set_value(float(0))
s.octsb.append(sb)
s.octadj.append(adj)
@@ -345,7 +345,7 @@ class IPV4_Address(Widget):
s.hb.pack_start(gtk.Label('.'))
s.moreOctsButton=gtk.Button(stock=gtk.STOCK_ADD,label='')
s.moreOctsButton.connect('clicked',s.more_octs)
- s.hb.pack_start(s.moreOctsButton,gtk.FALSE)
+ s.hb.pack_start(s.moreOctsButton,False)
s.hb.show_all()
def select_origin(s,w):
@@ -384,16 +384,16 @@ class IPV4_Address(Widget):
adj = gtk.Adjustment(lower=0, upper= 255, step_incr=1, page_incr=1, page_size=1)
sb=gtk.SpinButton(adjustment=adj)
sb.set_max_length(3)
- sb.set_numeric(gtk.TRUE)
+ sb.set_numeric(True)
sb.set_value(float(oct))
s.octsb.append(sb)
s.octadj.append(adj)
bits += 4
if ( bits > prefix ):
- sb.set_sensitive(gtk.FALSE)
- s.hb.pack_start(sb,gtk.FALSE)
+ sb.set_sensitive(False)
+ s.hb.pack_start(sb,False)
if bits < total_bits:
- s.hb.pack_start(gtk.Label('.'),gtk.FALSE)
+ s.hb.pack_start(gtk.Label('.'),False)
if( len(s.octs) < 4) and (not hasattr(s,'origin_only')):
debug( 'IPV4 MORE OCTS')
s.hb.pack_start(gtk.Label('.'))
@@ -405,7 +405,7 @@ class IPV4_Address(Widget):
s.pfx=gtk.Adjustment(lower=0, upper= 32, step_incr=1, page_incr=1, page_size=1)
s.pfx.connect('value_changed',s.prefix_change)
s.pfxsb=gtk.SpinButton(s.pfx)
- s.pfxsb.set_numeric(gtk.TRUE)
+ s.pfxsb.set_numeric(True)
s.pfxsb.set_value(prefix)
s.hb.pack_start(s.pfxsb)
if is_A_rr :
@@ -468,7 +468,7 @@ class IPV4_ReverseAddress(IPV4_Address):
s.is_origin = True
w = IPV4_Address.widget(s)
for i in range(0,len(oocts)):
- s.octsb[i].set_sensitive(gtk.FALSE)
+ s.octsb[i].set_sensitive(False)
return w
def save(s):
@@ -519,8 +519,8 @@ class IPV6_Address(Widget):
for e in s.entries:
bits+=16
if( bits > prefix ):
- e.set_editable(gtk.FALSE)
- e.set_sensitive(gtk.FALSE)
+ e.set_editable(False)
+ e.set_sensitive(False)
def more_hex(s,b):
s.hb.remove(s.moreHexButton)
@@ -537,12 +537,12 @@ class IPV6_Address(Widget):
v='0'+v
s.entries[-1].set_text(v)
s.entries.append(entry)
- s.hb.pack_start(entry,gtk.FALSE)
- s.hb.pack_start(gtk.Label(':'),gtk.FALSE)
+ s.hb.pack_start(entry,False)
+ s.hb.pack_start(gtk.Label(':'),False)
if( nibs <= 28 ):
s.moreHexButton=gtk.Button(stock=gtk.STOCK_ADD)
s.moreHexButton.connect('clicked',s.more_hex)
- s.hb.pack_start(s.moreHexButton,gtk.FALSE)
+ s.hb.pack_start(s.moreHexButton,False)
s.hb.show_all()
def select_origin(s,w):
@@ -611,9 +611,9 @@ class IPV6_Address(Widget):
s.dnPfx.set_max_length(subHex)
s.dnPfx.set_width_chars(subHex)
s.dnPfx.set_text(hex[:subHex])
- s.dnPfx.set_editable(gtk.FALSE)
- s.dnPfx.set_sensitive(gtk.FALSE)
- s.hb.pack_start(s.dnPfx,gtk.FALSE)
+ s.dnPfx.set_editable(False)
+ s.dnPfx.set_sensitive(False)
+ s.hb.pack_start(s.dnPfx,False)
s.entries.append(s.dnPfx)
if hasattr(s,'origin_only'):
break
@@ -638,16 +638,16 @@ class IPV6_Address(Widget):
subHex -= 4
nibs+=digits
if( nibs <= sens ) and not(hasattr(s,'is_origin')):
- entry.set_editable(gtk.FALSE)
- entry.set_sensitive(gtk.FALSE)
- s.hb.pack_start(entry,gtk.FALSE)
+ entry.set_editable(False)
+ entry.set_sensitive(False)
+ s.hb.pack_start(entry,False)
if( nibs < 32 ):
- s.hb.pack_start(gtk.Label(":"),gtk.FALSE)
+ s.hb.pack_start(gtk.Label(":"),False)
s.entries.append(entry)
if( (nibs < 32) and not(hasattr(s,'origin_only'))):
s.moreHexButton=gtk.Button(stock=gtk.STOCK_ADD)
s.moreHexButton.connect('clicked',s.more_hex)
- s.hb.pack_start(s.moreHexButton,gtk.FALSE)
+ s.hb.pack_start(s.moreHexButton,False)
if addr.prefix != None:
s.hb.pack_start(gtk.Label('/'))
s.pfx=gtk.Adjustment(lower=0, upper= 128, step_incr=1, page_incr=1, page_size=1)
@@ -722,7 +722,7 @@ class IPV6_A6(IPV6_Address):
for bits in range(int(pfx/16)*16,128,16):
if i < len(s.entries):
w=s.entries[i]
- w.set_sensitive(gtk.TRUE)
+ w.set_sensitive(True)
else:
entry = gtk.Entry(max=4)
entry.set_text('0000')
@@ -730,9 +730,9 @@ class IPV6_A6(IPV6_Address):
entry.set_width_chars(4)
entry.connect('focus_out_event',s.check_hex)
if len(s.entries) > 0:
- s.hb.pack_start(gtk.Label(':'),gtk.FALSE)
+ s.hb.pack_start(gtk.Label(':'),False)
s.entries.append(entry)
- s.hb.pack_start(entry,gtk.FALSE)
+ s.hb.pack_start(entry,False)
if i > 0:
for j in range (i,0,-1):
s.entries[j].set_text( s.entries[ j - 1 ].get_text() )
@@ -749,9 +749,9 @@ class IPV6_A6(IPV6_Address):
if len(cs)> 0:
s.hb.remove(cs.pop(0))
if pfx == 0:
- s.nameWidget.entry.set_sensitive(gtk.FALSE)
+ s.nameWidget.entry.set_sensitive(False)
else:
- s.nameWidget.entry.set_sensitive(gtk.TRUE)
+ s.nameWidget.entry.set_sensitive(True)
s.hb.show_all()
def value(s):
@@ -911,7 +911,7 @@ class DNS_Address(Widget):
if changed:
s.hb.remove(s.addressWidget)
s.addressWidget=s.addressW.widget()
- s.hb.pack_start(s.addressWidget,gtk.FALSE)
+ s.hb.pack_start(s.addressWidget,False)
s.hb.show_all()
def widget(s):
@@ -921,7 +921,7 @@ class DNS_Address(Widget):
s.combo.append_text(_('IPV6 Address'))
s.combo.set_active(0)
s.combo.connect('changed',s.type_changed)
- s.hb.pack_start(s.combo,gtk.FALSE)
+ s.hb.pack_start(s.combo,False)
if( hasattr(s.attr,'address') ):
if s.attr.address.__class__ == DNS.IPV4.Address:
s.addressW = IPV4_Address(s.dialog, s.rr, s.attr.address, 'address')
@@ -936,7 +936,7 @@ class DNS_Address(Widget):
s.attr.address=DNS.IPV4.Address('0.0.0.0')
s.addressW=IPV4_Address(s.dialog,s.rr,s.attr.address,'address')
s.addressWidget = s.addressW.widget()
- s.hb.pack_start(s.addressWidget,gtk.FALSE)
+ s.hb.pack_start(s.addressWidget,False)
return s.hb
def __str__(s):
@@ -972,13 +972,13 @@ class NSAP_Address(Widget):
problem['problem']=_('Illegal characters in NSAP address:') + '\n' + badChars + '\n' + _('removed.')
s.entry.set_text(aok)
s.entry.grab_focus()
- return gtk.FALSE
+ return False
s.gui.modalError(s.dialog.dialog,_('NSAP Address Error'),
_('Illegal characters in NSAP address:') + '\n' + badChars + '\n' + _('removed.')
)
s.entry.set_text(aok)
s.entry.grab_focus()
- return gtk.FALSE
+ return False
def widget(s):
s.hb = gtk.HBox()
@@ -987,10 +987,10 @@ class NSAP_Address(Widget):
if (len(a)>=2) and (a[:2] == '0x'):
a=a[2:]
s.entry.set_width_chars(max(len(a),20))
- s.hb.pack_start(gtk.Label('0x'),gtk.FALSE)
+ s.hb.pack_start(gtk.Label('0x'),False)
s.entry.set_text(a)
s.entry.connect('focus_out_event',s.check_hex)
- s.hb.pack_start(s.entry,gtk.FALSE)
+ s.hb.pack_start(s.entry,False)
return s.hb
def value(s):
@@ -1008,7 +1008,7 @@ class NSAP_ReverseAddress(NSAP_Address):
debug( 'NSAP_ReverseAddress Check' )
NSAP_Address.check_hex(s,w,e,problem)
if (problem != None) and (type(problem)==dict) and problem.has_key('problem'):
- return gtk.FALSE
+ return False
v = s.value()
debug( 'VALUE:',v)
rv = s.attr.strip(v)
@@ -1025,7 +1025,7 @@ class NSAP_ReverseAddress(NSAP_Address):
)
s.entry.set_text(s.attr.label()[2:])
s.entry.grab_focus()
- return gtk.FALSE
+ return False
def save(s):
v = s.value()
@@ -1061,7 +1061,7 @@ class NSAP_ReverseAddress(NSAP_Address):
if ( isinstance(s.rr, RR.SOA) or isinstance(s.rr,RR.NS) ) and (
s.key == 'name'
):
- s.entry.set_sensitive(gtk.FALSE)
+ s.entry.set_sensitive(False)
return e
class DNS_Email(DNS_Name):
@@ -1153,13 +1153,13 @@ class DNS_ACL(Widget):
def select(s, t, p1=0,p2=0):
s.acl = s.selected(s.aclTree)
debug( 'ACL SELECTED:',s.acl )
- return gtk.FALSE
+ return False
def widget(s):
s.acl=None
s.aclList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.aclTree = gtk.TreeView( model=s.aclList )
- s.aclTree.set_headers_visible(gtk.FALSE)
+ s.aclTree.set_headers_visible(False)
s.aclTree.connect('row_activated',s.select)
s.aclTree.connect('button_release_event',s.select)
s.aclCell = gtk.CellRendererText()
@@ -1201,13 +1201,13 @@ class DNS_ACL(Widget):
def select(s, t, p1=0,p2=0):
s.key = s.selected(s.keyTree)
debug( 'KEY SELECTED:',s.key )
- return gtk.FALSE
+ return False
def widget(s):
s.key=None
s.keyList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.keyTree = gtk.TreeView( model=s.keyList )
- s.keyTree.set_headers_visible(gtk.FALSE)
+ s.keyTree.set_headers_visible(False)
s.keyTree.connect('row_activated',s.select)
s.keyTree.connect('button_release_event',s.select)
s.keyCell = gtk.CellRendererText()
@@ -1259,12 +1259,12 @@ class DNS_ACL(Widget):
def acl_name(s,w,e):
if not s.name_check():
w.grab_focus()
- return gtk.FALSE
+ return False
def ok(s,b):
if not s.name_check():
s.entry.grab_focus()
- return gtk.FALSE
+ return False
acl = 'acl ' + s.name + s.aclGUI.attr.out() + "\n"
s.aclGUI.attr.name = s.name
s.aclGUI.dialog.bind.nmdc[['acl',s.name]]=acl
@@ -1280,7 +1280,7 @@ class DNS_ACL(Widget):
s.aclGUI.aclVB.remove(s.aclGUI.saveACLbutton)
if hasattr(s.aclGUI,'aclEditDialog'):
s.aclGUI.aclEditDialog.set_title("ACL " + s.name)
- return gtk.FALSE
+ return False
def __init__(self,s):
self.aclGUI = s
@@ -1298,7 +1298,7 @@ class DNS_ACL(Widget):
s.editContainer.pack_start(s.aclFrame)
self.okButton = gtk.Button(stock=gtk.STOCK_OK)
self.okButton.connect('clicked',self.ok)
- s.editContainer.pack_start(self.okButton,gtk.FALSE)
+ s.editContainer.pack_start(self.okButton,False)
s.editHB.pack_start(s.editContainer)
s.editHB.show_all()
@@ -1333,12 +1333,12 @@ class DNS_ACL(Widget):
no = '!'
s.aclList.set_value(ele,0,no+str(value))
s.aclList.set_value(ele,1,value)
- return gtk.FALSE
+ return False
def acl_element_remove(s, b, ele):
s.aclList.remove(ele)
s.acl_element_change(s.aclTree)
- return gtk.FALSE
+ return False
def n_acls(s):
return s.aclList.iter_n_children(None)-1
@@ -1352,12 +1352,12 @@ class DNS_ACL(Widget):
elif isinstance(s.editWidget,DNS_ACL.Selection):
debug( 'ACL ADD SELECTION')
if( s.editWidget.acl == None ):
- return gtk.FALSE
+ return False
attr = s.editWidget.acl
elif isinstance(s.editWidget,DNS_ACL.KeySelection):
debug( 'ACL ADD KEY SELECTION')
if( s.editWidget.key == None ):
- return gtk.FALSE
+ return False
attr = s.editWidget.key
elif( hasattr(s,'aclWidget') ):
debug( 'ACL ADD aclWidget' )
@@ -1366,7 +1366,7 @@ class DNS_ACL(Widget):
debug( 'ACL ADD a')
attr = a
else:
- return gtk.FALSE
+ return False
no=''
if hasattr(attr,'notted') and attr.notted:
no='!'
@@ -1375,7 +1375,7 @@ class DNS_ACL(Widget):
n_acls=s.n_acls()
s.aclTree.set_cursor((n_acls,))
s.acl_element_activated(s.aclTree,(n_acls,),1)
- return gtk.FALSE
+ return False
def acl_toggle_not(s, b, a):
a.notted = not ( hasattr(a,'notted') and (a.notted == True) )
@@ -1390,18 +1390,18 @@ class DNS_ACL(Widget):
s.eHB = gtk.HBox()
s.notButton = gtk.ToggleButton()
if hasattr(a,'notted') and a.notted:
- s.notButton.set_active(gtk.TRUE)
+ s.notButton.set_active(True)
s.notButton.set_label("!")
else:
- s.notButton.set_active(gtk.FALSE)
+ s.notButton.set_active(False)
s.notButton.set_label(" ")
s.notButton.connect("toggled",s.acl_toggle_not,a)
- s.eHB.pack_start(s.notButton,gtk.FALSE,gtk.FALSE)
+ s.eHB.pack_start(s.notButton,False,False)
if a.__class__ == DNS.ACL :
s.editWidget = gtk.Button("Edit")
debug( 'EDIT ACL',iter)
s.editWidget.connect('clicked', s.editACL, a, iter)
- s.eHB.pack_start(s.editWidget,gtk.FALSE,gtk.FALSE)
+ s.eHB.pack_start(s.editWidget,False,False)
elif a.__class__ == DNS_ACL.Selection:
s.editWidget = a
w=s.editWidget.widget()
@@ -1416,9 +1416,9 @@ class DNS_ACL(Widget):
s.eHB.pack_start(w)
else:
s.editWidget = s.dialog.gui.widget( a )(s.dialog, s.rr, a, s.key)
- s.eHB.pack_start( s.editWidget.widget(),gtk.FALSE )
+ s.eHB.pack_start( s.editWidget.widget(),False )
debug( 'ACL WIDGET:',s.editWidget)
- s.editContainer.pack_start( s.eHB,gtk.FALSE )
+ s.editContainer.pack_start( s.eHB,False )
s.adhb = gtk.HBox()
if not(( a.__class__ in [ DNS_ACL.Selection, DNS_ACL.KeySelection ] ) and hasattr(a,'no_selection')):
if iter != None:
@@ -1426,12 +1426,12 @@ class DNS_ACL(Widget):
s.okButton.connect('clicked',s.acl_element_ok,iter)
s.deleteButton = gtk.Button(stock=gtk.STOCK_REMOVE)
s.deleteButton.connect('clicked',s.acl_element_remove,iter)
- s.adhb.pack_start(s.deleteButton,gtk.FALSE)
+ s.adhb.pack_start(s.deleteButton,False)
else:
s.okButton = gtk.Button(stock=gtk.STOCK_ADD)
s.okButton.connect('clicked',s.acl_element_add,a)
- s.adhb.pack_start(s.okButton,gtk.TRUE,gtk.FALSE)
- s.editContainer.pack_start(s.adhb,gtk.FALSE)
+ s.adhb.pack_start(s.okButton,True,False)
+ s.editContainer.pack_start(s.adhb,False)
return s.editContainer
def acl_element_change(s,tree,new=None):
@@ -1455,19 +1455,19 @@ class DNS_ACL(Widget):
def acl_element_activated(s, tree, path, column):
s.acl_element_change(tree,path)
- return gtk.FALSE
+ return False
def new_acl_element_activated(s, tree, path, column):
s.acl_element_change(tree)
- return gtk.FALSE
+ return False
def acl_element_selected(s, tree, event):
s.acl_element_change(tree,event)
- return gtk.FALSE
+ return False
def new_acl_element_selected(s, tree, event):
s.acl_element_change(tree)
- return gtk.FALSE
+ return False
def load(s):
s.aclList.clear()
@@ -1520,7 +1520,7 @@ class DNS_ACL(Widget):
ele=str(model.get_value(iter, 1)) + '; '
debug( 'ACL VALUE ELEMENT:',ele)
s.acl_elements_string += ele
- return gtk.FALSE
+ return False
def value(s):
s.acl_elements_string = ''
@@ -1532,7 +1532,7 @@ class DNS_ACL(Widget):
ele = model.get_value(iter, 1)
s.attr.addrs.append( ele )
debug( 'ACL ELEMENT SAVED:', str(ele))
- return gtk.FALSE
+ return False
def save(s):
debug( 'ACL SAVE ',s.rr.__class__, s.attr.name, s.attr.key)
@@ -1574,7 +1574,7 @@ class DNS_ACL(Widget):
else:
s.aclList.set_value(s.aclIter,0,str(s.aclList.get_value(s.aclIter,1)))
s.editDialog.destroy()
- return gtk.FALSE
+ return False
def aclDialog(s, acl,iter=None):
s.aclIter=iter
@@ -1606,8 +1606,8 @@ class DNS_ACL(Widget):
s.newList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.aclTree = gtk.TreeView( model=s.aclList )
s.newTree = gtk.TreeView( model=s.newList )
- s.aclTree.set_headers_visible(gtk.FALSE)
- s.newTree.set_headers_visible(gtk.FALSE)
+ s.aclTree.set_headers_visible(False)
+ s.newTree.set_headers_visible(False)
s.aclSW = gtk.ScrolledWindow()
s.aclSW.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
s.newSW = gtk.ScrolledWindow()
@@ -1629,7 +1629,7 @@ class DNS_ACL(Widget):
if s.attr.name == None:
s.saveACLbutton = gtk.Button("Save As ACL")
s.saveACLbutton.connect("clicked",s.save_as_acl)
- s.aclVB.pack_start(s.saveACLbutton,gtk.FALSE)
+ s.aclVB.pack_start(s.saveACLbutton,False)
s.aclFrame.add(s.aclVB)
s.editFrame = gtk.Frame(label=_('Edit List Element'))
s.editHB = gtk.HBox()
@@ -1696,8 +1696,8 @@ class DNS_SortList(Widget):
s.addSourceButton = gtk.Button(stock=gtk.STOCK_ADD)
s.addSourceButton.connect('clicked',s.addSource)
vb=gtk.VBox()
- vb.pack_start(s.addSourceButton,gtk.FALSE)
- s.sourceHB.pack_start(vb,gtk.FALSE)
+ vb.pack_start(s.addSourceButton,False)
+ s.sourceHB.pack_start(vb,False)
debug('preferACL:',s.preferACL.attr.__class__)
s.preferHB.pack_start( s.preferACL.widget() )
s.sourceHB.show_all()
@@ -1710,7 +1710,7 @@ class DNS_SortList(Widget):
s.attr.addrs.append(newOrder)
s.orderTree.set_cursor(s.orderList.get_path(iter))
s.editOrder(iter,newOrder)
- return gtk.FALSE
+ return False
def removeOrder(s, b):
if (s.currentIter != None):
@@ -1731,19 +1731,19 @@ class DNS_SortList(Widget):
s.currentIter = None
s.sourceHB.show_all()
s.preferHB.show_all()
- return gtk.FALSE
+ return False
def order_element_activated(s, tree, path, column):
(iter,acl) = s.selected(s.orderTree)
if acl != None:
s.editOrder(iter,acl)
- return gtk.FALSE
+ return False
def order_element_selected(s, tree, event):
(iter,acl) = s.selected(s.orderTree)
if acl != None:
s.editOrder(iter,acl)
- return gtk.FALSE
+ return False
def load(s):
i=0
@@ -1773,7 +1773,7 @@ class DNS_SortList(Widget):
s.hb = gtk.HBox()
s.orderList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.orderTree = gtk.TreeView( model=s.orderList )
- s.orderTree.set_headers_visible(gtk.FALSE)
+ s.orderTree.set_headers_visible(False)
s.orderTree.connect('row_activated',s.order_element_activated)
s.orderTree.connect('button_release_event',s.order_element_selected)
s.orderCell = gtk.CellRendererText()
@@ -1798,14 +1798,14 @@ class DNS_SortList(Widget):
s.addButton = gtk.Button(stock=gtk.STOCK_ADD)
s.addButton.connect('clicked',s.addOrder)
vb = gtk.VBox()
- vb.pack_start(s.addButton,gtk.FALSE)
- s.butHB.pack_start(vb,gtk.FALSE)
+ vb.pack_start(s.addButton,False)
+ s.butHB.pack_start(vb,False)
s.removeButton = gtk.Button(stock=gtk.STOCK_REMOVE)
s.removeButton.connect('clicked',s.removeOrder)
vb = gtk.VBox()
- vb.pack_start(s.removeButton,gtk.FALSE)
- s.butHB.pack_start(vb,gtk.FALSE)
- s.orderVB.pack_start(s.butHB,gtk.FALSE)
+ vb.pack_start(s.removeButton,False)
+ s.butHB.pack_start(vb,False)
+ s.orderVB.pack_start(s.butHB,False)
s.hb.pack_start(s.orderVB)
s.currentACL=None
s.aclValues={ 'values':[_('IPv4 Address'), _('IPv6 Address'),
@@ -1836,7 +1836,7 @@ class DNS_Path(Widget):
def entry_focus_out(s, entry, event, problem=None):
debug( 'NEW FILE:', s.fileEntry.get_text())
s.fc_response(s,gtk.RESPONSE_ACCEPT,problem)
- return gtk.FALSE
+ return False
def check_file(s,problem):
s.entry_focus_out(s.fileEntry,1,problem)
@@ -1848,7 +1848,7 @@ class DNS_Path(Widget):
d = s.dialog.bind.nmdc.directory()
if (file == s.filename) or (response != gtk.RESPONSE_ACCEPT):
fc.destroy()
- return gtk.FALSE
+ return False
else:
if (os.access(file, os.F_OK)==1):
st=os.stat(file)
@@ -1857,13 +1857,13 @@ class DNS_Path(Widget):
if( problem != None):
problem['yes']=True
s.warned = False
- return gtk.FALSE
+ return False
if not s.warned:
s.dialog.bind.gui.modalError(s.dialog.editDialog,None ,_('WARNING: File Exists and will be overwritten on save.'),fatal=False,warning=True)
s.warned = True
if( problem != None):
problem['yes']=True
- return gtk.FALSE
+ return False
else:
if (len(file) > len(d)) and (file[:len(d)] == d):
file=file[-((len(file) - len(d))-1):]
@@ -1875,7 +1875,7 @@ class DNS_Path(Widget):
if( problem != None):
problem['yes']=True
s.warned = False
- return gtk.FALSE
+ return False
else:
ed=file.rfind('/')
if ed > -1:
@@ -1887,7 +1887,7 @@ class DNS_Path(Widget):
if( problem != None):
problem['yes']=True
s.warned = False
- return gtk.FALSE
+ return False
if( fc != s ):
fc.destroy()
s.data=file
@@ -1897,7 +1897,7 @@ class DNS_Path(Widget):
s.data=file
s.fileEntry.set_text(file)
s.warned = False
- return gtk.FALSE
+ return False
def browse_clicked(s,b):
#title=None, parent=None, action=gtk.FILE_CHOOSER_ACTION_OPEN, buttons=None, backend=None
@@ -1944,13 +1944,13 @@ class DNS_Path(Widget):
vb=gtk.VBox()
xhb=gtk.HBox()
xhb.pack_start(s.fileEntry)
- vb.pack_start(xhb,gtk.FALSE)
- s.hb.pack_start(vb,gtk.FALSE)
+ vb.pack_start(xhb,False)
+ s.hb.pack_start(vb,False)
vb=gtk.VBox()
xhb=gtk.HBox()
- xhb.pack_start(s.button,gtk.FALSE)
- vb.pack_start(xhb,gtk.FALSE)
- s.hb.pack_start(vb,gtk.FALSE)
+ xhb.pack_start(s.button,False)
+ vb.pack_start(xhb,False)
+ s.hb.pack_start(vb,False)
s.hb.show_all()
return s.hb
@@ -1962,11 +1962,11 @@ class DNS_Boolean(Widget):
def toggle(s,b):
if( s.attr.data == 1 ):
s.attr.data = 0
- s.tb.set_active(gtk.FALSE)
+ s.tb.set_active(False)
s.tb.set_label(s.name + ' : ' + s.false)
else:
s.attr.data = 1
- s.tb.set_active(gtk.TRUE)
+ s.tb.set_active(True)
s.tb.set_label(s.name + ' : ' + s.true)
def value(s):
@@ -2001,14 +2001,14 @@ class DNS_Boolean(Widget):
state=s.false
if s.attr.data == 1:
state = s.true
- s.tb.set_active(gtk.TRUE)
+ s.tb.set_active(True)
else:
- s.tb.set_active(gtk.FALSE)
- s.tb.set_mode(gtk.TRUE)
+ s.tb.set_active(False)
+ s.tb.set_mode(True)
s.tb.set_label(s.name + ' : ' + state)
s.tb.connect('toggled',s.toggle)
s.hb = gtk.HBox()
- s.hb.pack_start(s.tb,gtk.FALSE)
+ s.hb.pack_start(s.tb,False)
s.hb.show_all()
return s.hb
@@ -2041,7 +2041,7 @@ class DNS_Radio(Widget):
i += 1
s.choice.connect('changed',s.changed)
s.hb=gtk.HBox()
- s.hb.pack_start(s.choice,gtk.FALSE)
+ s.hb.pack_start(s.choice,False)
s.hb.show_all()
return s.hb
@@ -2055,7 +2055,7 @@ class DNS_Size(Widget):
if len(v) <= 0:
s.dialog.bind.gui.modalError(s.parent,_('Size Value Error'),_('An non-empty size string must be entered.'))
s.entry.set_text(s.size)
- return gtk.FALSE
+ return False
if v not in ['default','unlimited']:
intValue=None
try:
@@ -2067,14 +2067,14 @@ class DNS_Size(Widget):
_('Invalid integer value.')
)
s.entry.set_text(str(s.size))
- return gtk.FALSE
+ return False
s.size = intValue
s.scale = scale
else:
s.size = v
s.scale=''
s.scalew.set_active(0)
- return gtk.FALSE
+ return False
def value(s):
return str(s.size) + s.scale
@@ -2109,7 +2109,7 @@ class DNS_Size(Widget):
else:
s.entry.set_text(str(s.size))
s.entry.connect('focus_out_event',s.value_changed)
- s.hb.pack_start(s.combo,gtk.FALSE)
+ s.hb.pack_start(s.combo,False)
s.scales=['','K','M','G']
s.scalew = gtk.combo_box_new_text()
s.scalew.append_text('')
@@ -2124,7 +2124,7 @@ class DNS_Size(Widget):
if s.scale == s.scales[k]:
s.scalew.set_active(k)
s.scalew.connect('changed',s.value_changed)
- s.hb.pack_start(s.scalew,gtk.FALSE,gtk.FALSE)
+ s.hb.pack_start(s.scalew,False,False)
s.hb.show_all()
return s.hb
@@ -2160,7 +2160,7 @@ class DNS_Key(Widget):
s.vb.pack_start(s.sFrame)
s.newButton=gtk.Button(stock=gtk.STOCK_NEW,label=_('New Secret'))
s.newButton.connect('clicked',s.newSecret)
- s.vb.pack_start(s.newButton,gtk.FALSE)
+ s.vb.pack_start(s.newButton,False)
return s.vb
def value(s):
@@ -2181,19 +2181,19 @@ class DNS_Key(Widget):
s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
_('A non-empty DNS Security Key Name is required.')
)
- return gtk.FALSE
+ return False
if s.bind.nmdc.__contains__(s.attr.key + [ name ]):
s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
_('Key')+ ' ' + name + ' ' +_('already exists.')
)
- return gtk.FALSE
+ return False
if s.bind.acls.has_key(name) or (name.lower() in ['none','any','localhost','localnets']) :
s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
_('Name')+ ' ' + name + ' ' +_('is an Access Control List name.')
)
- return gtk.FALSE
+ return False
if(len(s.attr.secret) <= 0):
- return gtk.FALSE
+ return False
s.attr.name=name
if not s.bind.nmdc.__contains__(s.attr.key):
s.bind.nmdc[ s.attr.key ] = s.attr.out()
@@ -2267,10 +2267,10 @@ class int_widget(Widget):
s.adj = gtk.Adjustment(value=float(int(s.attr)), lower=0, upper=(2**32)-1, step_incr=1, page_incr=10,page_size=10)
s.sb = gtk.SpinButton(adjustment=s.adj)
# s.adj.set_value(float(int(s.attr)))
- s.sb.set_numeric(gtk.TRUE)
+ s.sb.set_numeric(True)
s.sb.set_value(float(int(s.attr)))
s.hb = gtk.HBox()
- s.hb.pack_start(s.sb,gtk.FALSE)
+ s.hb.pack_start(s.sb,False)
debug( 'INT WIDGET FINAL:',s.attr)
debug( 'INT WIDGET VALUE:',s.sb.get_value())
s.hb.show_all()
@@ -2336,13 +2336,13 @@ class dict_widget(Widget):
s.widgets[name]=w
w.attrFrame=container
vb=gtk.VBox()
- vb.pack_start(w.widget(),gtk.FALSE)
+ vb.pack_start(w.widget(),False)
if not attr.has_key('required'):
hb=gtk.HBox()
removeButton = gtk.Button(stock=gtk.STOCK_REMOVE)
removeButton.connect('clicked',s.remove_attr,[name,attr,container])
- hb.pack_start(removeButton,gtk.FALSE)
- vb.pack_start(hb,gtk.FALSE)
+ hb.pack_start(removeButton,False)
+ vb.pack_start(hb,False)
container.add(vb)
container.set_label(name)
container.show_all()
@@ -2358,7 +2358,7 @@ class dict_widget(Widget):
hb=gtk.HBox()
addButton=gtk.Button(stock=gtk.STOCK_ADD)
addButton.connect('clicked',s.add_attr,[name,attr,container])
- hb.pack_start(addButton,gtk.FALSE)
+ hb.pack_start(addButton,False)
container.add(hb)
container.set_label(name)
container.show_all()
@@ -2378,7 +2378,7 @@ class dict_widget(Widget):
hb=gtk.HBox()
addButton=gtk.Button(stock=gtk.STOCK_ADD)
addButton.connect('clicked',s.add_attr,[name,attr,fm])
- hb.pack_start(addButton,gtk.FALSE)
+ hb.pack_start(addButton,False)
fm.add(hb)
s.vb.pack_start(fm)
continue
@@ -2386,13 +2386,13 @@ class dict_widget(Widget):
s.widgets[name]=w
w.attrFrame = gtk.Frame(label=name)
vb=gtk.VBox()
- vb.pack_start(w.widget(),gtk.FALSE)
+ vb.pack_start(w.widget(),False)
if not attr.has_key('required'):
hb=gtk.HBox()
removeButton = gtk.Button(stock=gtk.STOCK_REMOVE)
removeButton.connect('clicked',s.remove_attr,[name,attr,w.attrFrame])
- hb.pack_start(removeButton,gtk.FALSE)
- vb.pack_start(hb,gtk.FALSE)
+ hb.pack_start(removeButton,False)
+ vb.pack_start(hb,False)
w.attrFrame.add(vb)
s.vb.pack_start(w.attrFrame)
s.vb.show_all()
@@ -2475,15 +2475,15 @@ class DNS_AddressList(Widget):
s.eHB.pack_start(s.okButton)
s.addrFrame = gtk.Frame(label=_('Address'))
s.addrFrame.add(s.addrWidget.widget())
- editContainer.pack_start(s.addrFrame,gtk.FALSE)
+ editContainer.pack_start(s.addrFrame,False)
s.portFrame=gtk.Frame(label=_('Port'))
s.portContainer=gtk.VBox()
if hasattr( attr, 'port') and (attr.port != None):
s.portWidget = int_widget(s,attr,attr.port,'port')
- s.portContainer.pack_start(s.portWidget.widget(),gtk.FALSE)
+ s.portContainer.pack_start(s.portWidget.widget(),False)
s.portButton=gtk.Button(stock=gtk.STOCK_REMOVE,label=_('Remove Port'))
s.portButton.connect('clicked',s.remove_port)
- s.portContainer.pack_start(s.portButton,gtk.FALSE)
+ s.portContainer.pack_start(s.portButton,False)
else:
s.portWidget=None
s.portButton=gtk.Button(stock=gtk.STOCK_ADD,label=_('Add Port'))
@@ -2512,19 +2512,19 @@ class DNS_AddressList(Widget):
def addr_element_activated(s,tree,path,column):
s.addr_element_change(tree,path)
- return gtk.FALSE
+ return False
def new_addr_element_activated(s,tree,path,column):
s.addr_element_change(tree)
- return gtk.FALSE
+ return False
def addr_element_selected(s, tree, event):
s.addr_element_change(tree,1)
- return gtk.FALSE
+ return False
def new_addr_element_selected(s, tree, event):
s.addr_element_change(tree)
- return gtk.FALSE
+ return False
def load(s):
s.addrList.clear()
@@ -2540,7 +2540,7 @@ class DNS_AddressList(Widget):
v += 'port ' + str(ele.port)
v+='; '
s.addr_elements_string += v
- return gtk.FALSE
+ return False
def value(s):
s.addr_elements_string = ''
@@ -2552,7 +2552,7 @@ class DNS_AddressList(Widget):
ele = model.get_value(iter, 1)
s.attr.addrs.append( ele )
debug( 'AddressList ELEMENT SAVED:', str(ele))
- return gtk.FALSE
+ return False
def save(s):
debug( 'AddressList SAVE ',s.rr.__class__)
@@ -2566,8 +2566,8 @@ class DNS_AddressList(Widget):
s.newList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.addrTree = gtk.TreeView( model=s.addrList )
s.newTree = gtk.TreeView( model=s.newList )
- s.addrTree.set_headers_visible(gtk.FALSE)
- s.newTree.set_headers_visible(gtk.FALSE)
+ s.addrTree.set_headers_visible(False)
+ s.newTree.set_headers_visible(False)
s.addrSW = gtk.ScrolledWindow()
s.addrSW.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
s.newSW = gtk.ScrolledWindow()
@@ -2748,7 +2748,7 @@ class DNS_Controls(Widget):
s.hb=gtk.HBox()
s.addrList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.addrTree = gtk.TreeView( model=s.addrList )
- s.addrTree.set_headers_visible(gtk.FALSE)
+ s.addrTree.set_headers_visible(False)
s.addrTree.connect('row_activated',s.addr_element_activated)
s.addrTree.connect('button_release_event',s.addr_element_selected)
s.addrCell = gtk.CellRendererText()
@@ -2792,7 +2792,7 @@ class DNS_Controls(Widget):
def save_ele(s, model, path, iter, user_data=None):
inet = model.get_value(iter, 1)
s.attr.inets.append( inet )
- return gtk.FALSE
+ return False
def save(s):
s.save_inet()
@@ -2918,7 +2918,7 @@ class DNS_Logging(Widget):
s.chanTree.set_cursor(s.chanList.get_path(s.chanIter))
else:
s.chanList.set_value(s.chanIter,0,n)
- return gtk.FALSE
+ return False
def addChan(s,b):
chan = DNS.Logging.Channel(None,None)
@@ -2982,9 +2982,9 @@ class DNS_Logging(Widget):
def versionsUnlimited(s,w):
if s.verUnlimited.get_active():
s.versionSB.set_value(0.0)
- s.versionSB.set_sensitive(gtk.FALSE)
+ s.versionSB.set_sensitive(False)
else:
- s.versionSB.set_sensitive(gtk.TRUE)
+ s.versionSB.set_sensitive(True)
def addFileSize(s,w,file=None):
for c in s.sizeVB.get_children():
@@ -3010,29 +3010,29 @@ class DNS_Logging(Widget):
vvb=gtk.VBox()
s.versionAdj=gtk.Adjustment(value=float(int(v)), lower=0, upper=(2**32)-1, step_incr=1, page_incr=10,page_size=1)
s.versionSB=gtk.SpinButton(adjustment=s.versionAdj)
- s.versionSB.set_numeric(gtk.TRUE)
- vvb.pack_start(s.versionSB,gtk.FALSE)
+ s.versionSB.set_numeric(True)
+ vvb.pack_start(s.versionSB,False)
s.verUnlimited=gtk.CheckButton(label=_('Unlimited'))
s.verUnlimited.connect('toggled',s.versionsUnlimited)
if chan.file.versions == 'unlimited':
- s.versionSB.set_sensitive(gtk.FALSE)
- s.verUnlimited.set_active(gtk.TRUE)
+ s.versionSB.set_sensitive(False)
+ s.verUnlimited.set_active(True)
else:
- s.verUnlimited.set_active(gtk.FALSE)
- vvb.pack_start(s.verUnlimited,gtk.FALSE)
- vhb.pack_start(vvb,gtk.FALSE)
+ s.verUnlimited.set_active(False)
+ vvb.pack_start(s.verUnlimited,False)
+ vhb.pack_start(vvb,False)
s.removeVersionsButton = gtk.Button(stock=gtk.STOCK_REMOVE)
s.removeVersionsButton.connect('clicked',s.removeFileVersions,chan.file)
vvvb=gtk.VBox()
- vvvb.pack_start(s.removeVersionsButton,gtk.FALSE)
- vhb.pack_end(vvvb,gtk.FALSE)
- s.verVB.pack_start(vhb,gtk.FALSE)
+ vvvb.pack_start(s.removeVersionsButton,False)
+ vhb.pack_end(vvvb,False)
+ s.verVB.pack_start(vhb,False)
else:
s.addVersions=gtk.Button(stock=gtk.STOCK_ADD)
s.addVersions.connect('clicked',s.addFileVersions,chan.file)
avhb=gtk.HBox()
- avhb.pack_start(s.addVersions,gtk.FALSE)
- s.verVB.pack_start(avhb,gtk.FALSE)
+ avhb.pack_start(s.addVersions,False)
+ s.verVB.pack_start(avhb,False)
def versionFrame(s,chan):
verFrame=gtk.Frame(_('Versions'))
@@ -3046,19 +3046,19 @@ class DNS_Logging(Widget):
v=chan.file.size
rshb=gtk.HBox()
s.sizeWidget = DNS_Size(s,chan.file,chan.file.size,'size')
- rshb.pack_start(s.sizeWidget.widget(),gtk.FALSE)
+ rshb.pack_start(s.sizeWidget.widget(),False)
s.removeFileSizeButton = gtk.Button(stock=gtk.STOCK_REMOVE)
s.removeFileSizeButton.connect('clicked',s.removeFileSize)
rsvb=gtk.VBox()
- rsvb.pack_start(s.removeFileSizeButton,gtk.FALSE)
- rshb.pack_end(rsvb,gtk.FALSE)
- s.sizeVB.pack_start(rshb,gtk.FALSE)
+ rsvb.pack_start(s.removeFileSizeButton,False)
+ rshb.pack_end(rsvb,False)
+ s.sizeVB.pack_start(rshb,False)
else:
s.addFileSizeButton=gtk.Button(stock=gtk.STOCK_ADD)
s.addFileSizeButton.connect('clicked',s.addFileSize,chan.file)
ashb=gtk.HBox()
- ashb.pack_start(s.addFileSizeButton,gtk.FALSE)
- s.sizeVB.pack_start(ashb,gtk.FALSE)
+ ashb.pack_start(s.addFileSizeButton,False)
+ s.sizeVB.pack_start(ashb,False)
def sizeFrame(s,chan):
sizeFrame=gtk.Frame(_('Size'))
@@ -3073,11 +3073,11 @@ class DNS_Logging(Widget):
s.fileFrame=gtk.Frame(_('Channel File Options'))
fileVB=gtk.VBox()
s.fileWidget=DNS_Path(s,s.rr,chan.file.path,chan.name)
- fileVB.pack_start(s.fileWidget.widget(),gtk.FALSE)
- fileVB.pack_start(s.versionFrame(chan),gtk.FALSE)
- fileVB.pack_start(s.sizeFrame(chan),gtk.FALSE)
+ fileVB.pack_start(s.fileWidget.widget(),False)
+ fileVB.pack_start(s.versionFrame(chan),False)
+ fileVB.pack_start(s.sizeFrame(chan),False)
s.fileFrame.add(fileVB)
- s.destHB.pack_start(s.fileFrame,gtk.FALSE)
+ s.destHB.pack_start(s.fileFrame,False)
elif(chan.dest == 'syslog') and hasattr(chan,'syslog'):
s.logFacilityChoice = gtk.combo_box_new_text()
c=0
@@ -3088,7 +3088,7 @@ class DNS_Logging(Widget):
facility=c
c+=1
s.logFacilityChoice.set_active(facility)
- s.destHB.pack_start(s.logFacilityChoice,gtk.FALSE)
+ s.destHB.pack_start(s.logFacilityChoice,False)
def editChan(s, iter, chan):
if hasattr(s,'channel') and (s.channel != None):
@@ -3110,14 +3110,14 @@ class DNS_Logging(Widget):
vb=gtk.VBox()
destFrame=gtk.Frame(_('Destination'))
hb = gtk.HBox()
- hb.pack_start(gtk.Label(chan.dest),gtk.FALSE)
+ hb.pack_start(gtk.Label(chan.dest),False)
hb.pack_start(gtk.Label(str(getattr(chan,chan.dest))))
destFrame.add(hb)
- vb.pack_start(destFrame,gtk.FALSE)
+ vb.pack_start(destFrame,False)
if hasattr(chan,'severity'):
sevFrame=gtk.Frame(_('Severity'))
hb = gtk.HBox()
- hb.pack_start(gtk.Label(chan.severity),gtk.FALSE)
+ hb.pack_start(gtk.Label(chan.severity),False)
sevFrame.add(hb)
vb.pack_start(sevFrame)
frame.add(vb)
@@ -3127,9 +3127,9 @@ class DNS_Logging(Widget):
s.addChanButton.connect('clicked',s.addChan)
s.removeChanButton=gtk.Button(stock=gtk.STOCK_REMOVE)
s.removeChanButton.connect('clicked',s.removeChan)
- butHB.pack_start(s.addChanButton,gtk.FALSE)
- butHB.pack_start(s.removeChanButton,gtk.FALSE)
- s.chanVB.pack_start(butHB,gtk.FALSE)
+ butHB.pack_start(s.addChanButton,False)
+ butHB.pack_start(s.removeChanButton,False)
+ s.chanVB.pack_start(butHB,False)
s.chanVB.show_all()
return
frame=gtk.Frame(_('Channel Name'))
@@ -3138,9 +3138,9 @@ class DNS_Logging(Widget):
s.chanName.connect('focus_out_event',s.checkChanName)
s.chanName.set_width_chars(max(len(chan.name),20))
s.chanName.set_text(chan.name)
- hb.pack_start(s.chanName,gtk.FALSE)
+ hb.pack_start(s.chanName,False)
frame.add(hb)
- s.chanVB.pack_start(frame,gtk.FALSE)
+ s.chanVB.pack_start(frame,False)
destFrame=gtk.Frame(_('Channel Destination'))
channel_dest=''
if hasattr(chan,'dest') and (len(chan.dest)>0):
@@ -3158,11 +3158,11 @@ class DNS_Logging(Widget):
s.destChoice.set_active(activeDest)
s.destChoice.connect('changed',s.changeDest)
dvb=gtk.VBox()
- dvb.pack_start(s.destChoice,gtk.FALSE)
- s.destHB.pack_start(dvb,gtk.FALSE)
+ dvb.pack_start(s.destChoice,False)
+ s.destHB.pack_start(dvb,False)
s.set_dest()
destFrame.add(s.destHB)
- s.chanVB.pack_start(destFrame,gtk.FALSE)
+ s.chanVB.pack_start(destFrame,False)
sevFrame=gtk.Frame(_('Channel Severity'))
s.severityChoice=gtk.combo_box_new_text()
severity='info'
@@ -3176,9 +3176,9 @@ class DNS_Logging(Widget):
c+=1
s.severityChoice.connect('changed',s.changeSeverity)
shb=gtk.HBox()
- shb.pack_start(s.severityChoice,gtk.FALSE)
+ shb.pack_start(s.severityChoice,False)
sevFrame.add(shb)
- s.chanVB.pack_start(sevFrame,gtk.FALSE)
+ s.chanVB.pack_start(sevFrame,False)
optFrame=gtk.Frame(_('Channel Print Options'))
optVB=gtk.HBox()
s.optPrintTime=gtk.CheckButton(label=_('Print Time'))
@@ -3186,22 +3186,22 @@ class DNS_Logging(Widget):
if chan.opts['print-time'] == 'no':
del chan.opts['print-time']
else:
- s.optPrintTime.set_active(gtk.TRUE)
- optVB.pack_start(s.optPrintTime,gtk.FALSE)
+ s.optPrintTime.set_active(True)
+ optVB.pack_start(s.optPrintTime,False)
s.optPrintSeverity=gtk.CheckButton(label=_('Print Severity'))
if chan.opts.has_key('print-severity'):
if chan.opts['print-severity'] == 'no':
del chan.opts['print-severity']
else:
- s.optPrintSeverity.set_active(gtk.TRUE)
- optVB.pack_start(s.optPrintSeverity,gtk.FALSE)
+ s.optPrintSeverity.set_active(True)
+ optVB.pack_start(s.optPrintSeverity,False)
s.optPrintCategory=gtk.CheckButton(label=_('Print Category'))
if chan.opts.has_key('print-category'):
if chan.opts['print-category'] == 'no':
del chan.opts['print-category']
else:
- s.optPrintCategory.set_active(gtk.TRUE)
- optVB.pack_start(s.optPrintCategory,gtk.FALSE)
+ s.optPrintCategory.set_active(True)
+ optVB.pack_start(s.optPrintCategory,False)
optFrame.add(optVB)
s.chanVB.pack_start(optFrame)
butHB=gtk.HBox()
@@ -3209,9 +3209,9 @@ class DNS_Logging(Widget):
s.addChanButton.connect('clicked',s.addChan)
s.removeChanButton=gtk.Button(stock=gtk.STOCK_REMOVE)
s.removeChanButton.connect('clicked',s.removeChan)
- butHB.pack_start(s.addChanButton,gtk.FALSE)
- butHB.pack_start(s.removeChanButton,gtk.FALSE)
- s.chanVB.pack_start(butHB,gtk.FALSE)
+ butHB.pack_start(s.addChanButton,False)
+ butHB.pack_start(s.removeChanButton,False)
+ s.chanVB.pack_start(butHB,False)
s.chanVB.show_all()
def saveCatChan(s, model, path, iter, cat):
@@ -3245,7 +3245,7 @@ class DNS_Logging(Widget):
debug( 'SELECT CAT:',i,cat )
s.catInfoLabel.set_markup(_('Category')+' ' + cat + ' '+ _('Description'))
s.catInfo.set_markup(DNS.Logging.log_categories[cat]['desc'])
- return gtk.FALSE
+ return False
def add_category(s,w):
i=s.catCombo.get_active()
@@ -3273,7 +3273,7 @@ class DNS_Logging(Widget):
s.catCombo.set_active(0)
s.catTree.set_cursor((len(s.attr.categories)-1,))
s.editCat(n,s.attr.categories[-1])
- return gtk.FALSE
+ return False
def remove_category(s,w):
if not hasattr(s,'category'):
@@ -3287,7 +3287,7 @@ class DNS_Logging(Widget):
s.attr.categories.pop(i)
else:
debug( 'BAD CAT TO REMOVE',i)
- return gtk.FALSE
+ return False
s.catList.remove(s.catList.get_iter((i,)))
debug( 'REMOVED ', s.category.name,i,len(s.catsToAdd))
s.catCombo.get_model().clear()
@@ -3309,7 +3309,7 @@ class DNS_Logging(Widget):
if s.catList.iter_n_children(None):
s.catTree.set_cursor((0,))
s.editCat((0,),s.attr.categories[0])
- return gtk.FALSE
+ return False
def findChan(s, model, path, iter, chanName):
chan = model.get_value(iter,1)
@@ -3442,7 +3442,7 @@ class DNS_Logging(Widget):
s.chanHB=gtk.HBox()
s.chanList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.chanTree = gtk.TreeView( model=s.chanList )
- s.chanTree.set_headers_visible(gtk.FALSE)
+ s.chanTree.set_headers_visible(False)
s.chanTree.connect('row_activated',s.chan_element_activated)
s.chanTree.connect('button_release_event',s.chan_element_selected)
s.chanCell = gtk.CellRendererText()
@@ -3453,14 +3453,14 @@ class DNS_Logging(Widget):
s.chanSW.add_with_viewport(s.chanTree)
s.chanHB.pack_start(s.chanSW)
s.chanVB=gtk.VBox()
- s.chanHB.pack_start(s.chanVB,gtk.FALSE)
+ s.chanHB.pack_start(s.chanVB,False)
s.chanFrame.add(s.chanHB)
s.vb.pack_start(s.chanFrame)
s.catFrame = gtk.Frame(_('Categories'))
s.catHB=gtk.HBox()
s.catList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.catTree = gtk.TreeView( model=s.catList )
- s.catTree.set_headers_visible(gtk.FALSE)
+ s.catTree.set_headers_visible(False)
s.catTree.connect('row_activated',s.cat_element_activated)
s.catTree.connect('button_release_event',s.cat_element_selected)
s.catCell = gtk.CellRendererText()
@@ -3474,7 +3474,7 @@ class DNS_Logging(Widget):
s.catChanListFrame = gtk.Frame(_('Category Channels'))
s.catChanList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.catChanTree = gtk.TreeView( model=s.catChanList )
- s.catChanTree.set_headers_visible(gtk.FALSE)
+ s.catChanTree.set_headers_visible(False)
s.catChanTree.connect('row_activated',s.catChan_element_activated)
s.catChanTree.connect('button_release_event',s.catChan_element_selected)
s.catChanCell = gtk.CellRendererText()
@@ -3487,7 +3487,7 @@ class DNS_Logging(Widget):
s.catAllChanListFrame=gtk.Frame(_('All Channels'))
s.catAllChanList = gtk.ListStore( gobject.TYPE_STRING, gobject.TYPE_PYOBJECT )
s.catAllChanTree = gtk.TreeView( model=s.catAllChanList )
- s.catAllChanTree.set_headers_visible(gtk.FALSE)
+ s.catAllChanTree.set_headers_visible(False)
s.catAllChanCell = gtk.CellRendererText()
s.catAllChanColm = gtk.TreeViewColumn( None, s.catAllChanCell, text=0 )
s.catAllChanTree.append_column(s.catAllChanColm)
@@ -3508,24 +3508,24 @@ class DNS_Logging(Widget):
s.removeChanButton.connect('clicked',s.remove_catChan)
rvb=gtk.VBox()
rhb=gtk.HBox()
- rhb.pack_start(s.removeChanButton,gtk.FALSE)
- rvb.pack_start(gtk.Label(''),gtk.FALSE)
- rvb.pack_start(rhb,gtk.FALSE)
- rvb.pack_start(gtk.Label(''),gtk.FALSE)
- s.catChanHB.pack_start(rvb,gtk.FALSE)
+ rhb.pack_start(s.removeChanButton,False)
+ rvb.pack_start(gtk.Label(''),False)
+ rvb.pack_start(rhb,False)
+ rvb.pack_start(gtk.Label(''),False)
+ s.catChanHB.pack_start(rvb,False)
s.addChanButton = gtk.Button(stock=gtk.STOCK_ADD)
s.addChanButton.connect('clicked',s.add_catChan)
avb=gtk.VBox()
ahb=gtk.HBox()
- ahb.pack_start(s.addChanButton,gtk.FALSE)
- avb.pack_start(gtk.Label(''),gtk.FALSE)
- avb.pack_start(ahb,gtk.FALSE)
- avb.pack_start(gtk.Label(''),gtk.FALSE)
- s.catChanHB.pack_start(avb,gtk.FALSE)
+ ahb.pack_start(s.addChanButton,False)
+ avb.pack_start(gtk.Label(''),False)
+ avb.pack_start(ahb,False)
+ avb.pack_start(gtk.Label(''),False)
+ s.catChanHB.pack_start(avb,False)
s.catChanHB.pack_start(s.catAllChanListFrame)
- s.catVB.pack_start(s.catChanHB,gtk.FALSE)
+ s.catVB.pack_start(s.catChanHB,False)
s.catInfo=gtk.Label('')
- s.catInfo.set_line_wrap(gtk.TRUE)
+ s.catInfo.set_line_wrap(True)
s.catInfoFrame=gtk.Frame()
s.catInfoLabel = gtk.Label(_('Category Description'))
s.catInfoFrame.set_label_widget(s.catInfoLabel)
@@ -3549,27 +3549,27 @@ class DNS_Logging(Widget):
if len(s.catsToAdd):
s.catCombo.set_active(0)
s.catCombo.connect('changed',s.select_category)
- s.catButHB.pack_start(s.catCombo,gtk.FALSE)
+ s.catButHB.pack_start(s.catCombo,False)
s.addCatButton = gtk.Button(stock=gtk.STOCK_ADD)
s.addCatButton.connect('clicked',s.add_category)
- s.catButHB.pack_start(s.addCatButton,gtk.FALSE)
+ s.catButHB.pack_start(s.addCatButton,False)
s.removeCatButton=gtk.Button(stock=gtk.STOCK_REMOVE)
s.removeCatButton.connect('clicked',s.remove_category)
- s.catButHB.pack_start(s.removeCatButton,gtk.FALSE)
- s.catVB.pack_start(s.catButHB,gtk.FALSE)
+ s.catButHB.pack_start(s.removeCatButton,False)
+ s.catVB.pack_start(s.catButHB,False)
s.catChanFrame.add(s.catVB)
- s.catHB.pack_start(s.catChanFrame,gtk.FALSE)
+ s.catHB.pack_start(s.catChanFrame,False)
s.catFrame.add(s.catHB)
- s.vb.pack_start(s.catFrame,gtk.FALSE)
+ s.vb.pack_start(s.catFrame,False)
s.load()
return s.vb
def response(s,d,r):
if r == gtk.RESPONSE_OK:
if not s.save():
- return gtk.FALSE
+ return False
s.logDialog.destroy()
- return gtk.FALSE
+ return False
def loggingDialog(s):
s.logDialog=gtk.Dialog(parent=s.gui.gui, title=_('DNS Logging'),
--- system-config-bind-4.0.0/ZoneTree.py~ 2005-04-01 15:20:56.502539696 +1000
+++ system-config-bind-4.0.0/ZoneTree.py 2005-04-01 15:20:59.796039008 +1000
@@ -72,12 +72,12 @@ class NewACL:
if not(hasattr(s,'name')):
s.name_check(s,s.entry)
if not(hasattr(s,'name')):
- return gtk.FALSE
+ return False
s.acl.name = s.nmdcKey + [s.name]
s.aclWidget.save()
s.zoneTree.load()
s.dialog.destroy()
- return gtk.FALSE
+ return False
def name_check(s,w,e=None):
name=s.entry.get_text()
@@ -102,7 +102,7 @@ class NewACL:
)
return False
s.name = name
- return gtk.FALSE
+ return False
def __init__(s,selection,zoneTree):
s.nmdcKey=['acl']
@@ -124,7 +124,7 @@ class NewACL:
s.entry.connect('focus_out_event',s.name_check)
s.nameFrame = gtk.Frame(label=_('Access Control List Name'))
s.nameFrame.add(s.entry)
- s.dialog.vbox.pack_start(s.nameFrame,gtk.FALSE)
+ s.dialog.vbox.pack_start(s.nameFrame,False)
s.acl.name=''
s.aclWidget = RRGUI.DNS_ACL(s,s,s.acl,'acl')
s.dialog.vbox.pack_start(s.aclWidget.widget())
@@ -137,12 +137,12 @@ class NewServer:
addr = str(s.address)
if len(addr) == 0:
s.bind.gui.modalError(s.dialog,_('Server Address Error'), _('You must enter a valid server address.'))
- return gtk.FALSE
+ return False
if s.bind.nmdc.__contains__(s.nmdcKey + [addr]):
s.bind.gui.modalError(s.dialog,_('Server Address Error'), _('Server') + ' ' + addr + ' ' +
_('already exists. Specify another address.')
)
- return gtk.FALSE
+ return False
name = s.nmdcKey
if s.bind.nmdc.__contains__(s.nmdcKey):
name = s.nmdcKey + [ addr ]
@@ -209,7 +209,7 @@ class AddMenu:
def detach(s):
debug( 'DETACH')
- return gtk.FALSE
+ return False
def __init__(s, z, selection, widget=None):
s.selection = selection
@@ -386,18 +386,18 @@ class PopupMenu:
def detach(s):
debug( 'DETACH')
- return gtk.FALSE
+ return False
def edit(s, i):
debug( 'EDIT', s.selection)
s.zoneTree.Edit(s.selection)
- return gtk.FALSE
+ return False
def delete(s, i):
debug( 'DELETE', s.selection)
if type(s.selection) != type(None):
Delete(s.zoneTree, s.selection)
- return gtk.FALSE
+ return False
def get_root_cache(s,i):
RootCacheDownload(s.zoneTree,s.selection)
@@ -493,7 +493,7 @@ class Delete:
del s.zoneTree.bind.nmdc[s.obj.key]
s.zoneTree.bind.nmdc.update()
s.zoneTree.bind.load()
- return gtk.FALSE
+ return False
def __init__(s, zoneTree, obj):
s.zoneTree = zoneTree
@@ -589,7 +589,7 @@ class DragZone:
oldKey = zone['parent']+ [zone['key']]
if s.nmdc[['view',view.v['key']]].has_key('zone') and s.nmdc[['view',view.v['key'],'zone']].has_key(zone['key']):
s.zoneTree.bind.gui.modalError(s.zoneTree.bind.gui.gui,_('Zone Drag Error'),_('Zone') + ' ' + zone['zone'].zone_origin + ' '+ _('already exists in view') + ' '+ view.key.strip('"'))
- return gtk.FALSE
+ return False
if not s.nmdc[['view',view.v['key']]].has_key('zone'):
newKey = [ 'view', view.v['key'], 'zone' ]
else:
@@ -623,16 +623,16 @@ class DragZone:
s.bind.load()
else:
return oldKey
- return gtk.FALSE
+ return False
def move(s,i):
oldKey = s.copy(i)
- if oldKey == gtk.FALSE:
+ if oldKey == False:
return oldKey
del s.nmdc[ oldKey ]
s.nmdc.update()
s.bind.load()
- return gtk.FALSE
+ return False
def detach(w):
pass
@@ -684,7 +684,7 @@ class ZoneTree:
if( event.button > 1 ):
rr = s.selection()
s.popupMenu = PopupMenu(s,tree,event, rr)
- return gtk.FALSE
+ return False
def NewClicked(s, w):
sel=s.selection()
@@ -744,7 +744,7 @@ class ZoneTree:
if not s.bind.isViewed :
v = None
Import(s,v)
- return gtk.FALSE
+ return False
def PreviewClicked(s, w):
debug( 'PREVIEW Button Clicked')
@@ -769,7 +769,7 @@ class ZoneTree:
s.statusLabel.set_markup(''+_('You can drag this object to another view.')+'')
else:
s.statusLabel.set_markup(''+_('Select an object; press and release the right-hand mouse button.')+'')
- return gtk.FALSE
+ return False
def on_row_activated(s,zoneTree, path, column):
node = s.store.get_iter(path)
@@ -780,7 +780,7 @@ class ZoneTree:
def drag_begin(s,w,dc):
r = s.selected_row()
s.dndSource = r
- return gtk.FALSE
+ return False
def drag_end(s,w,dc):
x,y=s.tree.get_pointer()
@@ -796,7 +796,7 @@ class ZoneTree:
if ( type(dest) != type(None) ):
if (not hasattr(s,'dndSource') ) or (s.dndSource == None):
debug( 'No dndSource' )
- return gtk.FALSE
+ return False
source=s.row_record(s.dndSource)
if( (source.__class__ == ZoneNode) and (dest.__class__ == View)
and (dest.nmdcKey != source['zone'].nmdcKey[:-(len(dest.nmdcKey))])
@@ -804,7 +804,7 @@ class ZoneTree:
DragZone(s,s.dndSource,destIter)
else:
debug( 'BAD SOURCE:', source.__class__, ' OR DEST:', dest.__class__ )
- return gtk.FALSE
+ return False
def set_zone_search_expansion(s, z, sv, lsv):
zone_path = s.store.get_path(z['node'])
@@ -829,8 +829,8 @@ class ZoneTree:
origin = z['zone'].origin
if ( sv == origin ):
if z.has_key('view'):
- s.tree.expand_row(s.store.get_path(s.bind.views[z['view']]['node']),gtk.FALSE)
- s.tree.expand_row(zone_path,gtk.TRUE)
+ s.tree.expand_row(s.store.get_path(s.bind.views[z['view']]['node']),False)
+ s.tree.expand_row(zone_path,True)
s.tree.set_cursor(zone_path)
return True
else:
@@ -857,12 +857,12 @@ class ZoneTree:
if not expanded:
debug( 'Expand Zone:',z['zone'].zone_origin, zone_path )
if z.has_key('view'):
- s.tree.expand_row(s.store.get_path(s.bind.views[z['view']]['node']),gtk.FALSE)
- s.tree.expand_row(zone_path,gtk.FALSE)
+ s.tree.expand_row(s.store.get_path(s.bind.views[z['view']]['node']),False)
+ s.tree.expand_row(zone_path,False)
expanded = True
changed = True
debug( 'Expand Row:', name, path )
- s.tree.expand_row(path,gtk.TRUE)
+ s.tree.expand_row(path,True)
s.tree.set_cursor(path)
changed = True
elif s.tree.row_expanded(path):
@@ -886,15 +886,15 @@ class ZoneTree:
for origin in v['zones'].keys():
z = v['zones'][origin]
s.set_zone_search_expansion(z,sv,lsv)
- return gtk.FALSE
+ return False
def search_widget(s):
w=gtk.HBox()
l=gtk.Label(_('Search:'))
- w.pack_start(l,gtk.FALSE)
+ w.pack_start(l,False)
s.search_value = gtk.Entry()
s.search_value.connect("changed",s.search_value_changed)
- w.pack_start(s.search_value,gtk.FALSE)
+ w.pack_start(s.search_value,False)
return w
def toggle_show_dnssec(s,w):
@@ -902,7 +902,7 @@ class ZoneTree:
def dnssec_widget(s):
s.showDNSSEC = gtk.CheckButton(label=_('Show DNSSEC Records'))
- s.showDNSSEC.set_active(gtk.FALSE)
+ s.showDNSSEC.set_active(False)
s.showDNSSEC.connect("toggled", s.toggle_show_dnssec)
return s.showDNSSEC
@@ -910,8 +910,8 @@ class ZoneTree:
s.bind = bind
s.gui = bind.gui
s.tree = bind.gui.xml.get_widget('ZoneTree')
-# s.tree.set_headers_visible(gtk.FALSE)
- s.tree.set_reorderable(gtk.TRUE)
+# s.tree.set_headers_visible(False)
+ s.tree.set_reorderable(True)
s.tree.connect('drag-begin',s.drag_begin)
s.tree.connect('drag-end',s.drag_end)
s.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK,
@@ -1060,7 +1060,7 @@ class ZoneTree:
s.add_zone(origin, zone)
nz+=1
if nz > 0:
- s.tree.expand_row(s.store.get_path(s.bind.views[key]['node']),gtk.FALSE)
+ s.tree.expand_row(s.store.get_path(s.bind.views[key]['node']),False)
if len(s.search_value.get_text()):
s.search_value_changed(s.search_value)
elif (s.last_path != (0,)):
@@ -1082,7 +1082,7 @@ class ZoneTree:
path = path[:-1]
break
if( d < depth) or s.last_expansion:
- s.tree.expand_row(path,gtk.FALSE)
+ s.tree.expand_row(path,False)
d += 1
s.tree.set_cursor(path)
if hasattr(s.bind,'containsSignedZones') and s.bind.containsSignedZones:
--- system-config-bind-4.0.0/ErrorDialog.py~ 2005-04-01 15:21:14.348826648 +1000
+++ system-config-bind-4.0.0/ErrorDialog.py 2005-04-01 15:21:17.552339640 +1000
@@ -86,7 +86,7 @@ class ErrorDialog:
def on_exit(self, dialog, response):
if response == 0xDEAD:
- return gtk.FALSE
+ return False
debug( 'ERROR DIALOG: EXIT:', self.gui.running, self.gui.fatal_error)
if self.gui.fatal_error:
self.gui.exit()
@@ -98,11 +98,11 @@ class ErrorDialog:
dialog.response(0xDEAD)
else:
dialog.destroy()
- return gtk.FALSE
+ return False
def on_delete_event(self, widget, event, data=None):
if response == 0xDEAD:
- return gtk.FALSE
+ return False
debug( 'ERROR DIALOG: EXIT:', self.gui.running, self.gui.fatal_error)
if self.gui.fatal_error:
self.gui.exit()
@@ -111,4 +111,4 @@ class ErrorDialog:
dialog.response(0xDEAD)
else:
dialog.destroy()
- return gtk.TRUE
+ return True