/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commit.py

Merged an approved request (single clicking bookmark).

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
173
173
 
174
174
        # The store holds:
175
175
        # [file_id, real path, checkbox, display path, changes type, message]
176
 
        # _iter_changes returns:
 
176
        # iter_changes returns:
177
177
        # (file_id, (path_in_source, path_in_target),
178
178
        #  changed_content, versioned, parent, name, kind,
179
179
        #  executable)
186
186
        self._wt.lock_read()
187
187
        self._basis_tree.lock_read()
188
188
        try:
189
 
            from diff import _iter_changes_to_status
 
189
            from diff import iter_changes_to_status
190
190
            for (file_id, real_path, change_type, display_path
191
 
                ) in _iter_changes_to_status(self._basis_tree, self._wt):
 
191
                ) in iter_changes_to_status(self._basis_tree, self._wt):
192
192
                if self._selected and real_path != self._selected:
193
193
                    enabled = False
194
194
                else:
227
227
            return
228
228
        if have_dbus:
229
229
            bus = dbus.SystemBus()
230
 
            proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
231
 
                                       '/org/freedesktop/NetworkManager')
 
230
            try:
 
231
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
 
232
                                           '/org/freedesktop/NetworkManager')
 
233
            except dbus.DBusException:
 
234
                mutter("networkmanager not available.")
 
235
                self._check_local.show()
 
236
                return
 
237
            
232
238
            dbus_iface = dbus.Interface(proxy_obj,
233
239
                                        'org.freedesktop.NetworkManager')
234
240
            try: