[haiku-commits] haiku: hrev45186 - in src/tests/kits/net/preflet/InterfacesAddOn: . src/tests/kits/net/preflet
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 21 Jan 2013 00:33:58 +0100 (CET)
hrev45186 adds 2 changesets to branch 'master'
old head: afc33db942eed3f9219781eb467500278610fe3a
new head: ab372d6fd32fa36704275b58892438dc4590ab0a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=ab372d6+%5Eafc33db
----------------------------------------------------------------------------
2ddbb1e: networksetup+: Adjust add-on path to match preflet name
ab372d6: networksetup+: Simplify media check
* Lets just rely on IsWireless and friends
in BNetworkInterface as we are checking
the same thing twice.
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 19 deletions(-)
.../InterfacesAddOn/InterfacesListView.cpp | 24 +++++---------------
.../kits/net/preflet/NetworkSetupWindow.cpp | 2 +-
############################################################################
Commit: 2ddbb1e3d2246aada2fd326bb08d1747e3e1d096
URL: http://cgit.haiku-os.org/haiku/commit/?id=2ddbb1e
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Sun Jan 20 22:50:06 2013 UTC
networksetup+: Adjust add-on path to match preflet name
----------------------------------------------------------------------------
diff --git a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
index 1750f96..70f566d 100644
--- a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
+++ b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
@@ -259,7 +259,7 @@ NetworkSetupWindow::_BuildShowTabView(int32 msg_what)
path.Append(search_path + 3);
} else {
path.SetTo(search_path);
- path.Append("network_setup");
+ path.Append("Network Setup");
}
search_path = strtok_r(NULL, ":", &next_path_token);
############################################################################
Revision: hrev45186
Commit: ab372d6fd32fa36704275b58892438dc4590ab0a
URL: http://cgit.haiku-os.org/haiku/commit/?id=ab372d6
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Sun Jan 20 23:28:08 2013 UTC
networksetup+: Simplify media check
* Lets just rely on IsWireless and friends
in BNetworkInterface as we are checking
the same thing twice.
----------------------------------------------------------------------------
diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
index d41804c..cf64a38 100644
--- a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
+++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
@@ -209,25 +209,13 @@ InterfaceListItem::_Init()
const char* mediaTypeName = NULL;
- int media = fInterface.Media();
+ BNetworkDevice device(Name());
+ if (device.IsWireless())
+ mediaTypeName = "wifi";
+ else if (device.IsEthernet())
+ mediaTypeName = "ether";
- printf("%s media = 0x%x\n", Name(), media);
- switch (IFM_TYPE(media)) {
- case IFM_ETHER:
- mediaTypeName = "ether";
- break;
- case IFM_IEEE80211:
- mediaTypeName = "wifi";
- break;
- default: {
- BNetworkDevice device(Name());
- if (device.IsWireless())
- mediaTypeName = "wifi";
- else if (device.IsEthernet())
- mediaTypeName = "ether";
- break;
- }
- }
+ printf("%s is a %s device\n", Name(), mediaTypeName);
_PopulateBitmaps(mediaTypeName);
// Load the interface icons
Other related posts:
- » [haiku-commits] haiku: hrev45186 - in src/tests/kits/net/preflet/InterfacesAddOn: . src/tests/kits/net/preflet - kallisti5
