diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/.gitignore | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 15 | ||||
| -rw-r--r-- | data/sugar.schemas.in (renamed from schemas/sugar.schemas.in) | 0 | ||||
| -rw-r--r-- | extensions/deviceicon/wireless.py | 26 | ||||
| -rw-r--r-- | schemas/Makefile.am | 20 | ||||
| -rw-r--r-- | src/jarabe/frame/friendstray.py | 2 | ||||
| -rw-r--r-- | src/jarabe/model/neighborhood.py | 4 |
8 files changed, 30 insertions, 39 deletions
diff --git a/configure.ac b/configure.ac index 181a085..c54b12d 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,6 @@ extensions/cpsection/language/Makefile extensions/cpsection/network/Makefile extensions/cpsection/power/Makefile extensions/deviceicon/Makefile -schemas/Makefile src/Makefile src/jarabe/Makefile src/jarabe/controlpanel/Makefile diff --git a/data/.gitignore b/data/.gitignore index 6fa4af3..8263f12 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1 +1,2 @@ *.gtkrc +sugar.schemas diff --git a/data/Makefile.am b/data/Makefile.am index 40e6e36..7623d46 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -46,5 +46,16 @@ if ENABLE_UPDATE_MIMEDB fi endif -EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em -CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) +@INTLTOOL_SCHEMAS_RULE@ + +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_in_files = sugar.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) + +install-data-local: $(schema_DATA) +if GCONF_SCHEMAS_INSTALL + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule sugar.schemas 2>&1 > /dev/null +endif + +EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em $(schema_in_files) +CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) $(schema_DATA) diff --git a/schemas/sugar.schemas.in b/data/sugar.schemas.in index 5cdff4d..5cdff4d 100644 --- a/schemas/sugar.schemas.in +++ b/data/sugar.schemas.in diff --git a/extensions/deviceicon/wireless.py b/extensions/deviceicon/wireless.py index dcaffd3..2902f42 100644 --- a/extensions/deviceicon/wireless.py +++ b/extensions/deviceicon/wireless.py @@ -65,25 +65,25 @@ class WirelessDeviceView(TrayIcon): self.set_palette(self.palette) self.palette.props.invoker = FrameWidgetInvoker(self) self.palette.set_group_id('frame') - self.palette.set_frequency(self._model.props.frequency) + self.palette.set_frequency(self.model.props.frequency) - self._model.connect('notify::name', self._name_changed_cb) - self._model.connect('notify::strength', self._strength_changed_cb) - self._model.connect('notify::state', self._state_changed_cb) + self.model.connect('notify::name', self._name_changed_cb) + self.model.connect('notify::strength', self._strength_changed_cb) + self.model.connect('notify::state', self._state_changed_cb) self._update_icon() self._update_state() def _get_palette_primary_text(self): - if self._model.props.state == STATE_INACTIVE: + if self.model.props.state == STATE_INACTIVE: return _("Disconnected") - return self._model.props.name + return self.model.props.name def _strength_changed_cb(self, model, pspec): self._update_icon() # Only update frequency periodically if self._counter % 4 == 0: - self.palette.set_frequency(self._model.props.frequency) + self.palette.set_frequency(self.model.props.frequency) self._counter += 1 def _name_changed_cb(self, model, pspec): @@ -96,10 +96,10 @@ class WirelessDeviceView(TrayIcon): def _update_icon(self): # keep this code in sync with view/home/MeshBox.py - strength = self._model.props.strength - if self._model.props.state == STATE_INACTIVE: + strength = self.model.props.strength + if self.model.props.state == STATE_INACTIVE: strength = 0 - if self._model.props.state == STATE_ACTIVATED: + if self.model.props.state == STATE_ACTIVATED: icon_name = '%s-connected' % _ICON_NAME else: icon_name = _ICON_NAME @@ -109,12 +109,12 @@ class WirelessDeviceView(TrayIcon): def _update_state(self): # FIXME Change icon colors once we have real icons - state = self._model.props.state + state = self.model.props.state if state == STATE_ACTIVATING: self.icon.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg() self.icon.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg() elif state == STATE_ACTIVATED: - (stroke, fill) = self._model.get_active_network_colors() + (stroke, fill) = self.model.get_active_network_colors() self.icon.props.stroke_color = stroke self.icon.props.fill_color = fill elif state == STATE_INACTIVE: @@ -378,7 +378,7 @@ def setup(tray): return for dev in network_manager.get_devices(): - _check_network_device(dev) + _check_network_device(tray, dev) network_manager.connect('device-added', _network_device_added_cb, tray) diff --git a/schemas/Makefile.am b/schemas/Makefile.am deleted file mode 100644 index 0614031..0000000 --- a/schemas/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -@INTLTOOL_SCHEMAS_RULE@ - -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = sugar.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -install-data-local: $(schema_DATA) -if GCONF_SCHEMAS_INSTALL - if test -z "$(DESTDIR)" ; then \ - for p in $^ ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \ - done \ - fi -endif - -EXTRA_DIST = \ - $(schema_in_files) - -DISTCLEANFILES = \ - $(schema_in_files:.schemas.in=.schemas) diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py index 66cd0e0..7e15f14 100644 --- a/src/jarabe/frame/friendstray.py +++ b/src/jarabe/frame/friendstray.py @@ -86,7 +86,7 @@ class FriendsTray(VTray): def __activity_appeared_cb(self, pservice, activity_ps): activity = shell.get_model().get_active_activity() - if activity and activity_ps.props.id == activity.get_id(): + if activity and activity_ps.props.id == activity.get_activity_id(): self._set_activity_ps(activity_ps, True) def _set_activity_ps(self, activity_ps, shared_activity): diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py index 726c388..6111e7c 100644 --- a/src/jarabe/model/neighborhood.py +++ b/src/jarabe/model/neighborhood.py @@ -34,13 +34,13 @@ class ActivityModel: return self.activity.props.id def get_icon_name(self): - return self.bundle.icon + return self.bundle.get_icon() def get_color(self): return XoColor(self.activity.props.color) def get_bundle_id(self): - return self.bundle.bundle_id + return self.bundle.get_bundle_id() class Neighborhood(gobject.GObject): __gsignals__ = { |