← Back to branch summary

~ubuntu-branches/ubuntu/precise/network-manager-applet/precise

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-10-03 16:21:01 UTC
  • Revision ID: package-import@ubuntu.com-20111003162101-b6nt70xxz0cg5kza
Tags: 0.9.1.90-0ubuntu6
https://launchpad.net/bugs/830178
debian/patches/lp830178_adhoc_ip6_ignore.patch: fix adhoc network activation
by disabling IPv6 (where sharing isn't supported anyway), so dnsmasq only
gets started once and doesn't cause connections to fail. (LP: #830178)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libnm-gtk/nm-wireless-dialog.c
1227
1227
 
1228
1228
                if (priv->adhoc_create) {
1229
1229
                        NMSettingIP4Config *s_ip4;
 
1230
                        NMSettingIP6Config *s_ip6;
1230
1231
 
1231
1232
                        g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "adhoc", NULL);
1232
1233
 
1233
1234
                        s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
1234
1235
                        g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_SHARED, NULL);
1235
1236
                        nm_connection_add_setting (connection, (NMSetting *) s_ip4);
 
1237
 
 
1238
                        s_ip6 = (NMSettingIP6Config *) nm_setting_ip6_config_new ();
 
1239
                        g_object_set (s_ip6, NM_SETTING_IP6_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE, NULL);
 
1240
                        nm_connection_add_setting (connection, (NMSetting *) s_ip6);
1236
1241
                }
1237
1242
 
1238
1243
                nm_connection_add_setting (connection, (NMSetting *) s_wireless);