--- system-config-users-1.2.28/src/userWindow.py~ 2005-04-01 14:38:44.520459480 +1000 +++ system-config-users-1.2.28/src/userWindow.py 2005-04-01 14:38:52.864191040 +1000 @@ -54,9 +54,9 @@ class userWindow: self.userWinConfirm = xml.get_widget('newConfirmEntry') self.userWinHomeDir = xml.get_widget('newHomeDirEntry') self.loginShellCombo = xml.get_widget('newLoginShellCombo') - self.loginShellCombo.entry.set_property('editable', gtk.FALSE) + self.loginShellCombo.entry.set_property('editable', False) self.selinuxCombo = xml.get_widget("selinuxCombo") - self.selinuxCombo.entry.set_property('editable', gtk.FALSE) + self.selinuxCombo.entry.set_property('editable', False) self.selinuxLabel = xml.get_widget("selinuxLabel") self.newGroupCheck = xml.get_widget('newGroupCheck') self.passwordLabel = xml.get_widget('passwordLabel') @@ -69,8 +69,8 @@ class userWindow: self.uidSpinButton.set_value(500) if not selinuxEnabled: - self.selinuxCombo.set_sensitive(gtk.FALSE) - self.selinuxLabel.set_sensitive(gtk.FALSE) + self.selinuxCombo.set_sensitive(False) + self.selinuxLabel.set_sensitive(False) self.selinuxRoleDict = { _("User"): "user_r", _("Staff") : "staff_r", _("System Administrator") : "sysadm_r"} @@ -99,9 +99,9 @@ class userWindow: self.userWinPassword.set_text("") self.userWinConfirm.set_text("") self.userWinHomeDir.set_text("") - self.newGroupCheck.set_active(gtk.TRUE) - self.uidCheckButton.set_active(gtk.FALSE) - self.homeDirCheck.set_active(gtk.TRUE) + self.newGroupCheck.set_active(True) + self.uidCheckButton.set_active(False) + self.homeDirCheck.set_active(True) try: #Hack to work around what I suspect is a gtk bug self.uidSpinButton.set_value(500) @@ -113,12 +113,12 @@ class userWindow: self.loginShellCombo.list.select_item(self.shells.index(default)) def busy(self): - self.userWin.set_sensitive(gtk.FALSE) + self.userWin.set_sensitive(False) self.userWin.window.set_cursor(busy_cursor) def ready(self): self.userWin.window.set_cursor(ready_cursor) - self.userWin.set_sensitive(gtk.TRUE) + self.userWin.set_sensitive(True) def newUserWin(self, filter): self.filter = filter @@ -154,7 +154,7 @@ class userWindow: def on_userWin_cancel_button_clicked(self, *args): self.userWinReset() self.userWin.hide() - return gtk.TRUE + return True def on_userWin_ok_button_clicked(self, *args): self.busy() @@ -271,7 +271,7 @@ class userWindow: (_("Creating a user with a UID less than 500 is not recommended. " "Are you sure you want to do this?"))) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_icon(mainWindow.iconPixbuf) result = dlg.run() dlg.destroy() @@ -290,7 +290,7 @@ class userWindow: if group != None: #A group with this name already exists. Ask them what they want to do. dlg = gtk.Dialog() - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_icon(mainWindow.iconPixbuf) dlg.add_button(gtk.STOCK_CANCEL, 0) dlg.add_button(gtk.STOCK_OK, 1) @@ -298,7 +298,7 @@ class userWindow: dlg.vbox.set_spacing(4) label = gtk.Label(_("A group with this name already exists. What would you like to do?")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) dlg.vbox.pack_start(label) self.existingRadio = gtk.RadioButton(None, (_("Add to the existing group"))) --- system-config-users-1.2.28/src/userProperties.py~ 2005-04-01 14:39:01.586864992 +1000 +++ system-config-users-1.2.28/src/userProperties.py 2005-04-01 14:39:08.775772112 +1000 @@ -63,9 +63,9 @@ class userProperties: self.userWinConfirm = xml.get_widget('confirmEntry') self.userWinHomeDir = xml.get_widget('homeDirEntry') self.loginShellCombo = xml.get_widget('loginShellCombo') - self.loginShellCombo.entry.set_property('editable', gtk.FALSE) + self.loginShellCombo.entry.set_property('editable', False) self.selinuxPropCombo = xml.get_widget("selinuxPropCombo") - self.selinuxPropCombo.entry.set_property('editable', gtk.FALSE) + self.selinuxPropCombo.entry.set_property('editable', False) self.selinuxPropLabel = xml.get_widget("selinuxPropLabel") self.userNotebook = xml.get_widget('userNotebook') self.lastChangedLabel = xml.get_widget('lastChangedLabel') @@ -86,8 +86,8 @@ class userProperties: self.groupVBox = xml.get_widget('userPropGroupVBox') if not selinuxEnabled: - self.selinuxPropCombo.set_sensitive(gtk.FALSE) - self.selinuxPropLabel.set_sensitive(gtk.FALSE) + self.selinuxPropCombo.set_sensitive(False) + self.selinuxPropLabel.set_sensitive(False) self.selinuxRoleDict = { _("User"): "user_r", _("Staff") : "staff_r", _("System Administrator") : "sysadm_r"} @@ -97,7 +97,7 @@ class userProperties: self.groupStore = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING) self.groupTreeView = gtk.TreeView(self.groupStore) - self.groupTreeView.set_property("headers-visible", gtk.FALSE) + self.groupTreeView.set_property("headers-visible", False) self.checkboxrenderer = gtk.CellRendererToggle() self.checkboxrenderer.connect("toggled", self.toggled_item) @@ -111,18 +111,18 @@ class userProperties: self.groupChecklistSW.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) self.groupChecklistSW.set_shadow_type(gtk.SHADOW_IN) self.groupChecklistSW.add(self.groupTreeView) - self.groupVBox.pack_start(self.groupChecklistSW, gtk.TRUE) + self.groupVBox.pack_start(self.groupChecklistSW, True) self.shells = self.parent.ADMIN.getUserShells() self.shells.sort() self.loginShellCombo.set_popdown_strings(self.shells) - self.groupHBox = gtk.HBox(gtk.FALSE, 5) + self.groupHBox = gtk.HBox(False, 5) self.primaryGroupCombo = gtk.Combo() - self.primaryGroupCombo.entry.set_property('editable', gtk.FALSE) - self.groupHBox.pack_start(gtk.Label(_("Primary Group:")), gtk.FALSE) - self.groupHBox.pack_start(self.primaryGroupCombo, gtk.TRUE) - self.groupVBox.pack_start(self.groupHBox, gtk.FALSE) + self.primaryGroupCombo.entry.set_property('editable', False) + self.groupHBox.pack_start(gtk.Label(_("Primary Group:")), False) + self.groupHBox.pack_start(self.primaryGroupCombo, True) + self.groupVBox.pack_start(self.groupHBox, False) xml.signal_connect("on_cancel_button_clicked", self.on_cancel_button_clicked) xml.signal_connect("on_ok_button_clicked", self.on_ok_button_clicked) @@ -131,12 +131,12 @@ class userProperties: xml.signal_connect("on_accountLockCheck_toggled", self.on_accountLockCheck_toggled) def busy(self): - self.userWin.set_sensitive(gtk.FALSE) + self.userWin.set_sensitive(False) self.userWin.window.set_cursor(busy_cursor) def ready(self): self.userWin.window.set_cursor(ready_cursor) - self.userWin.set_sensitive(gtk.TRUE) + self.userWin.set_sensitive(True) def userWinReset(self): self.userNotebook.set_current_page(0) @@ -147,13 +147,13 @@ class userProperties: self.userWinHomeDir.set_text('') self.groupStore.clear() - self.accountLockCheck.set_active(gtk.FALSE) + self.accountLockCheck.set_active(False) self.on_accountLockCheck_toggled() - self.accountExpireCheck.set_active(gtk.FALSE) + self.accountExpireCheck.set_active(False) self.accountMonthEntry.set_text("") self.accountDayEntry.set_text("") self.accountYearEntry.set_text("") - self.pwExpireCheck.set_active(gtk.FALSE) + self.pwExpireCheck.set_active(False) self.pwAllowEntry.set_text('0') self.pwRequireEntry.set_text('0') self.pwWarnEntry.set_text('0') @@ -167,9 +167,9 @@ class userProperties: uidNumber = self.userEnt.get(libuser.UIDNUMBER)[0] if uidNumber == 0: #Don't allow root account to be locked - self.accountLockCheck.set_sensitive(gtk.FALSE) + self.accountLockCheck.set_sensitive(False) else: - self.accountLockCheck.set_sensitive(gtk.TRUE) + self.accountLockCheck.set_sensitive(True) self.on_accountLockCheck_toggled() fn = self.userEnt.get(libuser.GECOS)[0] @@ -181,7 +181,7 @@ class userProperties: self.userWinUserName.set_text(uid) if uid == "root": #Don't allow root uid to be changed - self.userWinUserName.set_sensitive(gtk.FALSE) + self.userWinUserName.set_sensitive(False) self.userWinFullName.set_text(fn) self.userWinPassword.set_text(' ') @@ -214,7 +214,7 @@ class userProperties: if expire: try: if int(expire[0]) != -1: - self.accountExpireCheck.set_active(gtk.TRUE) + self.accountExpireCheck.set_active(True) days = int(self.userEnt.get(libuser.SHADOWEXPIRE)[0] + 1) tmp = days * int(secondsPerDay) age = time.localtime(tmp) @@ -225,20 +225,20 @@ class userProperties: self.accountDayEntry.set_text(day) self.accountYearEntry.set_text(year) except: - self.accountExpireCheck.set_active(gtk.FALSE) + self.accountExpireCheck.set_active(False) if int(min[0]) == 0 and int(max[0]) == 99999 and int(warning[0]) == 7 and int(inactive[0]) == -1: - self.pwExpireCheck.set_active(gtk.FALSE) + self.pwExpireCheck.set_active(False) else: - self.pwExpireCheck.set_active(gtk.TRUE) + self.pwExpireCheck.set_active(True) self.pwAllowEntry.set_text(str(min[0])) self.pwRequireEntry.set_text(str(max[0])) self.pwWarnEntry.set_text(str(warning[0])) self.pwInactiveEntry.set_text(str(inactive[0])) if self.parent.ADMIN.userIsLocked(self.userEnt) == 1: - self.accountLockCheck.set_active(gtk.TRUE) + self.accountLockCheck.set_active(True) self.fill_groups_list(self.userEnt) self.set_default_group(self.userEnt) @@ -258,7 +258,7 @@ class userProperties: def on_cancel_button_clicked(self, *args): self.userWinReset() self.userWin.hide() - return gtk.TRUE + return True def on_ok_button_clicked(self, *args): self.busy() @@ -588,12 +588,12 @@ class userProperties: for group in self.groups: if group in usergroups: iter = self.groupStore.append() - self.groupStore.set_value(iter, 0, gtk.TRUE) + self.groupStore.set_value(iter, 0, True) self.groupStore.set_value(iter, 1, group) self.primaryGroupList.append(group) else: iter = self.groupStore.append() - self.groupStore.set_value(iter, 0, gtk.FALSE) + self.groupStore.set_value(iter, 0, False) self.groupStore.set_value(iter, 1, group) def set_default_group (self, userEnt): --- system-config-users-1.2.28/src/groupProperties.py~ 2005-04-01 14:39:24.366401976 +1000 +++ system-config-users-1.2.28/src/groupProperties.py 2005-04-01 14:39:28.814725728 +1000 @@ -56,7 +56,7 @@ class groupProperties: self.userStore = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING) self.userTreeView = gtk.TreeView(self.userStore) - self.userTreeView.set_property("headers-visible", gtk.FALSE) + self.userTreeView.set_property("headers-visible", False) self.checkboxrenderer = gtk.CellRendererToggle() self.checkboxrenderer.connect("toggled", self.toggled_item) @@ -70,18 +70,18 @@ class groupProperties: self.userChecklistSW.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) self.userChecklistSW.set_shadow_type(gtk.SHADOW_IN) self.userChecklistSW.add(self.userTreeView) - self.userVBox.pack_start(self.userChecklistSW, gtk.TRUE) + self.userVBox.pack_start(self.userChecklistSW, True) xml.signal_connect("on_groupProperties_cancel_button_clicked", self.on_groupProperties_cancel_button_clicked) xml.signal_connect("on_groupProperties_ok_button_clicked", self.on_groupProperties_ok_button_clicked) def busy(self): - self.groupWin.set_sensitive(gtk.FALSE) + self.groupWin.set_sensitive(False) self.groupWin.window.set_cursor(busy_cursor) def ready(self): self.groupWin.window.set_cursor(ready_cursor) - self.groupWin.set_sensitive(gtk.TRUE) + self.groupWin.set_sensitive(True) def groupWinReset(self): self.groupNotebook.set_current_page(0) @@ -100,7 +100,7 @@ class groupProperties: def on_groupProperties_cancel_button_clicked(self, *args): self.groupWinReset() self.groupWin.hide() - return gtk.TRUE + return True def on_groupProperties_ok_button_clicked(self, *args): self.busy() @@ -117,7 +117,7 @@ class groupProperties: (_("Please enter a group name."))) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(mainWindow.iconPixbuf) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.show_all() dlg.run() dlg.destroy() @@ -162,13 +162,13 @@ class groupProperties: userEnt = self.parent.ADMIN.lookupUserByName(user) if userEnt.get(libuser.GIDNUMBER)[0] == self.groupEnt.get(libuser.GIDNUMBER)[0]: #You can't remove a user from their primary group, so reselect the user and popup an error - self.userStore.set_value(iter, 0, gtk.TRUE) + self.userStore.set_value(iter, 0, True) dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, (_("You cannot remove user '%s' from their primary " "group." % user))) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(mainWindow.iconPixbuf) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.run() dlg.destroy() self.ready() @@ -204,8 +204,8 @@ class groupProperties: iter = self.userStore.append() if user in members: - self.userStore.set_value(iter, 0, gtk.TRUE) + self.userStore.set_value(iter, 0, True) self.userStore.set_value(iter, 1, user) else: - self.userStore.set_value(iter, 0, gtk.FALSE) + self.userStore.set_value(iter, 0, False) self.userStore.set_value(iter, 1, user) --- system-config-users-1.2.28/src/helpers/deleteUserGui.py~ 2005-04-01 14:39:37.717372320 +1000 +++ system-config-users-1.2.28/src/helpers/deleteUserGui.py 2005-04-01 14:39:43.213536776 +1000 @@ -81,15 +81,15 @@ class DeleteUserGui: internalVBox.set_spacing(10) titleHBox = gtk.HBox() - titleHBox.pack_start(pixmap, gtk.FALSE) + titleHBox.pack_start(pixmap, False) label = gtk.Label("") label.set_markup("%s" % (_("Choose the account you wish to delete."))) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.5) - titleHBox.pack_start(label, gtk.TRUE) - internalVBox.pack_start(titleHBox, gtk.FALSE, gtk.TRUE) + titleHBox.pack_start(label, True) + internalVBox.pack_start(titleHBox, False, True) self.userStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) self.userStore.set_sort_column_id(0, gtk.SORT_ASCENDING) @@ -104,7 +104,7 @@ class DeleteUserGui: self.userView = gtk.TreeView(self.userStore) col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0) self.userView.append_column(col) - self.userView.set_property("headers-visible", gtk.FALSE) + self.userView.set_property("headers-visible", False) self.userView.get_selection().set_mode(gtk.SELECTION_BROWSE) self.userViewSW = gtk.ScrolledWindow() @@ -112,7 +112,7 @@ class DeleteUserGui: self.userViewSW.set_shadow_type(gtk.SHADOW_IN) self.userViewSW.add(self.userView) - internalVBox.pack_start(self.userViewSW, gtk.TRUE, 15) + internalVBox.pack_start(self.userViewSW, True, 15) #Remove the hsep from the dialog. It's ugly hsep = self.mainWindow.get_children()[0].get_children()[0] @@ -137,13 +137,13 @@ class DeleteUserGui: text = _("The user '%s' is about to be removed. Are you sure you want to do this?" % user) dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, text) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_icon(iconPixbuf) homeDirCheckButton = None if os.access(homeDir, os.W_OK): #Only show this wiget if the homeDir exists in the first place homeDirCheckButton = gtk.CheckButton("Delete %s's home directory" % user) - homeDirCheckButton.set_active(gtk.TRUE) + homeDirCheckButton.set_active(True) homeDirCheckButton.set_border_width(5) dlg.vbox.pack_start(homeDirCheckButton) dlg.show_all() --- system-config-users-1.2.28/src/helpers/userListGui.py~ 2005-04-01 14:39:50.094490712 +1000 +++ system-config-users-1.2.28/src/helpers/userListGui.py 2005-04-01 14:39:53.738936672 +1000 @@ -67,18 +67,18 @@ class UserListGui: self.nextButton = self.mainWindow.add_button('gtk-go-forward', 1) self.nextButton.connect("clicked", self.nextClicked) - self.nextButton.set_sensitive(gtk.FALSE) + self.nextButton.set_sensitive(False) self.backButton = self.mainWindow.add_button('gtk-go-back', 2) self.backButton.connect("clicked", self.backClicked) self.finishButton = self.mainWindow.add_button('gtk-go-forward', 2) label = self.finishButton.get_children()[0].get_children()[0].get_children()[1] label.set_text(_("_Finish")) - label.set_property("use_underline", gtk.TRUE) + label.set_property("use_underline", True) self.finishButton.connect("clicked", self.finishClicked) self.notebook = gtk.Notebook() - self.notebook.set_show_tabs(gtk.FALSE) - self.notebook.set_show_border(gtk.FALSE) + self.notebook.set_show_tabs(False) + self.notebook.set_show_border(False) #Add icon to the top frame if iconPixbuf: @@ -91,15 +91,15 @@ class UserListGui: self.userListVBox.set_spacing(10) titleHBox = gtk.HBox() - titleHBox.pack_start(pixmap, gtk.FALSE) + titleHBox.pack_start(pixmap, False) label = gtk.Label("") label.set_markup("%s" % (_("Choose the account you wish to change."))) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.5) - titleHBox.pack_start(label, gtk.TRUE) - self.userListVBox.pack_start(titleHBox, gtk.FALSE, gtk.TRUE) + titleHBox.pack_start(label, True) + self.userListVBox.pack_start(titleHBox, False, True) self.userStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) self.userStore.set_sort_column_id(0, gtk.SORT_ASCENDING) @@ -116,7 +116,7 @@ class UserListGui: col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0) self.userView.append_column(col) - self.userView.set_property("headers-visible", gtk.FALSE) + self.userView.set_property("headers-visible", False) self.userView.get_selection().set_mode(gtk.SELECTION_BROWSE) self.userViewSW = gtk.ScrolledWindow() @@ -124,7 +124,7 @@ class UserListGui: self.userViewSW.set_shadow_type(gtk.SHADOW_IN) self.userViewSW.add(self.userView) - self.userListVBox.pack_start(self.userViewSW, gtk.TRUE, 15) + self.userListVBox.pack_start(self.userViewSW, True, 15) self.notebook.append_page(self.userListVBox, gtk.Label("")) @@ -137,28 +137,28 @@ class UserListGui: titleHBox = gtk.HBox() - titleHBox.pack_start(pixmap, gtk.FALSE) + titleHBox.pack_start(pixmap, False) label = gtk.Label("") label.set_markup("%s" % (_("Blah foo."))) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.5) - titleHBox.pack_start(label, gtk.TRUE) - self.editUserVBox.pack_start(titleHBox, gtk.FALSE, gtk.TRUE) + titleHBox.pack_start(label, True) + self.editUserVBox.pack_start(titleHBox, False, True) self.usernameEntry = gtk.Entry() self.fullnameEntry = gtk.Entry() table = gtk.Table(2, 4) label = gtk.Label(_("_Username:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.usernameEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 0, 1, gtk.FILL) table.attach(self.usernameEntry, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL, 5, 5) label = gtk.Label(_("Full Nam_e:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.fullnameEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 1, 2, gtk.FILL) @@ -169,7 +169,7 @@ class UserListGui: align.add(self.passwordButton) table.attach(align, 1, 2, 3, 4, gtk.FILL, gtk.FILL, 5, 5) - self.editUserVBox.pack_start(table, gtk.TRUE) + self.editUserVBox.pack_start(table, True) self.notebook.append_page(self.editUserVBox, gtk.Label("")) #Remove the hsep from the dialog. It's ugly @@ -214,6 +214,6 @@ class UserListGui: object, data = self.userView.get_selection().get_selected() if data == None: - self.nextButton.set_sensitive(gtk.FALSE) + self.nextButton.set_sensitive(False) else: - self.nextButton.set_sensitive(gtk.TRUE) + self.nextButton.set_sensitive(True) --- system-config-users-1.2.28/src/helpers/userHelperGui.py~ 2005-04-01 14:40:01.937690272 +1000 +++ system-config-users-1.2.28/src/helpers/userHelperGui.py 2005-04-01 14:40:06.356018584 +1000 @@ -64,9 +64,9 @@ class UserHelperGui: self.usernameEntry = gtk.Entry() self.fullnameEntry = gtk.Entry() self.passwordEntry = gtk.Entry() - self.passwordEntry.set_visibility(gtk.FALSE) + self.passwordEntry.set_visibility(False) self.confirmEntry = gtk.Entry() - self.confirmEntry.set_visibility(gtk.FALSE) + self.confirmEntry.set_visibility(False) #Add icon to the top frame if iconPixbuf: @@ -78,7 +78,7 @@ class UserHelperGui: internalVBox.set_spacing(10) titleHBox = gtk.HBox() - titleHBox.pack_start(pixmap, gtk.FALSE) + titleHBox.pack_start(pixmap, False) self.titleLabel = gtk.Label("") self.titleLabel.set_markup("%s" % (_("Create a new user account"))) @@ -86,47 +86,47 @@ class UserHelperGui: # str = (_("Edit %s's account") % user) # self.titleLabel.set_markup("%s" % (str)) - self.titleLabel.set_line_wrap(gtk.TRUE) + self.titleLabel.set_line_wrap(True) self.titleLabel.set_alignment(0.0, 0.5) - titleHBox.pack_start(self.titleLabel, gtk.TRUE) - internalVBox.pack_start(titleHBox, gtk.FALSE, gtk.TRUE) + titleHBox.pack_start(self.titleLabel, True) + internalVBox.pack_start(titleHBox, False, True) label = gtk.Label(_("To create a new user account, enter the " "username, full name, and password for the new user.")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.5) - internalVBox.pack_start(label, gtk.FALSE) + internalVBox.pack_start(label, False) table = gtk.Table(2, 4) label = gtk.Label(_("_Username:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.usernameEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 0, 1, gtk.FILL) table.attach(self.usernameEntry, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL, 5, 5) label = gtk.Label(_("Full Nam_e:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.fullnameEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 1, 2, gtk.FILL) table.attach(self.fullnameEntry, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL, 5, 5) label = gtk.Label(_("_Password:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.passwordEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 2, 3, gtk.FILL) table.attach(self.passwordEntry, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL, 5, 5) label = gtk.Label(_("Confir_m Password:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.confirmEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 3, 4, gtk.FILL) table.attach(self.confirmEntry, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL, 5, 5) - internalVBox.pack_start(table, gtk.FALSE, 15) + internalVBox.pack_start(table, False, 15) return internalVBox def __init__(self): --- system-config-users-1.2.28/src/selinux.py~ 2005-04-01 14:40:11.287268920 +1000 +++ system-config-users-1.2.28/src/selinux.py 2005-04-01 14:40:19.579008384 +1000 @@ -30,8 +30,8 @@ class properties: self.selinux_enabled = (self.initAvailableRoles() == 0) if not self.selinux_enabled: - self.rolesCheckbox.set_active(gtk.FALSE) - self.rolesCheckbox.set_sensitive(gtk.FALSE) + self.rolesCheckbox.set_active(False) + self.rolesCheckbox.set_sensitive(False) self.assignedRolesTreeView = xml.get_widget('assignedRolesTreeview') self.setupTreeview(self.assignedRolesTreeView,self.removeRole) @@ -47,7 +47,7 @@ class properties: model.clear() (status,msg)=commands.getstatusoutput("seuser show users %s" % user) if status==0: - self.rolesCheckbox.set_active(gtk.TRUE) + self.rolesCheckbox.set_active(True) rolestring=msg.strip().split(":")[1] roles=rolestring.split() roles.sort() @@ -55,7 +55,7 @@ class properties: iter = model.append() model.set (iter, 0, role) else: - self.rolesCheckbox.set_active(gtk.FALSE) + self.rolesCheckbox.set_active(False) def initAvailableRoles(self): model = self.availableRolesTreeView.get_model () --- system-config-users-1.2.28/src/groupWindow.py~ 2005-04-01 14:40:45.261104112 +1000 +++ system-config-users-1.2.28/src/groupWindow.py 2005-04-01 14:40:53.200897080 +1000 @@ -60,17 +60,17 @@ class groupWindow: xml.signal_connect("on_gidCheckButton_toggled", self.on_gidCheckButton_toggled) def busy(self): - self.groupWin.set_sensitive(gtk.FALSE) + self.groupWin.set_sensitive(False) self.groupWin.window.set_cursor(busy_cursor) def ready(self): self.groupWin.window.set_cursor(ready_cursor) - self.groupWin.set_sensitive(gtk.TRUE) + self.groupWin.set_sensitive(True) def groupWinReset(self): self.groupWinGroupName.grab_focus() self.groupWinGroupName.set_text("") - self.gidCheckButton.set_active(gtk.FALSE) + self.gidCheckButton.set_active(False) self.gidSpinButton.set_value(500) def newGroupWin(self): @@ -81,7 +81,7 @@ class groupWindow: def on_groupWin_cancel_button_clicked(self, *args): self.groupWinReset() self.groupWin.hide() - return gtk.TRUE + return True def on_gidCheckButton_toggled(self, *args): self.gidBox.set_sensitive(self.gidCheckButton.get_active()) @@ -114,7 +114,7 @@ class groupWindow: groupEnt = self.parent.ADMIN.initGroup(groupName) cn = groupEnt.get(libuser.GROUPNAME)[0] - if self.gidCheckButton.get_active() == gtk.TRUE: + if self.gidCheckButton.get_active() == True: gidNumber = int(self.gidSpinButton.get_value()) gid = self.parent.ADMIN.lookupGroupById(gidNumber) @@ -131,7 +131,7 @@ class groupWindow: "Are you sure you want to do this?"))) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(mainWindow.iconPixbuf) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.show_all() result = dlg.run() self.ready() --- system-config-users-1.2.28/src/mainWindow.py~ 2005-04-01 14:42:08.326476256 +1000 +++ system-config-users-1.2.28/src/mainWindow.py 2005-04-01 14:42:13.189736928 +1000 @@ -89,7 +89,7 @@ def admin_prompt_callback(prompts, title for (prompt, entry) in ret_list: prompt.value = entry.get_text() dialog.destroy() - return gtk.TRUE + return True sys.exit(1) @@ -121,7 +121,7 @@ class mainWindow: def destroy (self, *args): settings = '/etc/sysconfig/system-config-users' - filterLineFound = gtk.FALSE + filterLineFound = False try: fd = open(settings, 'w') @@ -133,15 +133,15 @@ class mainWindow: else: tokens = string.split(line, '=') if tokens[0] == 'FILTER': - filterLineFound = gtk.TRUE - if self.filterSystemUsers == gtk.TRUE: + filterLineFound = True + if self.filterSystemUsers == True: fd.write("FILTER=true\n") else: fd.write("FILTER=false\n") - if filterLineFound == gtk.FALSE: + if filterLineFound == False: #For some reason, the config file is messed up. Let's write out a new FILTER line - if self.filterSystemUsers == gtk.TRUE: + if self.filterSystemUsers == True: fd.write("FILTER=true\n") else: fd.write("FILTER=false\n") @@ -183,57 +183,57 @@ class mainWindow: gobject.TYPE_PYOBJECT) self.userStore.set_sort_column_id(1, gtk.SORT_ASCENDING) self.userTreeView = xml.get_widget('user_view') - self.userTreeView.set_rules_hint(gtk.TRUE) + self.userTreeView.set_rules_hint(True) self.userTreeView.set_model(self.userStore) self.userTreeView.get_selection().connect("changed", self.itemSelected) self.userTreeView.connect("row_activated", self.rowActivated) col = gtk.TreeViewColumn(_("User Name"), gtk.CellRendererText(), text=0) col.set_sort_column_id(0) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.userTreeView.append_column(col) col = gtk.TreeViewColumn(_("User ID"), gtk.CellRendererText(), text=1) col.set_sort_column_id(1) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.userTreeView.append_column(col) col = gtk.TreeViewColumn(_("Primary Group"), gtk.CellRendererText(), text=2) col.set_sort_column_id(2) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.userTreeView.append_column(col) col = gtk.TreeViewColumn(_("Full Name"), gtk.CellRendererText(), text=3) col.set_sort_column_id(3) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.userTreeView.append_column(col) col = gtk.TreeViewColumn(_("Login Shell"), gtk.CellRendererText(), text=4) col.set_sort_column_id(4) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.userTreeView.append_column(col) col = gtk.TreeViewColumn(_("Home Directory"), gtk.CellRendererText(), text=5) col.set_sort_column_id(5) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.userTreeView.append_column(col) - self.userTreeView.set_property("headers-visible", gtk.TRUE) + self.userTreeView.set_property("headers-visible", True) self.groupStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) self.groupStore.set_sort_column_id(1, gtk.SORT_ASCENDING) self.groupTreeView = xml.get_widget('group_view') - self.groupTreeView.set_rules_hint(gtk.TRUE) + self.groupTreeView.set_rules_hint(True) self.groupTreeView.set_model(self.groupStore) self.groupTreeView.get_selection().connect("changed", self.itemSelected) self.groupTreeView.connect("row_activated", self.rowActivated) col = gtk.TreeViewColumn(_("Group Name"), gtk.CellRendererText(), text=0) col.set_sort_column_id(0) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.groupTreeView.append_column(col) col = gtk.TreeViewColumn(_("Group ID"), gtk.CellRendererText(), text=1) col.set_sort_column_id(1) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.groupTreeView.append_column(col) col = gtk.TreeViewColumn(_("Group Members"), gtk.CellRendererText(), text=2) - col.set_resizable(gtk.TRUE) + col.set_resizable(True) self.groupTreeView.append_column(col) self.notebook = xml.get_widget('notebook1') @@ -286,7 +286,7 @@ class mainWindow: def readPreferencesFile(self): self.configFile = None - self.filterSystemUsers = gtk.FALSE + self.filterSystemUsers = False try: fd = open('/etc/sysconfig/system-config-users', 'r') self.configFile = fd.readlines() @@ -298,24 +298,24 @@ class mainWindow: tokens = string.split(line, '=') if tokens[0] == "FILTER": if tokens[1] == "true": - self.filterSystemUsers = gtk.TRUE + self.filterSystemUsers = True else: - self.filterSystemUsers = gtk.FALSE + self.filterSystemUsers = False except: - #no config file found. assume default as gtk.TRUE - self.filterSystemUsers = gtk.FALSE + #no config file found. assume default as True + self.filterSystemUsers = False def on_exit_activate(self, args): self.destroy() def busy(self): - self.toplevel.set_sensitive(gtk.FALSE) + self.toplevel.set_sensitive(False) self.toplevel.window.set_cursor(busy_cursor) pass def ready(self): self.toplevel.window.set_cursor(ready_cursor) - self.toplevel.set_sensitive(gtk.TRUE) + self.toplevel.set_sensitive(True) pass def get_user_list (self, filter): @@ -452,7 +452,7 @@ class mainWindow: self.refresh_users() self.refresh_groups() self.populate_lists() - self.toggleWidgets(gtk.FALSE) + self.toggleWidgets(False) self.ready() def populate_user_list(self): @@ -484,7 +484,7 @@ class mainWindow: #Convert the user fullName into unicode so pygtk2 doesn't truncate strings gecos = unicode (gecos, 'utf-8') - if self.filterSystemUsers == gtk.TRUE: + if self.filterSystemUsers == True: #display users with UIDs > 499 if long (uidNumber) > 499L and not (uid == "nfsnobody" and (long (uidNumber) == 65534L or long (uidNumber) == 4294967294L)): iter = self.userStore.append() @@ -524,7 +524,7 @@ class mainWindow: #concatenate the list of members in the group into a comma separated list memberlist = string.join(members, ", ") - if self.filterSystemUsers == gtk.TRUE: + if self.filterSystemUsers == True: #display groups with UIDs > 499 if long (gid) > 499 and not (cn == "nfsnobody" and (long (gid) == 65534L or long (gid) == 4294967294L)): iter = self.groupStore.append() @@ -618,7 +618,7 @@ class mainWindow: if uid == 0: dlg = gtk.MessageDialog (None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, _("Deleting the root user is not allowed.")) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal (gtk.TRUE) + dlg.set_modal (True) dlg.set_icon (iconPixbuf) dlg.run () dlg.destroy () @@ -644,22 +644,22 @@ class mainWindow: dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, (processes_running_text + text)) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_icon(iconPixbuf) - dlg.label.set_use_markup (gtk.TRUE) + dlg.label.set_use_markup (True) filesDeleteCheckButton = None if len (errMsgs) == 0: filesDeleteText = _("Delete %s's home directory ('%s') and temporary files.") % (user, homeDir) if os.access (mailSpool, os.W_OK) and os.stat (mailSpool).st_uid == uid: filesDeleteText = _("Delete %s's home directory ('%s'), mail spool ('%s') and temporary files.") % (user, homeDir, mailSpool) filesDeleteCheckButton = gtk.CheckButton (filesDeleteText) - filesDeleteCheckButton.set_active(gtk.TRUE) + filesDeleteCheckButton.set_active(True) filesDeleteCheckButton.set_border_width(5) - filesDeleteCheckButton.get_child().set_line_wrap (gtk.TRUE) + filesDeleteCheckButton.get_child().set_line_wrap (True) dlg.vbox.pack_start(filesDeleteCheckButton) else: errLabel = gtk.Label (_("I won't delete %s's home directory ('%s') because:\n%s") % (user, homeDir, string.join (errMsgs, "\n"))) - errLabel.set_line_wrap (gtk.TRUE) + errLabel.set_line_wrap (True) dlg.vbox.pack_start (errLabel) dlg.show_all() @@ -774,9 +774,9 @@ class mainWindow: object, data = self.groupTreeView.get_selection().get_selected() if data == None: - self.toggleWidgets(gtk.FALSE) + self.toggleWidgets(False) else: - self.toggleWidgets(gtk.TRUE) + self.toggleWidgets(True) def changeNotebookPage(self, *args): # When the user changes a notebook page, unselect all the choices on both the user and group lists @@ -788,7 +788,7 @@ class mainWindow: elif page == 1: self.userTreeView.get_selection().unselect_all() - self.toggleWidgets(gtk.FALSE) + self.toggleWidgets(False) def toggleWidgets(self, value): self.properties_button.set_sensitive(value) @@ -811,11 +811,11 @@ class mainWindow: return filter def on_filter_activate(self, *args): - if self.filterCheckMenu.get_active() == gtk.TRUE: - self.filterSystemUsers = gtk.TRUE + if self.filterCheckMenu.get_active() == True: + self.filterSystemUsers = True self.populate_lists() else: - self.filterSystemUsers = gtk.FALSE + self.filterSystemUsers = False self.populate_lists() def rmrf(self, path): --- system-config-users-1.2.28/src/messageDialog.py~ 2005-04-01 14:42:19.930712144 +1000 +++ system-config-users-1.2.28/src/messageDialog.py 2005-04-01 14:42:24.514015376 +1000 @@ -25,7 +25,7 @@ import mainWindow def show_message_dialog(text): dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, text) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_icon(mainWindow.iconPixbuf) dlg.run() dlg.destroy() @@ -33,7 +33,7 @@ def show_message_dialog(text): def show_confirm_dialog(text): dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, text) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_icon(mainWindow.iconPixbuf) rc = dlg.run() dlg.destroy()