← Back to branch summary

~ubuntu-branches/ubuntu/utopic/network-manager-applet/utopic-proposed

« back to all changes in this revision

Viewing changes to src/connection-editor/page-ip4.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-11-19 14:46:29 UTC
  • mfrom: (1.2.31)
  • Revision ID: package-import@ubuntu.com-20121119144629-5423hii02a4vrh2n
Tags: 0.9.6.2+git201211052130.2d666bc-0ubuntu1
* upstream snapshot 2012-11-05 21:30:03 (GMT)
  + 2d666bc7aa6f0b731d131319b36f07b0f2bdce16
* debian/patches/git_fix_some_leaks_80ef61b.patch,
  debian/patches/git_indicate_hspa+_lte_tech_dbe3b12.patch,
  debian/patches/git_mac_addr_string_leakage_6dae878.patch: dropped, included
  in upstream tarball.
* debian/patches/lp328572-dxteam-connect-text.patch: refreshed.
* debian/patches/lp330571_dxteam_wired_connect_text.patch: refreshed.
* debian/patches/lp337960_dxteam_notification_icon_names.diff,
  debian/patches/lp337960_dxteam_notification_icon_names_part2-images.diff:
  disabled patches, they don't seem to be used (the icons don't match up with
  what is currently observable on the desktop). Let's see if someone screams.
* debian/patches/applet-wifi-menu-before-vpn.patch: refreshed.
* debian/patches/lp830178_adhoc_ip6_ignore.patch: refreshed.
* debian/patches/lp829673_gconf_hide_applet.patch: refreshed.
* debian/patches/nm-applet-use-indicator.patch: refreshed.
* debian/patches/hide_policy_items_env_var.patch: refreshed.
* debian/patches/applet_adhoc_use_wpa_rsn_part1.patch: refreshed.
* debian/patches/lp341684_device_sensitive_disconnect_notify.patch:
  refreshed.
* debian/patches/lp460144_correctly_update_notification.patch: refreshed.
* debian/patches/make_menu_items_insensitive_based_on_permissions.patch:
  refreshed.
* debian/control:
  - add gobject-introspection to Build-Depends.
  - add gudev-dev to Build-Depends.
  - bump network-manager and libnm-* Build-Depends and Depends to require
    at least 0.9.6.0+git201211131441.e9e2c56-0ubuntu1.
* debian/rules:
  - use autogen.sh with dh_autoreconf instead of calling intltoolize and
    gtkdocize manually.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/connection-editor/page-ip4.c
189
189
                                    -1);
190
190
        }
191
191
 
192
 
        /* At the moment, Disabled is only supported for Wired & WiFi */
 
192
        /* At the moment, Disabled is only supported for Ethernet & Wi-Fi */
193
193
        if (   priv->connection_type == NM_TYPE_SETTING_WIRED
194
194
            || priv->connection_type == NM_TYPE_SETTING_WIRELESS) {
195
195
                gtk_list_store_append (priv->method_store, &iter);
976
976
ce_page_ip4_new (NMConnection *connection,
977
977
                 GtkWindow *parent_window,
978
978
                 NMClient *client,
 
979
                 NMRemoteSettings *settings,
979
980
                 const char **out_secrets_setting_name,
980
981
                 GError **error)
981
982
{
987
988
                                         connection,
988
989
                                         parent_window,
989
990
                                         client,
 
991
                                         settings,
990
992
                                         UIDIR "/ce-page-ip4.ui",
991
993
                                         "IP4Page",
992
994
                                         _("IPv4 Settings")));
1180
1182
 
1181
1183
        /* Update setting */
1182
1184
        g_object_set (priv->setting,
1183
 
                                  NM_SETTING_IP4_CONFIG_METHOD, method,
1184
 
                                  NM_SETTING_IP4_CONFIG_ADDRESSES, addresses,
1185
 
                                  NM_SETTING_IP4_CONFIG_DNS, dns_servers,
1186
 
                                  NM_SETTING_IP4_CONFIG_DNS_SEARCH, search_domains,
1187
 
                                  NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns,
1188
 
                                  NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, dhcp_client_id,
1189
 
                                  NM_SETTING_IP4_CONFIG_MAY_FAIL, may_fail,
1190
 
                                  NULL);
 
1185
                      NM_SETTING_IP4_CONFIG_METHOD, method,
 
1186
                      NM_SETTING_IP4_CONFIG_ADDRESSES, addresses,
 
1187
                      NM_SETTING_IP4_CONFIG_DNS, dns_servers,
 
1188
                      NM_SETTING_IP4_CONFIG_DNS_SEARCH, search_domains,
 
1189
                      NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns,
 
1190
                      NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, dhcp_client_id,
 
1191
                      NM_SETTING_IP4_CONFIG_MAY_FAIL, may_fail,
 
1192
                      NULL);
1191
1193
        valid = TRUE;
1192
1194
 
1193
1195
out: