--- system-config-samba-1.2.28/src/addUserWin.py~ 2005-04-01 14:51:59.184652160 +1000 +++ system-config-samba-1.2.28/src/addUserWin.py 2005-04-01 14:52:03.888937000 +1000 @@ -102,7 +102,7 @@ class AddUserWin: if self.handler: self.add_user_ok_button.disconnect(self.handler) self.handler = None - self.user_option_menu.set_sensitive(gtk.TRUE) + self.user_option_menu.set_sensitive(True) self.user_option_menu.set_history(0) self.windows_user_entry.set_text("") self.password_entry.set_text("") @@ -116,7 +116,7 @@ class AddUserWin: if password != confirm: dlg = gtk.MessageDialog (None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, _("The passwords do not match. Please try again.")) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.add_user_win) dlg.set_icon(mainWindow.iconPixbuf) dlg.show_all() @@ -147,7 +147,7 @@ class AddUserWin: if string.strip(windows_name) == "": dlg = gtk.MessageDialog (None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, (_("Please enter a Windows username."))) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.add_user_win) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(mainWindow.iconPixbuf) @@ -159,7 +159,7 @@ class AddUserWin: elif password != confirm or password == "" or confirm == "": dlg = gtk.MessageDialog (None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, (_("The passwords do not match. Please try again."))) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.add_user_win) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(mainWindow.iconPixbuf) @@ -173,7 +173,7 @@ class AddUserWin: elif self.samba_user_data.userAlreadyExists(unix_name): dlg = gtk.MessageDialog (None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, (_("An account for this user already exists. Please try again."))) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.add_user_win) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(mainWindow.iconPixbuf) @@ -199,4 +199,4 @@ class AddUserWin: self.user_label = None self.add_user_win.hide() - return gtk.TRUE + return True --- system-config-samba-1.2.28/src/sambaUserWin.py~ 2005-04-01 14:52:11.829729816 +1000 +++ system-config-samba-1.2.28/src/sambaUserWin.py 2005-04-01 14:52:15.975099624 +1000 @@ -43,7 +43,7 @@ class SambaUserWin: self.add_user_win = addUserWin.AddUserWin(self, self.samba_user_data, xml) self.samba_user_win = xml.get_widget("user_win") - self.samba_user_win.set_modal(gtk.TRUE) + self.samba_user_win.set_modal(True) self.samba_user_win.set_transient_for(main_window) self.samba_user_win.connect("delete-event", self.onUsersCancelButtonClicked) self.samba_user_win.set_icon(mainWindow.iconPixbuf) @@ -57,14 +57,14 @@ class SambaUserWin: self.user_view = gtk.TreeView(self.user_store) self.user_view.get_selection().connect("changed", self.rowActivated) - self.user_view.set_rules_hint(gtk.TRUE) + self.user_view.set_rules_hint(True) self.user_view_sw = gtk.ScrolledWindow() self.user_view_sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) self.user_view_sw.set_shadow_type(gtk.SHADOW_IN) self.user_view_sw.add(self.user_view) col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0) - self.user_view.set_headers_visible(gtk.FALSE) + self.user_view.set_headers_visible(False) self.user_view.append_column(col) self.list_box.pack_start(self.user_view_sw) @@ -99,16 +99,16 @@ class SambaUserWin: def rowActivated(self, *args): object, data = self.user_view.get_selection().get_selected() if data: - self.edit_button.set_sensitive(gtk.TRUE) - self.delete_button.set_sensitive(gtk.TRUE) + self.edit_button.set_sensitive(True) + self.delete_button.set_sensitive(True) else: - self.edit_button.set_sensitive(gtk.FALSE) - self.delete_button.set_sensitive(gtk.FALSE) + self.edit_button.set_sensitive(False) + self.delete_button.set_sensitive(False) def reset(self): self.user_view.get_selection().unselect_all() - self.edit_button.set_sensitive(gtk.FALSE) - self.delete_button.set_sensitive(gtk.FALSE) + self.edit_button.set_sensitive(False) + self.delete_button.set_sensitive(False) def onUsersOkButtonClicked(self, *args): found = None @@ -128,7 +128,7 @@ class SambaUserWin: def onUsersCancelButtonClicked(self, *args): self.samba_user_win.hide() - return gtk.TRUE + return True def onAddUserButtonClicked(self, *args): self.add_user_win.showAddWindow() --- system-config-samba-1.2.28/src/mainWindow.py~ 2005-04-01 14:52:23.797910376 +1000 +++ system-config-samba-1.2.28/src/mainWindow.py 2005-04-01 14:52:28.627176216 +1000 @@ -91,11 +91,11 @@ class MainWindow: self.basic_preferences_win = basicPreferencesWin.BasicPreferencesWin(self, self.xml, self.samba_data, self.samba_backend, self.main_window) self.share_win = shareWindow.ShareWindow(self, self.xml, self.samba_data, self.samba_user_data, self.samba_backend, self.main_window) - self.toplevel_vbox = gtk.VBox(gtk.FALSE) + self.toplevel_vbox = gtk.VBox(False) self.menu_bar = gtk.MenuBar() self.share_view = gtk.TreeView(self.share_store) - self.share_view.set_rules_hint(gtk.TRUE) + self.share_view.set_rules_hint(True) self.share_view.columns_autosize() self.share_view_sw = gtk.ScrolledWindow() self.share_view_sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) @@ -147,22 +147,22 @@ class MainWindow: button = self.toolbar.insert_stock('gtk-add', _("Add a samba share"), None, self.onNewButtonClicked, None, 0) image, label = button.get_children()[0].get_children() label.set_text(_("_Add")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) self.properties_button = self.toolbar.insert_stock('gtk-properties', _("Edit the properties of the selected directory"), None, self.onPropertiesButtonClicked, None, 1) image, label = self.properties_button.get_children()[0].get_children() label.set_text(_("P_roperties")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) self.delete_button = self.toolbar.insert_stock('gtk-delete', _("Delete the selected directory"), None, self.onDeleteButtonClicked, None, 2) image, label = self.delete_button.get_children()[0].get_children() label.set_text(_("_Delete")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) self.toolbar.insert_stock('gtk-help', _("View help"), None, self.onHelpClicked, None, 3) - self.toplevel_vbox.pack_start(self.menu_bar, gtk.FALSE) - self.toplevel_vbox.pack_start(self.toolbar, gtk.FALSE) + self.toplevel_vbox.pack_start(self.menu_bar, False) + self.toplevel_vbox.pack_start(self.toolbar, False) else: ui_string = """ @@ -220,19 +220,19 @@ class MainWindow: self.toplevel_vbox.pack_start(self.main_window.ui.get_widget('/Menubar'), expand=False) self.toplevel_vbox.pack_start(self.main_window.ui.get_widget('/Toolbar'), expand=False) - self.properties_button.set_sensitive(gtk.FALSE) - self.delete_button.set_sensitive(gtk.FALSE) - self.propertiesMenu.set_sensitive(gtk.FALSE) - self.deleteMenu.set_sensitive(gtk.FALSE) + self.properties_button.set_sensitive(False) + self.delete_button.set_sensitive(False) + self.propertiesMenu.set_sensitive(False) + self.deleteMenu.set_sensitive(False) #-------------------Packing--------------------# - self.toplevel_vbox.pack_start(self.share_view_sw, gtk.TRUE) + self.toplevel_vbox.pack_start(self.share_view_sw, True) self.main_window.add(self.toplevel_vbox) self.main_window.set_default_size(600, 400) self.main_window.set_size_request(600, 200) self.selected_row = -1 - self.changed = gtk.FALSE + self.changed = False self.create_handler = None self.modify_handler = None @@ -303,18 +303,18 @@ class MainWindow: def onShareListSelectRow(self, *args): store, iter = self.share_view.get_selection().get_selected() if iter: - self.properties_button.set_sensitive(gtk.TRUE) - self.delete_button.set_sensitive(gtk.TRUE) - self.propertiesMenu.set_sensitive(gtk.TRUE) - self.deleteMenu.set_sensitive(gtk.TRUE) + self.properties_button.set_sensitive(True) + self.delete_button.set_sensitive(True) + self.propertiesMenu.set_sensitive(True) + self.deleteMenu.set_sensitive(True) else: - self.properties_button.set_sensitive(gtk.FALSE) - self.delete_button.set_sensitive(gtk.FALSE) - self.propertiesMenu.set_sensitive(gtk.FALSE) - self.deleteMenu.set_sensitive(gtk.FALSE) + self.properties_button.set_sensitive(False) + self.delete_button.set_sensitive(False) + self.propertiesMenu.set_sensitive(False) + self.deleteMenu.set_sensitive(False) def onNewButtonClicked(self, *args): - self.changed = gtk.TRUE + self.changed = True self.share_win.showNewWindow() def onShareListActivate (self, *args): @@ -324,14 +324,14 @@ class MainWindow: self.showPropertiesDialog () def showPropertiesDialog (self): - self.changed = gtk.TRUE + self.changed = True store, iter = self.share_view.get_selection ().get_selected () if iter != None: section = self.share_store.get_value (iter, 5) self.share_win.showEditWindow (iter, section) def onDeleteButtonClicked(self, *args): - self.changed = gtk.TRUE + self.changed = True store, iter = self.share_view.get_selection().get_selected() @@ -342,23 +342,23 @@ class MainWindow: #print "after delete" self.share_store.remove(iter) - self.properties_button.set_sensitive(gtk.FALSE) - self.delete_button.set_sensitive(gtk.FALSE) - self.propertiesMenu.set_sensitive(gtk.FALSE) - self.deleteMenu.set_sensitive(gtk.FALSE) + self.properties_button.set_sensitive(False) + self.delete_button.set_sensitive(False) + self.propertiesMenu.set_sensitive(False) + self.deleteMenu.set_sensitive(False) #Let's go ahead and restart the service. self.samba_data.writeFile() self.samba_backend.restartSamba() def onApplyButtonClicked(self, *args): - self.changed = gtk.TRUE + self.changed = True self.samba_data.writeFile() - self.properties_button.set_sensitive(gtk.FALSE) - self.delete_button.set_sensitive(gtk.FALSE) - self.propertiesMenu.set_sensitive(gtk.FALSE) - self.deleteMenu.set_sensitive(gtk.FALSE) + self.properties_button.set_sensitive(False) + self.delete_button.set_sensitive(False) + self.propertiesMenu.set_sensitive(False) + self.deleteMenu.set_sensitive(False) self.share_view.get_selection().unselect_all() status = self.samba_backend.isSmbRunning() @@ -372,7 +372,7 @@ class MainWindow: "wish to start it?"))) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(iconPixbuf) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.main_window) result = dlg.run() dlg.destroy() @@ -431,7 +431,7 @@ class MainWindow: dlg.set_default_size(100, 100) dlg.set_position (gtk.WIN_POS_CENTER) dlg.set_border_width(2) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.main_window) dlg.set_icon(iconPixbuf) rc = dlg.run() --- system-config-samba-1.2.28/src/sambaUserData.py~ 2005-04-01 14:52:39.170573376 +1000 +++ system-config-samba-1.2.28/src/sambaUserData.py 2005-04-01 14:52:42.945999424 +1000 @@ -98,7 +98,7 @@ class SambaUserData: dlg = gtk.MessageDialog(self.ParentClass.main_window, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, (_("Cannot write to %s. Program will now exit." % path))) 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() @@ -123,7 +123,7 @@ class SambaUserData: dlg = gtk.MessageDialog(self.ParentClass.main_window, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, (_("Cannot write to %s. Program will now exit." % path))) 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() --- system-config-samba-1.2.28/src/sambaParser.py~ 2005-04-01 14:54:07.337170016 +1000 +++ system-config-samba-1.2.28/src/sambaParser.py 2005-04-01 14:54:11.444545600 +1000 @@ -198,7 +198,7 @@ class SambaParser: dlg = gtk.MessageDialog(self.ParentClass.main_window, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, (_("Cannot read %s. Program will now exit." % path))) 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() @@ -284,7 +284,7 @@ class SambaParser: else: dlg = gtk.MessageDialog(self.ParentClass.main_window, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, (_("Cannot write to %s. Program will now exit." % path))) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_icon(mainWindow.iconPixbuf) dlg.set_position(gtk.WIN_POS_CENTER) dlg.run() --- system-config-samba-1.2.28/src/basicPreferencesWin.py~ 2005-04-01 14:54:18.565463056 +1000 +++ system-config-samba-1.2.28/src/basicPreferencesWin.py 2005-04-01 14:54:22.441873752 +1000 @@ -43,7 +43,7 @@ class BasicPreferencesWin: self.basic_notebook = xml.get_widget("basic_notebook") self.basic_preferences_win = xml.get_widget("basic_preferences_win") - self.basic_preferences_win.set_modal(gtk.TRUE) + self.basic_preferences_win.set_modal(True) self.basic_preferences_win.set_transient_for(main_window) self.basic_preferences_win.connect("delete-event", self.onBasicCancelButtonClicked) self.basic_preferences_win.set_icon(mainWindow.iconPixbuf) @@ -257,7 +257,7 @@ class BasicPreferencesWin: def onBasicCancelButtonClicked(self, *args): self.basic_preferences_win.hide() - return gtk.TRUE + return True def checkForWorkgroup(self, workgroup): if string.strip(workgroup) == "": @@ -271,27 +271,27 @@ class BasicPreferencesWin: #Let's enable/disable the auth_server_entry if type == "SERVER" or type == "DOMAIN": #allow password server if using 'server' or 'domain' - self.auth_server_entry.set_sensitive(gtk.TRUE) - self.ads_realm_entry.set_sensitive(gtk.FALSE) + self.auth_server_entry.set_sensitive(True) + self.ads_realm_entry.set_sensitive(False) elif type == "ADS": #allow password server and realm server if using 'ads' - self.auth_server_entry.set_sensitive(gtk.TRUE) - self.ads_realm_entry.set_sensitive(gtk.TRUE) + self.auth_server_entry.set_sensitive(True) + self.ads_realm_entry.set_sensitive(True) else: - self.auth_server_entry.set_sensitive(gtk.FALSE) - self.ads_realm_entry.set_sensitive(gtk.FALSE) + self.auth_server_entry.set_sensitive(False) + self.ads_realm_entry.set_sensitive(False) #Must force encrypted passwords with 'domain' if type == "DOMAIN": self.encrypt_option_menu.set_history(0) - self.encrypt_option_menu.set_sensitive(gtk.FALSE) + self.encrypt_option_menu.set_sensitive(False) else: - self.encrypt_option_menu.set_sensitive(gtk.TRUE) + self.encrypt_option_menu.set_sensitive(True) def showMessageDialog(self, text): dlg = gtk.MessageDialog(self.basic_preferences_win, 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_transient_for(self.basic_preferences_win) dlg.set_icon(mainWindow.iconPixbuf) dlg.run() --- system-config-samba-1.2.28/src/shareWindow.py~ 2005-04-01 14:54:31.041566400 +1000 +++ system-config-samba-1.2.28/src/shareWindow.py 2005-04-01 14:54:35.212932256 +1000 @@ -44,7 +44,7 @@ class ShareWindow: self.samba_sections_dict = samba_data.sections_dict self.share_window = xml.get_widget("share_win") - self.share_window.set_modal(gtk.TRUE) + self.share_window.set_modal(True) self.share_window.set_transient_for(main_window) self.share_window.connect("delete-event", self.onCancelButtonClicked) self.share_window.set_position(gtk.WIN_POS_CENTER) @@ -79,7 +79,7 @@ class ShareWindow: self.checkbox = gtk.CellRendererToggle() col = gtk.TreeViewColumn('', self.checkbox, active = 0) col.set_fixed_width(20) - col.set_clickable(gtk.TRUE) + col.set_clickable(True) self.checkbox.connect("toggled", self.userToggled) self.valid_users_treeview.append_column(col) @@ -96,7 +96,7 @@ class ShareWindow: for line in userList: iter = self.valid_users_store.append() tokens = string.split(line, ':') - self.valid_users_store.set_value(iter, 0, gtk.FALSE) + self.valid_users_store.set_value(iter, 0, False) self.valid_users_store.set_value(iter, 1, tokens[0]) def populateUserStoreOnEdit(self, currentUserList, invalidUsers): @@ -110,28 +110,28 @@ class ShareWindow: iter = self.valid_users_store.append() tokens = string.split(line, ':') - if self.guest_access_radio.get_active() == gtk.TRUE: - self.valid_users_store.set_value(iter, 0, gtk.FALSE) + if self.guest_access_radio.get_active() == True: + self.valid_users_store.set_value(iter, 0, False) self.valid_users_store.set_value(iter, 1, tokens[0]) continue if invalidUsers == "%S": #Make all users unselected - self.valid_users_store.set_value(iter, 0, gtk.FALSE) + self.valid_users_store.set_value(iter, 0, False) self.valid_users_store.set_value(iter, 1, tokens[0]) else: #invalidUsers is not "%S" if currentUserList == ['None'] or currentUserList == []: #If no users are specified, assume all are allowed - self.valid_users_store.set_value(iter, 0, gtk.TRUE) + self.valid_users_store.set_value(iter, 0, True) self.valid_users_store.set_value(iter, 1, tokens[0]) else: #Let's see which users are allowed if tokens[0] in currentUserList: - self.valid_users_store.set_value(iter, 0, gtk.TRUE) + self.valid_users_store.set_value(iter, 0, True) self.valid_users_store.set_value(iter, 1, tokens[0]) else: - self.valid_users_store.set_value(iter, 0, gtk.FALSE) + self.valid_users_store.set_value(iter, 0, False) self.valid_users_store.set_value(iter, 1, tokens[0]) def userToggled(self, data, row): @@ -172,21 +172,21 @@ class ShareWindow: writeable = section.getKey ("writeable") if writeable and string.lower (writeable) == "yes": - self.writable_check.set_active (gtk.TRUE) + self.writable_check.set_active (True) else: - self.writable_check.set_active (gtk.FALSE) + self.writable_check.set_active (False) visible = section.getKey ("browsable") if visible and string.lower (visible) == "yes": - self.visible_check.set_active (gtk.TRUE) + self.visible_check.set_active (True) else: - self.visible_check.set_active (gtk.FALSE) + self.visible_check.set_active (False) guest_ok = section.getKey ("guest ok") if guest_ok and string.lower (guest_ok) == "yes": - self.guest_access_radio.set_active(gtk.TRUE) + self.guest_access_radio.set_active(True) else: - self.user_access_radio.set_active(gtk.TRUE) + self.user_access_radio.set_active(True) valid_users = section.getKey ("valid users") if valid_users: @@ -208,9 +208,9 @@ class ShareWindow: self.sharename_entry.set_text ("") self.description_entry.set_text ("") self.valid_users_store.clear () - self.writable_check.set_active (gtk.FALSE) - self.visible_check.set_active (gtk.FALSE) - self.user_access_radio.set_active (gtk.TRUE) + self.writable_check.set_active (False) + self.visible_check.set_active (False) + self.user_access_radio.set_active (True) self.share_window.hide () self.sharenamechanged = 0 @@ -220,7 +220,7 @@ class ShareWindow: (_("You must specify a directory to share. \n\n" "Click \"OK\" to continue."))) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.share_window) dlg.set_icon(mainWindow.iconPixbuf) dlg.run() @@ -235,7 +235,7 @@ class ShareWindow: "an existing directory. \n\n" "Click \"OK\" to continue." % dir))) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.share_window) dlg.set_icon(mainWindow.iconPixbuf) dlg.run() @@ -269,7 +269,7 @@ class ShareWindow: else: dlg.add_button (gtk.STOCK_OK, 1) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.share_window) dlg.set_icon(mainWindow.iconPixbuf) result = dlg.run() @@ -324,20 +324,20 @@ class ShareWindow: while user_iter: #Crawl through the list and see which users are selected all_users.append(self.valid_users_store.get_value(user_iter, 1)) - if self.valid_users_store.get_value(user_iter, 0) == gtk.TRUE: + if self.valid_users_store.get_value(user_iter, 0) == True: selected_users.append(self.valid_users_store.get_value(user_iter, 1)) user_iter = self.valid_users_store.iter_next(user_iter) return (all_users, selected_users) def checkValidUsers (self, all_users, selected_users, section = None): - if self.user_access_radio.get_active() == gtk.TRUE: + if self.user_access_radio.get_active() == True: if selected_users == []: #No users are selected. Make the user choose at least one. dlg = gtk.MessageDialog(self.share_window, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, (_("Please allow access to at least one user."))) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.set_transient_for(self.share_window) dlg.set_icon(mainWindow.iconPixbuf) dlg.run() @@ -362,7 +362,7 @@ class ShareWindow: section.setKey ("valid users", users) section.delKey ("invalid users") - elif section and self.guest_access_radio.get_active() == gtk.TRUE: + elif section and self.guest_access_radio.get_active() == True: section.setKey ("guest ok", "yes") section.delKey ("valid users") section.delKey ("invalid users") @@ -466,7 +466,7 @@ class ShareWindow: self.ParentClass.share_store.set_value (iter, 1, sharename) #set token(s) for permissions - if self.writable_check.get_active() == gtk.FALSE: + if self.writable_check.get_active() == False: self.ParentClass.share_store.set_value(iter, 2, (_("Read Only"))) section.setKey ("read only", "yes") else: @@ -474,14 +474,14 @@ class ShareWindow: section.setKey ("read only", "no") #set token(s) for browsable - if self.visible_check.get_active() == gtk.TRUE: + if self.visible_check.get_active() == True: self.ParentClass.share_store.set_value(iter, 3, (_("Visible"))) section.setKey ("browsable", "yes") else: self.ParentClass.share_store.set_value(iter, 3, (_("Hidden"))) section.setKey ("browsable", "no") - if self.guest_access_radio.get_active() == gtk.TRUE: + if self.guest_access_radio.get_active() == True: #set token for guest access section.setKey ("guest ok", "yes") section.delKey ("valid users") @@ -496,8 +496,8 @@ class ShareWindow: section.setKey ("valid users", users) self.ParentClass.share_store.set_value(iter, 5, section) - self.ParentClass.properties_button.set_sensitive(gtk.FALSE) - self.ParentClass.delete_button.set_sensitive(gtk.FALSE) + self.ParentClass.properties_button.set_sensitive(False) + self.ParentClass.delete_button.set_sensitive(False) self.ParentClass.share_view.get_selection().unselect_all() self.reset() @@ -539,14 +539,14 @@ class ShareWindow: self.ParentClass.share_store.set_value(self.edit_iter, 0, dir) section.setKey ("path", dir) - if self.writable_check.get_active() == gtk.FALSE: + if self.writable_check.get_active() == False: self.ParentClass.share_store.set_value(self.edit_iter, 2, (_("Read Only"))) section.setKey ("writeable", "no") else: self.ParentClass.share_store.set_value(self.edit_iter, 2, (_("Read/Write"))) section.setKey ("writeable", "yes") - if self.visible_check.get_active() == gtk.TRUE: + if self.visible_check.get_active() == True: self.ParentClass.share_store.set_value(self.edit_iter, 3, (_("Visible"))) section.setKey ("browsable", "yes") else: @@ -567,8 +567,8 @@ class ShareWindow: self.ParentClass.share_store.set_value(self.edit_iter, 4, description) section.setKey ("comment", description) - self.ParentClass.properties_button.set_sensitive(gtk.FALSE) - self.ParentClass.delete_button.set_sensitive(gtk.FALSE) + self.ParentClass.properties_button.set_sensitive(False) + self.ParentClass.delete_button.set_sensitive(False) self.ParentClass.share_view.get_selection().unselect_all() self.reset() @@ -578,7 +578,7 @@ class ShareWindow: def onCancelButtonClicked(self, *args): self.reset() - return gtk.TRUE + return True def onBrowseButtonClicked(self, *args): fb = gtk.FileSelection(_("Select Directory"))