diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-10-02 13:26:33 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-10-14 09:08:06 +0200 |
| commit | 4cf81f629022b6518cdf83f7c5deadfd1e036318 (patch) | |
| tree | e44de6178d21b387c503388f18afd7c32b30cea9 | |
| parent | 439403202fbc2823ece7703f63770bbb687f8269 (diff) | |
| download | network-manager-applet-4cf81f629022b6518cdf83f7c5deadfd1e036318.tar.gz | |
editor: move Ad-Hoc mode to the end, rename "Infrastructure" to "Client"
as suggested in https://bugzilla.redhat.com/show_bug.cgi?id=970752#c4
| -rw-r--r-- | src/connection-editor/ce-page-wifi.ui | 6 | ||||
| -rw-r--r-- | src/connection-editor/page-wifi.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui index 050c5167..1ab2f2b9 100644 --- a/src/connection-editor/ce-page-wifi.ui +++ b/src/connection-editor/ce-page-wifi.ui @@ -45,13 +45,13 @@ </columns> <data> <row> - <col id="0" translatable="yes">Infrastructure</col> + <col id="0" translatable="yes">Client</col> </row> <row> - <col id="0" translatable="yes">Ad-hoc</col> + <col id="0" translatable="yes">Hotspot</col> </row> <row> - <col id="0" translatable="yes">Hotspot</col> + <col id="0" translatable="yes">Ad-hoc</col> </row> </data> </object> diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c index b1693067..1724ec30 100644 --- a/src/connection-editor/page-wifi.c +++ b/src/connection-editor/page-wifi.c @@ -246,8 +246,8 @@ mode_combo_changed_cb (GtkComboBox *combo, gboolean show_bssid = TRUE; switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) { - case 2: /* hotspot */ - case 1: /* adhoc */ + case 1: /* hotspot */ + case 2: /* adhoc */ /* BSSID is random and is created by kernel for Ad-Hoc networks * http://lxr.linux.no/linux+v3.7.6/net/mac80211/ibss.c#L685 * For AP-mode, the BSSID is the MAC address of the device. @@ -332,9 +332,9 @@ populate_ui (CEPageWifi *self) /* Default to Infrastructure */ gtk_combo_box_set_active (priv->mode, 0); - if (!g_strcmp0 (mode, "adhoc")) - gtk_combo_box_set_active (priv->mode, 1); if (!g_strcmp0 (mode, "ap")) + gtk_combo_box_set_active (priv->mode, 1); + if (!g_strcmp0 (mode, "adhoc")) gtk_combo_box_set_active (priv->mode, 2); mode_combo_changed_cb (priv->mode, self); g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self); @@ -499,10 +499,10 @@ ui_to_setting (CEPageWifi *self) switch (gtk_combo_box_get_active (priv->mode)) { case 1: - mode = "adhoc"; + mode = "ap"; break; case 2: - mode = "ap"; + mode = "adhoc"; break; default: mode = "infrastructure"; |