← Back to branch summary

~ubuntu-branches/ubuntu/saucy/network-manager-applet/saucy-updates

« back to all changes in this revision

Viewing changes to src/libnm-gtk/nm-wifi-dialog.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2013-02-05 16:15:00 UTC
  • mfrom: (1.2.33)
  • Revision ID: package-import@ubuntu.com-20130205161500-nax1yrh7klr0o8ir
Tags: 0.9.7.995+git201301311844.0376019-0ubuntu1
* upstream snapshot 2013-01-31 18:44:13 (GMT)
  + 03760194e54eaeaf493e9b45c4835e84524d8650
* debian/patches/nm-applet-use-indicator.patch: refreshed.
* debian/patches/lp1048516_dont_req_keyring_in_greeter.patch: refreshed.
* debian/patches/lp289466_always_show_tray_icon.patch: refreshed.
* debian/patches/lp829673_gconf_hide_applet.patch: refreshed.
* debian/patches/position_dialogs_to_center_of_the_screen.patch: refreshed.
* debian/patches/hide_policy_items_env_var.patch: refreshed.
* debian/patches/lp1048520_delay_pin_dialog_in_greeter.patch: refreshed.
* debian/patches/nm-applet-use-indicator.patch: fix the addition of separator
  menu items to avoid multiple separators added in a block.
* debian/control: bump network-manager Depends and Build-Depends to the
  appropriate snapshot version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libnm-gtk/nm-wifi-dialog.c
474
474
 
475
475
                                /* Ignore non-Ad-Hoc connections too */
476
476
                                mode = nm_setting_wireless_get_mode (s_wireless);
477
 
                                if (!mode || strcmp (mode, "adhoc"))
 
477
                                if (!mode || (strcmp (mode, "adhoc") && strcmp (mode, "ap")))
478
478
                                        continue;
479
479
                        }
480
480
 
852
852
                s_wireless = nm_connection_get_setting_wireless (priv->connection);
853
853
 
854
854
                mode = nm_setting_wireless_get_mode (s_wireless);
855
 
                if (mode && !strcmp (mode, "adhoc"))
 
855
                if (mode && (!strcmp (mode, "adhoc") || !strcmp (mode, "ap")))
856
856
                        is_adhoc = TRUE;
857
857
 
858
858
                wsec = nm_connection_get_setting_wireless_security (priv->connection);