After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 691720 - network: support NM 0.9.6 again
network: support NM 0.9.6 again
Status: RESOLVED FIXED
Product: gnome-shell
Classification: Core
Component: network-indicator
unspecified
Other All
: Normal normal
: ---
Assigned To: gnome-shell-maint
gnome-shell-maint
Depends on:
Blocks:
 
 
Reported: 2013-01-14 15:25 UTC by Dan Winship
Modified: 2013-01-14 17:10 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
network: support NM 0.9.6 again (3.37 KB, patch)
2013-01-14 15:25 UTC, Dan Winship 		committed Details | Review

Description Dan Winship 2013-01-14 15:25:30 UTC 
This is intended as just a temporary kludge to allow people to use
unstable gnome-shell without having to build NM from git. So, it
doesn't fully restore the original
disambiguating-multiple-ethernet-cards functionality. (They'll both
show up as just "Wired" now if you have 0.9.6. But at least the
network indicator will show up at all...)
Comment 1 Dan Winship 2013-01-14 15:25:32 UTC 
Created attachment 233451 [details] [review]
network: support NM 0.9.6 again

NM 0.9.7 is still not released even as a tarball, so fix this to work
with 0.9.6 again for now (although it doesn't do any device name
disambiguation in this case now).
Comment 2 Colin Walters 2013-01-14 15:34:22 UTC 
Review of attachment 233451 [details] [review]:

One minor bit, otherwise seems reasonable to me.

::: js/ui/status/network.js
@@ +12,3 @@
+try {
+    const NMGtk = imports.gi.NMGtk;
+} catch(e) {}

How about this, which avoids us relying on lookup of an undefined variable:

var NMGtk;
try {
  NMGtk = imports.gi.NMGtk;
catch (e) {
  NMGtk = null;
}
Comment 3 Dan Winship 2013-01-14 17:10:54 UTC 
pushed with suggested fix

Attachment 233451 [details] pushed as c37b222 - network: support NM 0.9.6 again