← Back to branch summary

~ubuntu-branches/ubuntu/precise/networkmanagement/precise

« back to all changes in this revision

Viewing changes to backends/NetworkManager/settings/gsmdbus.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-23 14:00:13 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20111023140013-e38hdzybcg6zndrk
Tags: 0.9~svngit.nm09.20111023.ff842e-0ubuntu1
* New upstream snapshot.
* Drop all patches, merged upstream.
* Add kubuntu_add_subdirectory_po.diff to build the translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
backends/NetworkManager/settings/gsmdbus.cpp
43
43
  if (map.contains(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS))) {
44
44
    setting->setBand(map.value(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS)).value<int>());
45
45
  }
 
46
  if (map.contains(QLatin1String(NM_SETTING_GSM_HOME_ONLY))) {
 
47
    setting->setHomeonly(map.value(QLatin1String(NM_SETTING_GSM_HOME_ONLY)).value<bool>());
 
48
  }
46
49
  // SECRET
47
50
  if (map.contains(QLatin1String(NM_SETTING_GSM_PIN))) {
48
51
      setting->setPin(map.value(QLatin1String(NM_SETTING_GSM_PIN)).value<QString>());
49
52
  }
50
 
  if (map.contains(QLatin1String(NM_SETTING_GSM_PIN_FLAGS))) {
51
 
      setting->setPinflags((Knm::Setting::secretsTypes)map.value(QLatin1String(NM_SETTING_GSM_PIN_FLAGS)).value<int>());
52
 
  }
 
53
  setting->setPinflags((Knm::Setting::secretsTypes)map.value(QLatin1String(NM_SETTING_GSM_PIN_FLAGS)).value<int>());
53
54
}
54
55
 
55
56
QVariantMap GsmDbus::toMap()
67
68
  if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
68
69
      map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
69
70
  }
 
71
  insertIfTrue(map, NM_SETTING_GSM_HOME_ONLY, setting->homeonly());
70
72
 
71
73
  map.unite(toSecretsMap());
72
74
  if (!setting->password().isEmpty()) {
73
75
      map.insert(QLatin1String(NM_SETTING_GSM_PASSWORD_FLAGS), (int)setting->passwordflags());
74
76
  }
75
 
  if (!setting->pin().isEmpty()) {
76
 
      map.insert(QLatin1String(NM_SETTING_GSM_PIN_FLAGS), (int)setting->pinflags());
77
 
}
 
77
  map.insert(QLatin1String(NM_SETTING_GSM_PIN_FLAGS), (int)setting->pinflags());
78
78
 
79
79
  //map.insert("band", setting->band());
80
80
  return map;