/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

  • Committer: Jelmer Vernooij
  • Date: 2007-07-19 13:16:31 UTC
  • mfrom: (235.1.1 gtk)
  • Revision ID: jelmer@samba.org-20070719131631-2ods52j02o0ni2ir
Merge fix for local commits when network manager isn't available.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
153
153
                              '/org/freedesktop/NetworkManager')
154
154
                dbus_iface = dbus.Interface(
155
155
                        proxy_obj, 'org.freedesktop.NetworkManager')
156
 
                # 3 is the enum value for STATE_CONNECTED
157
 
                self._check_local.set_active(dbus_iface.state() != 3)
158
 
        
 
156
                try:
 
157
                    # 3 is the enum value for STATE_CONNECTED
 
158
                    self._check_local.set_active(dbus_iface.state() != 3)
 
159
                except dbus.DBusException, e:
 
160
                    # Silently drop errors. While DBus may be 
 
161
                    # available, NetworkManager doesn't necessarily have to be
 
162
                    mutter("unable to get networkmanager state: %r" % e)
 
163
                
159
164
        # Create the file list
160
165
        self._create_file_view()
161
166
        # Create the pending merges