Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Collazo <scollazo@activitycentral.com>2013-02-27 06:40:05 (GMT)
committer Santiago Collazo <scollazo@activitycentral.com>2013-02-27 06:40:05 (GMT)
commit818be1365bfccc9deb138cc1c6b0f164f6365c20 (patch)
tree1f8880372fcc84a62369c96a60de2d8565e7f9c0
parentfb78deebfd5b8a9a4143d8c7ddde557118d8e103 (diff)
parentdef08d78f72e5775b03c7c371572edc24aa7e78b (diff)
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
-rw-r--r--extensions/cpsection/network/view.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index c9d2712..a76cef2 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -178,7 +178,7 @@ class GConfIntegerSpinButton(Gtk.SpinButton, GConfMixin):
GConfMixin.__init__(self, gconf_key, gsettings_dconf, dconf_key)
def get_value_for_gconf(self):
- return self.get_value_as_int()
+ return int(self.props.text)
def set_value_from_gconf(self, value):
self.set_value(value)
@@ -233,9 +233,8 @@ class GConfStringSettingBox(SettingBox):
def _commit(self, widget):
self.string_entry._commit(self.string_entry)
- @property
def changed(self):
- return self.string_entry.changed
+ return self.string_entry.changed()
class GConfPasswordSettingBox(GConfStringSettingBox):
@@ -298,9 +297,8 @@ class GConfHostPortSettingBox(SettingBox):
self.host_name_entry._commit(self.host_name_entry)
self.port_spin_button._commit(self.port_spin_button)
- @property
def changed(self):
- return self.host_name_entry.changed or self.port_spin_button.changed
+ return self.host_name_entry.changed() or self.port_spin_button.changed()
class ExclusiveOptionSetsBox(Gtk.VBox):
@@ -445,9 +443,6 @@ class SpecialGConfExclusiveOptionSetsBox(GConfExclusiveOptionSetsBox):
logging.debug('Setting org.gnome.system.proxy.http enabled to %r', enabled_value)
GSETTINGS_PROXY_HTTP.set_boolean('enabled', enabled_value)
- def changed(self):
- return self._undo_value != self.get_value_for_gconf()
-
class OptionalSettingsBox(Gtk.VBox):
"""