core: rename NMNamedManager -> NMDnsManager

configure.ac

@@ -489,7 +489,7 @@ src/Makefile
 src/tests/Makefile
 marshallers/Makefile
 src/logging/Makefile
-src/named-manager/Makefile
+src/dns-manager/Makefile
 src/vpn-manager/Makefile
 src/dhcp-manager/Makefile
 src/ip6-manager/Makefile

po/POTFILES.in

@@ -18,7 +18,7 @@ src/main.c
 src/dhcp-manager/nm-dhcp-dhclient.c
 src/dhcp-manager/nm-dhcp-manager.c
 src/logging/nm-logging.c
-src/named-manager/nm-named-manager.c
+src/dns-manager/nm-dns-manager.c
 src/system-settings/nm-default-wired-connection.c
 system-settings/plugins/ifcfg-rh/reader.c
 system-settings/plugins/ifnet/connection_parser.c

po/ar.po

@@ -67,11 +67,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../src/named-manager/nm-named-manager.c:117
+#: ../src/dns-manager/nm-dns-manager.c:117
 msgid "NOTE: the glibc resolver does not support more than 3 nameservers."
 msgstr ""
 
-#: ../src/named-manager/nm-named-manager.c:119
+#: ../src/dns-manager/nm-dns-manager.c:119
 msgid "The nameservers listed below may not be recognized."
 msgstr ""
 

po/as.po

@@ -1590,11 +1590,11 @@ msgstr "অজ্ঞাত লগ স্তৰ '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "অজ্ঞাত লগ ডোমেইন '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "মন কৰিব: libc resolver ৰ দ্বাৰা ৩ তকৈ অধিক নামৰ সেৱক সমৰ্থিত ন'হ'বও পাৰে  ।"
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "নিম্নলিখিত নাম-সেৱকসমূহ চিনাক্ত ন'হ'বও পাৰে  ।"
 

po/be@latin.po

@@ -55,11 +55,11 @@ msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Niapravilnaja opcyja. Kab pahladzieć śpis mahčymych opcyj, užyj --help.\n"
 
-#: ../src/named-manager/nm-named-manager.c:218
+#: ../src/dns-manager/nm-dns-manager.c:218
 msgid "NOTE: the glibc resolver does not support more than 3 nameservers."
 msgstr "UVAHA: resolver glibc nie padtrymlivaje bolš za 3 servery nazvaŭ."
 
-#: ../src/named-manager/nm-named-manager.c:220
+#: ../src/dns-manager/nm-dns-manager.c:220
 msgid "The nameservers listed below may not be recognized."
 msgstr "Niemahčyma paznać nastupnyja servery nazvaŭ."
 

po/bg.po

@@ -72,11 +72,11 @@ msgstr ""
 "# Слят от %s\n"
 "\n"
 
-#: ../src/named-manager/nm-named-manager.c:117
+#: ../src/dns-manager/nm-dns-manager.c:117
 msgid "NOTE: the glibc resolver does not support more than 3 nameservers."
 msgstr "БЕЛЕЖКА: стандартно glibc поддържа максимум 3 сървъра за имена."
 
-#: ../src/named-manager/nm-named-manager.c:119
+#: ../src/dns-manager/nm-dns-manager.c:119
 msgid "The nameservers listed below may not be recognized."
 msgstr "Сървърите за имена отдолу могат да не бъдат разпознати."
 

po/bn_IN.po

@@ -1587,13 +1587,13 @@ msgstr "লগের অজানা স্তর '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "অজানা লগ ডোমেইন '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "উল্লেখ্য: libc resolver দ্বারা ৩-টির বেশি নেম-সার্ভার সমর্থিত না হওয়ার সম্ভাবনা "
 "রয়েছে।"
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "নিম্নলিখিত নেম-সার্ভারগুলি সনাক্ত না হওয়ার সম্ভাবনা রয়েছে।"
 

po/ca.po

@@ -335,13 +335,13 @@ msgstr ""
 "# Fusionat des de %s\n"
 "\n"
 
-#: ../src/named-manager/nm-named-manager.c:256
+#: ../src/dns-manager/nm-dns-manager.c:256
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "NOTA: pot ser que el sistema de resolució de la libc no funcioni amb més de "
 "3 servidors de noms."
 
-#: ../src/named-manager/nm-named-manager.c:258
+#: ../src/dns-manager/nm-dns-manager.c:258
 msgid "The nameservers listed below may not be recognized."
 msgstr "Pot ser que no es reconeguin els servidors de noms llistats més avall."
 

po/cs.po

@@ -1335,12 +1335,12 @@ msgstr "Neznámá úroveň evidence „%s“"
 msgid "Unknown log domain '%s'"
 msgstr "Neznámá doména evidence „%s“"
 
-#: ../src/named-manager/nm-named-manager.c:314
+#: ../src/dns-manager/nm-dns-manager.c:314
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "Poznámka: překladač adres z libc nemůže podporovat více než 3 jmenné servery."
 
-#: ../src/named-manager/nm-named-manager.c:316
+#: ../src/dns-manager/nm-dns-manager.c:316
 msgid "The nameservers listed below may not be recognized."
 msgstr "Jmenné servery uvedené v následujícím seznamu nelze rozpoznat."
 

po/de.po

@@ -1341,13 +1341,13 @@ msgstr "Unbekannte Protokollstufe »%s«"
 msgid "Unknown log domain '%s'"
 msgstr "Unbekannte Protokolldomäne »%s«"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "HINWEIS: Der libc-resolver unterstützt eventuell nicht mehr als drei "
 "Nameserver."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
 

po/el.po

@@ -1763,13 +1763,13 @@ msgstr "Άγνωστο επίπεδο καταγραφής '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "Άγνωστος τομέας καταγραφής '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:384
+#: ../src/dns-manager/nm-dns-manager.c:384
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "ΣΗΜΕΙΩΣΗ: Ο libc resolver μπορεί να μην υποστηρίζει περισσότερους από 3 "
 "εξυπηρετητές ονομάτων."
 
-#: ../src/named-manager/nm-named-manager.c:386
+#: ../src/dns-manager/nm-dns-manager.c:386
 msgid "The nameservers listed below may not be recognized."
 msgstr "Οι κάτωθι εξυπηρετητές ονομάτων ίσως να μην αναγνωρίζονται."
 

po/en_GB.po

@@ -318,11 +318,11 @@ msgstr "unable to connect to netlink: %s"
 msgid "unable to join netlink group: %s"
 msgstr "unable to join netlink group: %s"
 
-#: ../src/named-manager/nm-named-manager.c:315
+#: ../src/dns-manager/nm-dns-manager.c:315
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "NOTE: the libc resolver may not support more than 3 nameservers."
 
-#: ../src/named-manager/nm-named-manager.c:317
+#: ../src/dns-manager/nm-dns-manager.c:317
 msgid "The nameservers listed below may not be recognized."
 msgstr "The nameservers listed below may not be recognised."
 

po/es.po

@@ -1712,13 +1712,13 @@ msgstr "Nivel de registro desconocido '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "Dominio de registro desconocido '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:384
+#: ../src/dns-manager/nm-dns-manager.c:384
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "NOTA: el 'resolver' de nombres de libc puede que no soporte más de 3 "
 "servidores de nombres."
 
-#: ../src/named-manager/nm-named-manager.c:386
+#: ../src/dns-manager/nm-dns-manager.c:386
 msgid "The nameservers listed below may not be recognized."
 msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
 

po/et.po

@@ -76,11 +76,11 @@ msgstr ""
 "# Liidetud allikast %s\n"
 "\n"
 
-#: ../src/named-manager/nm-named-manager.c:240
+#: ../src/dns-manager/nm-dns-manager.c:240
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "MÄRKUS: libc lahendaja ei pruugi toetada rohkem kui 3 nimeserverit."
 
-#: ../src/named-manager/nm-named-manager.c:242
+#: ../src/dns-manager/nm-dns-manager.c:242
 msgid "The nameservers listed below may not be recognized."
 msgstr "Järgneva nimistu nimeservereid ei tuntud ära."
 

po/eu.po

@@ -1300,11 +1300,11 @@ msgstr "ezin da netlink-ekin konektatu: %s"
 msgid "unable to join netlink group: %s"
 msgstr "ezin da netlink taldearekin elkartu: %s"
 
-#: ../src/named-manager/nm-named-manager.c:315
+#: ../src/dns-manager/nm-dns-manager.c:315
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "OHARRA: libc-en ebaztaileak ez du 3 izen-zerbitzari baino gehiago onartzen."
 
-#: ../src/named-manager/nm-named-manager.c:317
+#: ../src/dns-manager/nm-dns-manager.c:317
 msgid "The nameservers listed below may not be recognized."
 msgstr "Azpian zerrendatutako izen-zenbitzariak ez dira ezagutuko."
 

po/fi.po

@@ -308,11 +308,11 @@ msgstr ""
 "# Yhdistetty tiedostosta %s\n"
 "\n"
 
-#: ../src/named-manager/nm-named-manager.c:256
+#: ../src/dns-manager/nm-dns-manager.c:256
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "HUOMAUTUS: libc-nimenselvennys ei ehkä tue kuin kolmea nimipalvelinta."
 
-#: ../src/named-manager/nm-named-manager.c:258
+#: ../src/dns-manager/nm-dns-manager.c:258
 msgid "The nameservers listed below may not be recognized."
 msgstr "Alla olevaa nimipalvelinluetteloa ei voitu tunnistaa."
 

po/fr.po

@@ -1611,13 +1611,13 @@ msgstr "Niveau de journalisation inconnu '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "Domaine de journalisation inconnu '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "NOTE : il se peut que le solveur libc ne prenne pas en charge plus de 3 "
 "serveurs de noms."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "Les serveurs de noms listés ci-dessous peuvent ne pas être reconnus."
 

po/gl.po

@@ -1724,11 +1724,11 @@ msgstr "Nivel de rexistro «%s» descoñecido"
 msgid "Unknown log domain '%s'"
 msgstr "Dominio de rexistro «%s» descoñecido"
 
-#: ../src/named-manager/nm-named-manager.c:384
+#: ../src/dns-manager/nm-dns-manager.c:384
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "NOTE: o importador libc non permite máis de 3 nomes de servidores."
 
-#: ../src/named-manager/nm-named-manager.c:386
+#: ../src/dns-manager/nm-dns-manager.c:386
 msgid "The nameservers listed below may not be recognized."
 msgstr "Os nomes de servidores listados a seguir poden non ser recoñecidos"
 

po/gu.po

@@ -1588,11 +1588,11 @@ msgstr "અજ્ઞાત લોગ સ્તર '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "અજ્ઞાત લોગ ડોમેઇન '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "નોંધ: libc સુધારનાર એ ૩ નામ સર્વરો કરતા વધારે આધારને સમાવી શકતુ નથી."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "નીચે યાદી થયેલ નામસર્વરો એ ઓળખી શકાતા નથી."
 

po/hi.po

@@ -1683,11 +1683,11 @@ msgstr "अज्ञात लॉग स्तर '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "अज्ञात लॉग डोमेन '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "नोट: libc समाधानकर्ता 3 नेमसर्वर से अधिक का समर्थन नहीं कर सकता है."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "नीचे सूची में दिया गया नेमसर्वर पहचाना नहीं जा सकता है."
 

po/hu.po

@@ -436,11 +436,11 @@ msgstr "nem lehet kapcsolódni a netlinkhez: %s"
 msgid "unable to join netlink group: %s"
 msgstr "nem lehet csatlakozni a netlink csoporthoz: %s"
 
-#: ../src/named-manager/nm-named-manager.c:315
+#: ../src/dns-manager/nm-dns-manager.c:315
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "MEGJEGYZÉS: a libc feloldó nem támogat háromnál több névkiszolgálót."
 
-#: ../src/named-manager/nm-named-manager.c:317
+#: ../src/dns-manager/nm-dns-manager.c:317
 msgid "The nameservers listed below may not be recognized."
 msgstr "Az alább felsorolt névkiszolgálók lehet, hogy nem kerülnek felismerésre."
 

po/id.po

@@ -1698,11 +1698,11 @@ msgstr "Aras log tak dikenal '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "Ranah log tak dikenal '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:384
+#: ../src/dns-manager/nm-dns-manager.c:384
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "CATATAN: resolver libc mungkin tak mendukung lebih dari 3 nameserver."
 
-#: ../src/named-manager/nm-named-manager.c:386
+#: ../src/dns-manager/nm-dns-manager.c:386
 msgid "The nameservers listed below may not be recognized."
 msgstr "Nameserver yang terdaftar di bawah mungkin tak dikenali."
 

po/it.po

@@ -1602,11 +1602,11 @@ msgstr "Livello log '%s' sconosciuto"
 msgid "Unknown log domain '%s'"
 msgstr "Dominio log '%s' sconosciuto"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "NOTA: il risolutore libc non supporta più di 3 server di nomi."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "I server di nomi elencati sotto non possono essere riconosciuti."
 

po/ja.po

@@ -1590,11 +1590,11 @@ msgstr "不明なログインレベル '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "注記: libc リゾルバは ３つ以上のネームサーバーをサポートできません。"
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
 

po/kn.po

@@ -1690,13 +1690,13 @@ msgstr "ಗೊತ್ತಿರದ ದಾಖಲೆ ಮಟ್ಟ '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "ಗೊತ್ತಿರದ ದಾಖಲೆ ಡೊಮೈನ್ '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:350
+#: ../src/dns-manager/nm-dns-manager.c:350
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "ಸೂಚನೆ: libc ಪರಿಹಾರಕವು(ರಿಸಾಲ್ವರ್) ೩ ನಾಮಪರಿಚಾರಕಗಳಿಗಿಂತ ಹೆಚ್ಚಿನವುಗಳನ್ನು "
 "ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."
 
-#: ../src/named-manager/nm-named-manager.c:352
+#: ../src/dns-manager/nm-dns-manager.c:352
 msgid "The nameservers listed below may not be recognized."
 msgstr "ಈ ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ನಾಮಪರಿಚಾರಕಗಳನ್ನು ಗುರುತಿಸಲಾಗಿಲ್ಲ."
 

po/ko.po

@@ -1590,11 +1590,11 @@ msgstr "알려지지 않은 로그 수준 '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "알려지지 않은 로그 영역 '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "주의: libc 주소 검색은 3개를 초과하는 네임서버를 지원하지 않을 수 있습니다."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "아래 열거된 네임서버를 인식하지 못할 수 있습니다."
 

po/lt.po

@@ -1686,13 +1686,13 @@ msgstr "Nežinomas žurnalo vedimo lygis „%s“"
 msgid "Unknown log domain '%s'"
 msgstr "Nežinoma žurnalo sritis „%s“"
 
-#: ../src/named-manager/nm-named-manager.c:350
+#: ../src/dns-manager/nm-dns-manager.c:350
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "PASTABA: libc adresų nustatymo funkcija gali nepalaikyti daugiau nei 3 vardų "
 "serverių."
 
-#: ../src/named-manager/nm-named-manager.c:352
+#: ../src/dns-manager/nm-dns-manager.c:352
 msgid "The nameservers listed below may not be recognized."
 msgstr "Žemiau pateikti vardų serveriai gali būti neatpažinti."
 

po/ml.po

@@ -1586,11 +1586,11 @@ msgstr "അപരിചതമായ ലോഗ് ലവല്‍ '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "അപരിചിതമായ ലോഗ് ഡൊമെയിന്‍ '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "കുറിപ്പു്: libc റിസോള്‍വര്‍ 3 നെയിംസര്‍വറുകളില്‍ കൂടതല്‍ പിന്തുണയ്ക്കുന്നതല്ല."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "താഴെ പറഞ്ഞിരിക്കുന്ന നെയിംസര്‍വറുകള്‍ തിരിച്ചറിയപ്പെടുന്നവയല്ല."
 

po/mr.po

@@ -1672,11 +1672,11 @@ msgstr "अपरिचीत लॉग स्तर '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "अपरिचीत लॉग डोमेन '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:350
+#: ../src/dns-manager/nm-dns-manager.c:350
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "NOTE: libc रिजॉलव्हर 3 पेक्षा जास्त नेमसर्व्हर्स् करीता समर्थन पुरवू शकणार नाही."
 
-#: ../src/named-manager/nm-named-manager.c:352
+#: ../src/dns-manager/nm-dns-manager.c:352
 msgid "The nameservers listed below may not be recognized."
 msgstr "खालिल यादीतील नेमसर्व्हर्स् अनोळखी राहतील."
 

po/nb.po

@@ -76,11 +76,11 @@ msgstr ""
 "# Flettet fra %s\n"
 "\n"
 
-#: ../src/named-manager/nm-named-manager.c:256
+#: ../src/dns-manager/nm-dns-manager.c:256
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "MERK: libc navneoppslag støtter ikke flere enn 3 navnetjenere."
 
-#: ../src/named-manager/nm-named-manager.c:258
+#: ../src/dns-manager/nm-dns-manager.c:258
 msgid "The nameservers listed below may not be recognized."
 msgstr "Navnetjenere listet under vil kanskje ikke bli gjenkjent."
 

po/nl.po

@@ -87,13 +87,13 @@ msgstr ""
 "# Samengevoegd vanuit %s\n"
 "\n"
 
-#: ../src/named-manager/nm-named-manager.c:256
+#: ../src/dns-manager/nm-dns-manager.c:256
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "Merk op: de resolver van libc ondersteunt mogelijkerwijs niet meer dan 3 "
 "nameservers."
 
-#: ../src/named-manager/nm-named-manager.c:258
+#: ../src/dns-manager/nm-dns-manager.c:258
 msgid "The nameservers listed below may not be recognized."
 msgstr "De naamservers hieronder worden mogelijk niet herkend."
 

po/oc.po

@@ -51,11 +51,11 @@ msgstr ""
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 
-#: ../src/named-manager/nm-named-manager.c:117
+#: ../src/dns-manager/nm-dns-manager.c:117
 msgid "NOTE: the glibc resolver does not support more than 3 nameservers."
 msgstr ""
 
-#: ../src/named-manager/nm-named-manager.c:119
+#: ../src/dns-manager/nm-dns-manager.c:119
 msgid "The nameservers listed below may not be recognized."
 msgstr ""
 

po/or.po

@@ -1688,11 +1688,11 @@ msgstr "ଅଜ୍ଞାତ ଲଗ ସ୍ତର '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "ଅଜ୍ଞାତ ଲଗ ଡମେନ '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:384
+#: ../src/dns-manager/nm-dns-manager.c:384
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "ଟିପ୍ପଣୀ: libc resolver 3 ରୁ ଅଧିକ nameserverଗୁଡ଼ିକୁ ସମର୍ଥନ କରିନପାରେ."
 
-#: ../src/named-manager/nm-named-manager.c:386
+#: ../src/dns-manager/nm-dns-manager.c:386
 msgid "The nameservers listed below may not be recognized."
 msgstr "ନିମ୍ନରେ ତାଲିକାଭୁକ୍ତ nameserverଗୁଡ଼ିକୁ ଚିହ୍ନି ହୋଇନପାରେ."
 

po/pa.po

@@ -1680,11 +1680,11 @@ msgstr "ਅਣਜਾਣ ਲਾਗ ਲੈਵਲ '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "ਅਣਜਾਣ ਲਾਗ ਡੋਮੇਨ '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:350
+#: ../src/dns-manager/nm-dns-manager.c:350
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "ਨੋਟ: libc ਰਿਜ਼ੋਲਵਰ ੩ ਤੋਂ ਵੱਧ ਨੇਮ-ਸਰਵਰ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../src/named-manager/nm-named-manager.c:352
+#: ../src/dns-manager/nm-dns-manager.c:352
 msgid "The nameservers listed below may not be recognized."
 msgstr "ਹੇਠਾਂ ਦਿੱਤੇ ਨੇਮ-ਸਰਵਰ ਪਛਾਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ।"
 

po/pl.po

@@ -1563,11 +1563,11 @@ msgstr "nie można połączyć się z netlink: %s"
 msgid "unable to join netlink group: %s"
 msgstr "nie można dołączyć do grupy netlink: %s"
 
-#: ../src/named-manager/nm-named-manager.c:315
+#: ../src/dns-manager/nm-dns-manager.c:315
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "UWAGA: obsługa nazw libc nie obsługuje więcej niż 3 serwery nazw."
 
-#: ../src/named-manager/nm-named-manager.c:317
+#: ../src/dns-manager/nm-dns-manager.c:317
 msgid "The nameservers listed below may not be recognized."
 msgstr "Poniższe serwery nazw nie mogą nie zostać rozpoznane."
 

po/pt_BR.po

@@ -1311,13 +1311,13 @@ msgstr "Nível de registro \"%s\" desconhecido"
 msgid "Unknown log domain '%s'"
 msgstr "Domínio de registro \"%s\" desconhecido"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "NOTA: o resolvedor da libc não tem suporte a mais do que 3 servidores de "
 "nomes."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "Os servidores de nomes listados abaixo podem não ser reconhecidos."
 

po/ru.po

@@ -1594,13 +1594,13 @@ msgstr "Неизвестный уровень журналирования «%s
 msgid "Unknown log domain '%s'"
 msgstr "Неизвестный домен журналирования «%s»"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "ВНИМАНИЕ: преобразователь имён glibc не поддерживает более трёх серверов "
 "имён."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "Нижеперечисленные сервера могут быть пропущены."
 

po/sl.po

@@ -446,11 +446,11 @@ msgstr "z netlink se ni mogoče povezati: %s"
 msgid "unable to join netlink group: %s"
 msgstr "skupini netlink se ni mogoče pridružiti: %s"
 
-#: ../src/named-manager/nm-named-manager.c:315
+#: ../src/dns-manager/nm-dns-manager.c:315
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "OPOMBA: libc razreševalnik morda ne podpira več kot 3 imenske strežnike."
 
-#: ../src/named-manager/nm-named-manager.c:317
+#: ../src/dns-manager/nm-dns-manager.c:317
 msgid "The nameservers listed below may not be recognized."
 msgstr "Imenski strežniki našteti spodaj morda ne bodo prepoznani."
 

po/sv.po

@@ -1849,11 +1849,11 @@ msgstr "Okänd loggnivå \"%s\""
 msgid "Unknown log domain '%s'"
 msgstr "Okänd loggdomän \"%s\""
 
-#: ../src/named-manager/nm-named-manager.c:384
+#: ../src/dns-manager/nm-dns-manager.c:384
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "OBSERVERA: uppslag via glibc kanske inte har stöd för fler än 3 namnservrar."
 
-#: ../src/named-manager/nm-named-manager.c:386
+#: ../src/dns-manager/nm-dns-manager.c:386
 msgid "The nameservers listed below may not be recognized."
 msgstr "Namnservrarna listade nedan kanske inte kommer att kännas igen."
 

po/ta.po

@@ -1594,11 +1594,11 @@ msgstr "தெரியாத பதிவு நிலை '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "தெரியாத பதிவு டொமைன் '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "குறிப்பு: இந்த libc மறுதீர்வாளர் 3 பெயர்சேவையர்களுக்கு மேல் துணைபுரியவதில்லை."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "கீழே பட்டியலிட்டப்படுள்ள பெயர்சேவையகங்கள் கண்டுபிடிக்கப்படவில்லை."
 

po/te.po

@@ -1681,11 +1681,11 @@ msgstr "తెలియని లాగ్ స్థాయి '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "తెలియని లాగ్ డొమైన్ '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:350
+#: ../src/dns-manager/nm-dns-manager.c:350
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "గమనిక: libc రిజాల్వర్ 3 నామపు సేవికలకన్నా యెక్కువ వాటికి మద్దతివ్వలేదు."
 
-#: ../src/named-manager/nm-named-manager.c:352
+#: ../src/dns-manager/nm-dns-manager.c:352
 msgid "The nameservers listed below may not be recognized."
 msgstr "క్రిందన జాబితాచేసివున్న నామపుసేవికలు గుర్తించబడక పోవచ్చును."
 

po/vi.po

@@ -57,11 +57,11 @@ msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Tùy chọn không hợp lệ. Hãy sử dụng tùy chọn trợ giúp « --help » để xem một danh sách các tùy chọn hợp lệ.\n"
 
-#: ../src/named-manager/nm-named-manager.c:218
+#: ../src/dns-manager/nm-dns-manager.c:218
 msgid "NOTE: the glibc resolver does not support more than 3 nameservers."
 msgstr "GHI CHÚ : hàm giải quyết glibc chỉ hỗ trợ đến 3 máy phục vụ tên."
 
-#: ../src/named-manager/nm-named-manager.c:220
+#: ../src/dns-manager/nm-dns-manager.c:220
 msgid "The nameservers listed below may not be recognized."
 msgstr "Những máy phục vụ tên được liệt kê dưới đây có lẽ không nhận ra được."
 

po/zh_CN.po

@@ -1682,11 +1682,11 @@ msgstr "未知日志等级 '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "未知日志域 '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:384
+#: ../src/dns-manager/nm-dns-manager.c:384
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "注意：libc 解析器可能不支持超过三个名字服务器。"
 
-#: ../src/named-manager/nm-named-manager.c:386
+#: ../src/dns-manager/nm-dns-manager.c:386
 msgid "The nameservers listed below may not be recognized."
 msgstr "以下列出的名字服务器可能无法被识别。"
 

po/zh_HK.po

@@ -44,11 +44,11 @@ msgstr ""
 "# Merged from %s\n"
 "\n"
 
-#: ../src/named-manager/nm-named-manager.c:257
+#: ../src/dns-manager/nm-dns-manager.c:257
 msgid "NOTE: the glibc resolver does not support more than 3 nameservers."
 msgstr "注意：glibc 解析器不支援 3 個以上的名稱伺服器。"
 
-#: ../src/named-manager/nm-named-manager.c:259
+#: ../src/dns-manager/nm-dns-manager.c:259
 msgid "The nameservers listed below may not be recognized."
 msgstr "下面列出的名稱伺服器可能不會被辨識。"
 

po/zh_TW.po

@@ -1591,11 +1591,11 @@ msgstr "不明日誌層級「%s」"
 msgid "Unknown log domain '%s'"
 msgstr "不明日誌網域「%s」"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:343
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "注意：libc 解析器不支援 3 個以上的名稱伺服器。"
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:345
 msgid "The nameservers listed below may not be recognized."
 msgstr "下面列出的名稱伺服器可能不會被辨識。"
 

src/Makefile.am

@@ -1,6 +1,6 @@
 SUBDIRS= \
 	logging \
-	named-manager \
+	dns-manager \
 	vpn-manager \
 	dhcp-manager \
 	ip6-manager \
@@ -18,7 +18,7 @@ INCLUDES = -I${top_srcdir}                   \
            -I${top_srcdir}/include           \
            -I${top_builddir}/marshallers   \
            -I${top_srcdir}/src/logging \
-           -I${top_srcdir}/src/named-manager \
+           -I${top_srcdir}/src/dns-manager \
            -I${top_srcdir}/src/vpn-manager   \
            -I${top_srcdir}/src/dhcp-manager  \
            -I${top_srcdir}/src/ip6-manager  \
@@ -228,7 +228,7 @@ NetworkManager_CPPFLAGS = \
 NetworkManager_LDADD = \
 	$(top_builddir)/marshallers/libmarshallers.la \
 	./logging/libnm-logging.la \
-	./named-manager/libnamed-manager.la \
+	./dns-manager/libdns-manager.la \
 	./vpn-manager/libvpn-manager.la \
 	./dhcp-manager/libdhcp-manager.la \
 	./ip6-manager/libip6-manager.la \

src/backends/Makefile.am

@@ -3,8 +3,6 @@ INCLUDES = \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/include \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/src/vpn-manager \
-	-I${top_srcdir}/src/named-manager \
 	-I${top_srcdir}/libnm-util
 
 noinst_LTLIBRARIES = libnmbackend.la

src/dhcp-manager/Makefile.am

@@ -4,8 +4,7 @@ INCLUDES = \
 	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/libnm-util \
-	-I${top_srcdir}/src \
+	-I${top_srcdir}/src
-	-I${top_srcdir}/src/named-manager
 
 noinst_LTLIBRARIES = libdhcp-manager.la
 

src/dns-manager/Makefile.am

@@ -4,17 +4,17 @@ INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/include
 
-noinst_LTLIBRARIES = libnamed-manager.la
+noinst_LTLIBRARIES = libdns-manager.la
 
-libnamed_manager_la_SOURCES = nm-named-manager.h nm-named-manager.c
+libdns_manager_la_SOURCES = nm-dns-manager.h nm-dns-manager.c
 
-libnamed_manager_la_CPPFLAGS = \
+libdns_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DNM_PKGDATADIR=\"$(pkgdatadir)\" \
 	-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
 
-libnamed_manager_la_LIBADD = \
+libdns_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS)

src/dns-manager/nm-dns-manager.c

@@ -36,7 +36,7 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-named-manager.h"
+#include "nm-dns-manager.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-logging.h"
@@ -53,14 +53,14 @@
 
 #define ADDR_BUF_LEN 50
 
-G_DEFINE_TYPE(NMNamedManager, nm_named_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE(NMDnsManager, nm_dns_manager, G_TYPE_OBJECT)
 
-#define NM_NAMED_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+#define NM_DNS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                         NM_TYPE_NAMED_MANAGER, \
+                                       NM_TYPE_DNS_MANAGER, \
-                                         NMNamedManagerPrivate))
+                                       NMDnsManagerPrivate))
 
 
-struct NMNamedManagerPrivate {
+struct NMDnsManagerPrivate {
 	NMIP4Config *ip4_vpn_config;
 	NMIP4Config *ip4_device_config;
 	NMIP6Config *ip6_vpn_config;
@@ -76,13 +76,13 @@ struct NMNamedManagerPrivate {
 };
 
 
-NMNamedManager *
+NMDnsManager *
-nm_named_manager_get (void)
+nm_dns_manager_get (void)
 {
-	static NMNamedManager * singleton = NULL;
+	static NMDnsManager * singleton = NULL;
 
 	if (!singleton)
-		singleton = NM_NAMED_MANAGER (g_object_new (NM_TYPE_NAMED_MANAGER, NULL));
+		singleton = NM_DNS_MANAGER (g_object_new (NM_TYPE_DNS_MANAGER, NULL));
 	else
 		g_object_ref (singleton);
 
@@ -92,11 +92,11 @@ nm_named_manager_get (void)
 
 
 GQuark
-nm_named_manager_error_quark (void)
+nm_dns_manager_error_quark (void)
 {
 	static GQuark quark = 0;
 	if (!quark)
-		quark = g_quark_from_static_string ("nm_named_manager_error");
+		quark = g_quark_from_static_string ("nm_dns_manager_error");
 
 	return quark;
 }
@@ -284,7 +284,7 @@ dispatch_netconfig (const char *domain,
 	// resolv.conf. Assuming netconfig works in the obvious way, then
 	// there are various failure modes, such as, eg, bringing up a VPN on
 	// eth0, then bringing up wlan0, then bringing down the VPN. Because
-	// NMNamedManager would have claimed that the VPN DNS server was also
+	// NMDnsManager would have claimed that the VPN DNS server was also
 	// part of the wlan0 config, it will remain in resolv.conf after the
 	// VPN goes down, even though it is presumably no longer reachable
 	// at that point.
@@ -353,8 +353,8 @@ write_resolv_conf (FILE *f, const char *domain,
 
 	if (fprintf (f, "%s","# Generated by NetworkManager\n") < 0) {
 		g_set_error (error,
-				   NM_NAMED_MANAGER_ERROR,
+		             NM_DNS_MANAGER_ERROR,
-				   NM_NAMED_MANAGER_ERROR_SYSTEM,
+		             NM_DNS_MANAGER_ERROR_SYSTEM,
 		             "Could not write " RESOLV_CONF ": %s\n",
 		             g_strerror (errno));
 		return FALSE;
@@ -428,8 +428,8 @@ dispatch_resolvconf (const char *domain,
 		nm_log_info (LOGD_DNS, "(%s): writing resolv.conf to %s", iface, RESOLVCONF_PATH);
 		if ((f = popen (cmd, "w")) == NULL)
 			g_set_error (error,
-				     NM_NAMED_MANAGER_ERROR,
+			             NM_DNS_MANAGER_ERROR,
-				     NM_NAMED_MANAGER_ERROR_SYSTEM,
+			             NM_DNS_MANAGER_ERROR_SYSTEM,
 			             "Could not write to %s: %s\n",
 			             RESOLVCONF_PATH,
 			             g_strerror (errno));
@@ -486,8 +486,8 @@ update_resolv_conf (const char *domain,
 		old_errno = errno;
 		if ((f = fopen (RESOLV_CONF, "w")) == NULL) {
 			g_set_error (error,
-			             NM_NAMED_MANAGER_ERROR,
+			             NM_DNS_MANAGER_ERROR,
-			             NM_NAMED_MANAGER_ERROR_SYSTEM,
+			             NM_DNS_MANAGER_ERROR_SYSTEM,
 			             "Could not open %s: %s\nCould not open %s: %s\n",
 			             tmp_resolv_conf_realpath,
 			             g_strerror (old_errno),
@@ -509,8 +509,8 @@ update_resolv_conf (const char *domain,
 			 * since its error is more important.
 			 */
 			g_set_error (error,
-			             NM_NAMED_MANAGER_ERROR,
+			             NM_DNS_MANAGER_ERROR,
-			             NM_NAMED_MANAGER_ERROR_SYSTEM,
+			             NM_DNS_MANAGER_ERROR_SYSTEM,
 			             "Could not close %s: %s\n",
 			             tmp_resolv_conf_realpath,
 			             g_strerror (errno));
@@ -523,8 +523,8 @@ update_resolv_conf (const char *domain,
 	if (*error == NULL && do_rename) {
 		if (rename (tmp_resolv_conf_realpath, resolv_conf_realpath) < 0) {
 			g_set_error (error,
-			             NM_NAMED_MANAGER_ERROR,
+			             NM_DNS_MANAGER_ERROR,
-			             NM_NAMED_MANAGER_ERROR_SYSTEM,
+			             NM_DNS_MANAGER_ERROR_SYSTEM,
 			             "Could not replace " RESOLV_CONF ": %s\n",
 			             g_strerror (errno));
 		}
@@ -537,9 +537,9 @@ out:
 }
 
 static gboolean
-rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
+rewrite_resolv_conf (NMDnsManager *mgr, const char *iface, GError **error)
 {
-	NMNamedManagerPrivate *priv;
+	NMDnsManagerPrivate *priv;
 	NMResolvConfData rc;
 	GSList *iter;
 	const char *domain = NULL;
@@ -553,7 +553,7 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
 	g_return_val_if_fail (error != NULL, FALSE);
 	g_return_val_if_fail (*error == NULL, FALSE);
 
-	priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
+	priv = NM_DNS_MANAGER_GET_PRIVATE (mgr);
 
 	if (iface) {
 		g_free (priv->last_iface);
@@ -669,25 +669,25 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
 }
 
 gboolean
-nm_named_manager_add_ip4_config (NMNamedManager *mgr,
+nm_dns_manager_add_ip4_config (NMDnsManager *mgr,
                                const char *iface,
                                NMIP4Config *config,
-								 NMNamedIPConfigType cfg_type)
+                               NMDnsIPConfigType cfg_type)
 {
-	NMNamedManagerPrivate *priv;
+	NMDnsManagerPrivate *priv;
 	GError *error = NULL;
 
 	g_return_val_if_fail (mgr != NULL, FALSE);
 	g_return_val_if_fail (iface != NULL, FALSE);
 	g_return_val_if_fail (config != NULL, FALSE);
 
-	priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
+	priv = NM_DNS_MANAGER_GET_PRIVATE (mgr);
 
 	switch (cfg_type) {
-	case NM_NAMED_IP_CONFIG_TYPE_VPN:
+	case NM_DNS_IP_CONFIG_TYPE_VPN:
 		priv->ip4_vpn_config = config;
 		break;
-	case NM_NAMED_IP_CONFIG_TYPE_BEST_DEVICE:
+	case NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE:
 		priv->ip4_device_config = config;
 		break;
 	default:
@@ -707,18 +707,18 @@ nm_named_manager_add_ip4_config (NMNamedManager *mgr,
 }
 
 gboolean
-nm_named_manager_remove_ip4_config (NMNamedManager *mgr,
+nm_dns_manager_remove_ip4_config (NMDnsManager *mgr,
                                   const char *iface,
                                   NMIP4Config *config)
 {
-	NMNamedManagerPrivate *priv;
+	NMDnsManagerPrivate *priv;
 	GError *error = NULL;
 
 	g_return_val_if_fail (mgr != NULL, FALSE);
 	g_return_val_if_fail (iface != NULL, FALSE);
 	g_return_val_if_fail (config != NULL, FALSE);
 
-	priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
+	priv = NM_DNS_MANAGER_GET_PRIVATE (mgr);
 
 	/* Can't remove it if it wasn't in the list to begin with */
 	if (!g_slist_find (priv->configs, config))
@@ -743,27 +743,27 @@ nm_named_manager_remove_ip4_config (NMNamedManager *mgr,
 }
 
 gboolean
-nm_named_manager_add_ip6_config (NMNamedManager *mgr,
+nm_dns_manager_add_ip6_config (NMDnsManager *mgr,
                                const char *iface,
                                NMIP6Config *config,
-								 NMNamedIPConfigType cfg_type)
+                               NMDnsIPConfigType cfg_type)
 {
-	NMNamedManagerPrivate *priv;
+	NMDnsManagerPrivate *priv;
 	GError *error = NULL;
 
 	g_return_val_if_fail (mgr != NULL, FALSE);
 	g_return_val_if_fail (iface != NULL, FALSE);
 	g_return_val_if_fail (config != NULL, FALSE);
 
-	priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
+	priv = NM_DNS_MANAGER_GET_PRIVATE (mgr);
 
 	switch (cfg_type) {
-	case NM_NAMED_IP_CONFIG_TYPE_VPN:
+	case NM_DNS_IP_CONFIG_TYPE_VPN:
 		/* FIXME: not quite yet... */
-		g_return_val_if_fail (cfg_type != NM_NAMED_IP_CONFIG_TYPE_VPN, FALSE);
+		g_return_val_if_fail (cfg_type != NM_DNS_IP_CONFIG_TYPE_VPN, FALSE);
 		priv->ip6_vpn_config = config;
 		break;
-	case NM_NAMED_IP_CONFIG_TYPE_BEST_DEVICE:
+	case NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE:
 		priv->ip6_device_config = config;
 		break;
 	default:
@@ -783,18 +783,18 @@ nm_named_manager_add_ip6_config (NMNamedManager *mgr,
 }
 
 gboolean
-nm_named_manager_remove_ip6_config (NMNamedManager *mgr,
+nm_dns_manager_remove_ip6_config (NMDnsManager *mgr,
                                   const char *iface,
                                   NMIP6Config *config)
 {
-	NMNamedManagerPrivate *priv;
+	NMDnsManagerPrivate *priv;
 	GError *error = NULL;
 
 	g_return_val_if_fail (mgr != NULL, FALSE);
 	g_return_val_if_fail (iface != NULL, FALSE);
 	g_return_val_if_fail (config != NULL, FALSE);
 
-	priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
+	priv = NM_DNS_MANAGER_GET_PRIVATE (mgr);
 
 	/* Can't remove it if it wasn't in the list to begin with */
 	if (!g_slist_find (priv->configs, config))
@@ -819,10 +819,10 @@ nm_named_manager_remove_ip6_config (NMNamedManager *mgr,
 }
 
 void
-nm_named_manager_set_hostname (NMNamedManager *mgr,
+nm_dns_manager_set_hostname (NMDnsManager *mgr,
                                const char *hostname)
 {
-	NMNamedManagerPrivate *priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
+	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (mgr);
 	GError *error = NULL;
 	const char *filtered = NULL;
 
@@ -854,30 +854,30 @@ nm_named_manager_set_hostname (NMNamedManager *mgr,
 
 
 static void
-nm_named_manager_init (NMNamedManager *mgr)
+nm_dns_manager_init (NMDnsManager *mgr)
 {
 }
 
 static void
-nm_named_manager_finalize (GObject *object)
+nm_dns_manager_finalize (GObject *object)
 {
-	NMNamedManagerPrivate *priv = NM_NAMED_MANAGER_GET_PRIVATE (object);
+	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (object);
 
 	g_slist_foreach (priv->configs, (GFunc) g_object_unref, NULL);
 	g_slist_free (priv->configs);
 	g_free (priv->hostname);
 	g_free (priv->last_iface);
 
-	G_OBJECT_CLASS (nm_named_manager_parent_class)->finalize (object);
+	G_OBJECT_CLASS (nm_dns_manager_parent_class)->finalize (object);
 }
 
 static void
-nm_named_manager_class_init (NMNamedManagerClass *klass)
+nm_dns_manager_class_init (NMDnsManagerClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize = nm_named_manager_finalize;
+	object_class->finalize = nm_dns_manager_finalize;
 
-	g_type_class_add_private (object_class, sizeof (NMNamedManagerPrivate));
+	g_type_class_add_private (object_class, sizeof (NMDnsManagerPrivate));
 }
 

src/dns-manager/nm-dns-manager.h

@@ -0,0 +1,95 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
+ * Copyright (C) 2004 - 2010 Red Hat, Inc.
+ * Copyright (C) 2005 - 2008 Novell, Inc.
+ *   and others
+ */
+
+#ifndef NM_DNS_MANAGER_H
+#define NM_DNS_MANAGER_H
+
+#include "config.h"
+#include <glib-object.h>
+#include <dbus/dbus.h>
+#include "nm-ip4-config.h"
+#include "nm-ip6-config.h"
+
+typedef enum {
+	NM_DNS_MANAGER_ERROR_SYSTEM,
+	NM_DNS_MANAGER_ERROR_INVALID_NAMESERVER,
+	NM_DNS_MANAGER_ERROR_INVALID_HOST,
+	NM_DNS_MANAGER_ERROR_INVALID_ID
+} NMDnsManagerError;
+
+typedef enum {
+	NM_DNS_IP_CONFIG_TYPE_DEFAULT = 0,
+	NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE,
+	NM_DNS_IP_CONFIG_TYPE_VPN
+} NMDnsIPConfigType;
+
+#define NM_DNS_MANAGER_ERROR nm_dns_manager_error_quark ()
+GQuark nm_dns_manager_error_quark (void);
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_DNS_MANAGER (nm_dns_manager_get_type ())
+#define NM_DNS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_DNS_MANAGER, NMDnsManager))
+#define NM_DNS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NM_TYPE_DNS_MANAGER, NMDnsManagerClass))
+#define NM_IS_DNS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_DNS_MANAGER))
+#define NM_IS_DNS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_DNS_MANAGER))
+#define NM_DNS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_DNS_MANAGER, NMDnsManagerClass)) 
+
+typedef struct NMDnsManagerPrivate NMDnsManagerPrivate;
+
+typedef struct {
+	GObject parent;
+} NMDnsManager;
+
+typedef struct {
+	GObjectClass parent;
+} NMDnsManagerClass;
+
+GType nm_dns_manager_get_type (void);
+
+NMDnsManager * nm_dns_manager_get (void);
+
+gboolean nm_dns_manager_add_ip4_config (NMDnsManager *mgr,
+                                        const char *iface,
+                                        NMIP4Config *config,
+                                        NMDnsIPConfigType cfg_type);
+
+gboolean nm_dns_manager_remove_ip4_config (NMDnsManager *mgr,
+                                           const char *iface,
+                                           NMIP4Config *config);
+
+gboolean nm_dns_manager_add_ip6_config (NMDnsManager *mgr,
+                                        const char *iface,
+                                        NMIP6Config *config,
+                                        NMDnsIPConfigType cfg_type);
+
+gboolean nm_dns_manager_remove_ip6_config (NMDnsManager *mgr,
+                                           const char *iface,
+                                           NMIP6Config *config);
+
+void nm_dns_manager_set_hostname (NMDnsManager *mgr,
+                                  const char *hostname);
+
+G_END_DECLS
+
+#endif /* NM_DNS_MANAGER_H */

src/ip6-manager/Makefile.am

@@ -4,8 +4,7 @@ INCLUDES = \
 	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/src \
+	-I${top_srcdir}/src
-	-I${top_srcdir}/src/named-manager
 
 noinst_LTLIBRARIES = libip6-manager.la
 

src/main.c

@@ -41,7 +41,7 @@
 #include "nm-manager.h"
 #include "nm-policy.h"
 #include "nm-system.h"
-#include "nm-named-manager.h"
+#include "nm-dns-manager.h"
 #include "nm-dbus-manager.h"
 #include "nm-supplicant-manager.h"
 #include "nm-dhcp-manager.h"
@@ -446,7 +446,7 @@ main (int argc, char *argv[])
 	gboolean success;
 	NMPolicy *policy = NULL;
 	NMVPNManager *vpn_manager = NULL;
-	NMNamedManager *named_mgr = NULL;
+	NMDnsManager *dns_mgr = NULL;
 	NMDBusManager *dbus_mgr = NULL;
 	NMSupplicantManager *sup_mgr = NULL;
 	NMDHCPManager *dhcp_mgr = NULL;
@@ -663,9 +663,9 @@ main (int argc, char *argv[])
 		goto done;
 	}
 
-	named_mgr = nm_named_manager_get ();
+	dns_mgr = nm_dns_manager_get ();
-	if (!named_mgr) {
+	if (!dns_mgr) {
-		nm_log_err (LOGD_CORE, "failed to start the named manager.");
+		nm_log_err (LOGD_CORE, "failed to start the DNS manager.");
 		goto done;
 	}
 
@@ -733,8 +733,8 @@ done:
 	if (vpn_manager)
 		g_object_unref (vpn_manager);
 
-	if (named_mgr)
+	if (dns_mgr)
-		g_object_unref (named_mgr);
+		g_object_unref (dns_mgr);
 
 	if (dhcp_mgr)
 		g_object_unref (dhcp_mgr);

src/named-manager/nm-named-manager.h

@@ -1,95 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
- * Copyright (C) 2004 - 2010 Red Hat, Inc.
- * Copyright (C) 2005 - 2008 Novell, Inc.
- *   and others
- */
-
-#ifndef __NM_NAMED_MANAGER_H__
-#define __NM_NAMED_MANAGER_H__
-
-#include "config.h"
-#include <glib-object.h>
-#include <dbus/dbus.h>
-#include "nm-ip4-config.h"
-#include "nm-ip6-config.h"
-
-typedef enum {
-	NM_NAMED_MANAGER_ERROR_SYSTEM,
-	NM_NAMED_MANAGER_ERROR_INVALID_NAMESERVER,
-	NM_NAMED_MANAGER_ERROR_INVALID_HOST,
-	NM_NAMED_MANAGER_ERROR_INVALID_ID
-} NMNamedManagerError;
-
-typedef enum {
-	NM_NAMED_IP_CONFIG_TYPE_DEFAULT = 0,
-	NM_NAMED_IP_CONFIG_TYPE_BEST_DEVICE,
-	NM_NAMED_IP_CONFIG_TYPE_VPN
-} NMNamedIPConfigType;
-
-#define NM_NAMED_MANAGER_ERROR nm_named_manager_error_quark ()
-GQuark nm_named_manager_error_quark (void);
-
-G_BEGIN_DECLS
-
-#define NM_TYPE_NAMED_MANAGER (nm_named_manager_get_type ())
-#define NM_NAMED_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_NAMED_MANAGER, NMNamedManager))
-#define NM_NAMED_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NM_TYPE_NAMED_MANAGER, NMNamedManagerClass))
-#define NM_IS_NAMED_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_NAMED_MANAGER))
-#define NM_IS_NAMED_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_NAMED_MANAGER))
-#define NM_NAMED_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_NAMED_MANAGER, NMNamedManagerClass)) 
-
-typedef struct NMNamedManagerPrivate NMNamedManagerPrivate;
-
-typedef struct {
-	GObject parent;
-} NMNamedManager;
-
-typedef struct {
-	GObjectClass parent;
-} NMNamedManagerClass;
-
-GType nm_named_manager_get_type (void);
-
-NMNamedManager * nm_named_manager_get (void);
-
-gboolean nm_named_manager_add_ip4_config (NMNamedManager *mgr,
-										  const char *iface,
-                                          NMIP4Config *config,
-                                          NMNamedIPConfigType cfg_type);
-
-gboolean nm_named_manager_remove_ip4_config (NMNamedManager *mgr,
-											 const char *iface,
-											 NMIP4Config *config);
-
-gboolean nm_named_manager_add_ip6_config (NMNamedManager *mgr,
-										  const char *iface,
-                                          NMIP6Config *config,
-                                          NMNamedIPConfigType cfg_type);
-
-gboolean nm_named_manager_remove_ip6_config (NMNamedManager *mgr,
-											 const char *iface,
-											 NMIP6Config *config);
-
-void nm_named_manager_set_hostname (NMNamedManager *mgr,
-                                    const char *hostname);
-
-G_END_DECLS
-
-#endif /* __NM_NAMED_MANAGER_H__ */

src/nm-device.c

@@ -42,7 +42,7 @@
 #include "nm-system.h"
 #include "nm-dhcp-manager.h"
 #include "nm-dbus-manager.h"
-#include "nm-named-manager.h"
+#include "nm-dns-manager.h"
 #include "nm-utils.h"
 #include "nm-logging.h"
 #include "nm-netlink-monitor.h"
@@ -3021,7 +3021,7 @@ nm_device_set_ip4_config (NMDevice *self,
 	NMIP4Config *old_config = NULL;
 	gboolean success = TRUE;
 	NMIP4ConfigCompareFlags diff = NM_IP4_COMPARE_FLAG_ALL;
-	NMNamedManager *named_mgr;
+	NMDnsManager *dns_mgr;
 
 	g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
 	g_return_val_if_fail (reason != NULL, FALSE);
@@ -3038,10 +3038,10 @@ nm_device_set_ip4_config (NMDevice *self,
 	if (diff == NM_IP4_COMPARE_FLAG_NONE)
 		return TRUE;
 
-	named_mgr = nm_named_manager_get ();
+	dns_mgr = nm_dns_manager_get ();
 	if (old_config) {
-		/* Remove any previous IP4 Config from the named manager */
+		/* Remove any previous IP4 Config from the DNS manager */
-		nm_named_manager_remove_ip4_config (named_mgr, ip_iface, old_config);
+		nm_dns_manager_remove_ip4_config (dns_mgr, ip_iface, old_config);
 		g_object_unref (old_config);
 		priv->ip4_config = NULL;
 	}
@@ -3060,13 +3060,13 @@ nm_device_set_ip4_config (NMDevice *self,
 			if (!nm_ip4_config_get_dbus_path (new_config))
 				nm_ip4_config_export (new_config);
 
-			/* Add the DNS information to the named manager */
+			/* Add the DNS information to the DNS manager */
-			nm_named_manager_add_ip4_config (named_mgr, ip_iface, new_config, NM_NAMED_IP_CONFIG_TYPE_DEFAULT);
+			nm_dns_manager_add_ip4_config (dns_mgr, ip_iface, new_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT);
 
 			nm_device_update_ip4_address (self);
 		}
 	}
-	g_object_unref (named_mgr);
+	g_object_unref (dns_mgr);
 
 	g_object_notify (G_OBJECT (self), NM_DEVICE_INTERFACE_IP4_CONFIG);
 
@@ -3124,7 +3124,7 @@ nm_device_set_ip6_config (NMDevice *self,
 	NMIP6Config *old_config = NULL;
 	gboolean success = TRUE;
 	NMIP6ConfigCompareFlags diff = NM_IP6_COMPARE_FLAG_ALL;
-	NMNamedManager *named_mgr;
+	NMDnsManager *dns_mgr;
 
 	g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
 	g_return_val_if_fail (reason != NULL, FALSE);
@@ -3141,10 +3141,10 @@ nm_device_set_ip6_config (NMDevice *self,
 	if (diff == NM_IP6_COMPARE_FLAG_NONE)
 		return TRUE;
 
-	named_mgr = nm_named_manager_get ();
+	dns_mgr = nm_dns_manager_get ();
 	if (old_config) {
-		/* Remove any previous IP6 Config from the named manager */
+		/* Remove any previous IP6 Config from the DNS manager */
-		nm_named_manager_remove_ip6_config (named_mgr, ip_iface, old_config);
+		nm_dns_manager_remove_ip6_config (dns_mgr, ip_iface, old_config);
 		g_object_unref (old_config);
 		priv->ip6_config = NULL;
 	}
@@ -3163,11 +3163,11 @@ nm_device_set_ip6_config (NMDevice *self,
 			if (!nm_ip6_config_get_dbus_path (new_config))
 				nm_ip6_config_export (new_config);
 
-			/* Add the DNS information to the named manager */
+			/* Add the DNS information to the DNS manager */
-			nm_named_manager_add_ip6_config (named_mgr, ip_iface, new_config, NM_NAMED_IP_CONFIG_TYPE_DEFAULT);
+			nm_dns_manager_add_ip6_config (dns_mgr, ip_iface, new_config, NM_DNS_IP_CONFIG_TYPE_DEFAULT);
 		}
 	}
-	g_object_unref (named_mgr);
+	g_object_unref (dns_mgr);
 
 	g_object_notify (G_OBJECT (self), NM_DEVICE_INTERFACE_IP6_CONFIG);
 

src/nm-policy.c

@@ -39,7 +39,7 @@
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-connection.h"
 #include "nm-system.h"
-#include "nm-named-manager.h"
+#include "nm-dns-manager.h"
 #include "nm-vpn-manager.h"
 #include "nm-policy-hosts.h"
 #include "nm-policy-hostname.h"
@@ -236,14 +236,14 @@ _set_hostname (NMPolicy *policy,
 	char ip6_addr[INET6_ADDRSTRLEN + 1];
 
 	if (change_hostname) {
-		NMNamedManager *named_mgr;
+		NMDnsManager *dns_mgr;
 
 		g_free (policy->cur_hostname);
 		policy->cur_hostname = g_strdup (new_hostname);
 
-		named_mgr = nm_named_manager_get ();
+		dns_mgr = nm_dns_manager_get ();
-		nm_named_manager_set_hostname (named_mgr, policy->cur_hostname);
+		nm_dns_manager_set_hostname (dns_mgr, policy->cur_hostname);
-		g_object_unref (named_mgr);
+		g_object_unref (dns_mgr);
 	}
 
 	/* Get the default IPv4 and IPv6 addresses so we can assign
@@ -453,10 +453,10 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 static void
 update_ip4_routing_and_dns (NMPolicy *policy, gboolean force_update)
 {
-	NMNamedIPConfigType dns_type = NM_NAMED_IP_CONFIG_TYPE_BEST_DEVICE;
+	NMDnsIPConfigType dns_type = NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE;
 	NMDevice *best = NULL;
 	NMActRequest *best_req = NULL;
-	NMNamedManager *named_mgr;
+	NMDnsManager *dns_mgr;
 	GSList *devices = NULL, *iter, *vpns;
 	NMIP4Config *ip4_config = NULL;
 	NMIP4Address *addr;
@@ -513,7 +513,7 @@ update_ip4_routing_and_dns (NMPolicy *policy, gboolean force_update)
 			                                         nm_device_get_ip_iface (parent),
 			                                         nm_ip4_config_get_mss (parent_ip4));
 
-			dns_type = NM_NAMED_IP_CONFIG_TYPE_VPN;
+			dns_type = NM_DNS_IP_CONFIG_TYPE_VPN;
 		}
 		g_object_unref (candidate);
 	}
@@ -529,7 +529,7 @@ update_ip4_routing_and_dns (NMPolicy *policy, gboolean force_update)
 
 		nm_system_replace_default_ip4_route (ip_iface, nm_ip4_address_get_gateway (addr), nm_ip4_config_get_mss (ip4_config));
 
-		dns_type = NM_NAMED_IP_CONFIG_TYPE_BEST_DEVICE;
+		dns_type = NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE;
 	}
 
 	if (!ip_iface || !ip4_config) {
@@ -553,9 +553,9 @@ update_ip4_routing_and_dns (NMPolicy *policy, gboolean force_update)
 			nm_act_request_set_default (req, FALSE);
 	}
 
-	named_mgr = nm_named_manager_get ();
+	dns_mgr = nm_dns_manager_get ();
-	nm_named_manager_add_ip4_config (named_mgr, ip_iface, ip4_config, dns_type);
+	nm_dns_manager_add_ip4_config (dns_mgr, ip_iface, ip4_config, dns_type);
-	g_object_unref (named_mgr);
+	g_object_unref (dns_mgr);
 
 	/* Now set new default active connection _after_ updating DNS info, so that
 	 * if the connection is shared dnsmasq picks up the right stuff.
@@ -580,10 +580,10 @@ out:
 static void
 update_ip6_routing_and_dns (NMPolicy *policy, gboolean force_update)
 {
-	NMNamedIPConfigType dns_type = NM_NAMED_IP_CONFIG_TYPE_BEST_DEVICE;
+	NMDnsIPConfigType dns_type = NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE;
 	NMDevice *best = NULL;
 	NMActRequest *best_req = NULL;
-	NMNamedManager *named_mgr;
+	NMDnsManager *dns_mgr;
 	GSList *devices = NULL, *iter;
 #if NOT_YET
 	GSList *vpns;
@@ -638,7 +638,7 @@ update_ip6_routing_and_dns (NMPolicy *policy, gboolean force_update)
 			                                         nm_device_get_ip_iface (parent),
 			                                         nm_ip6_config_get_mss (parent_ip4));
 
-			dns_type = NM_NAMED_IP_CONFIG_TYPE_VPN;
+			dns_type = NM_DNS_IP_CONFIG_TYPE_VPN;
 		}
 		g_object_unref (candidate);
 	}
@@ -655,7 +655,7 @@ update_ip6_routing_and_dns (NMPolicy *policy, gboolean force_update)
 
 		nm_system_replace_default_ip6_route (ip_iface, nm_ip6_address_get_gateway (addr));
 
-		dns_type = NM_NAMED_IP_CONFIG_TYPE_BEST_DEVICE;
+		dns_type = NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE;
 	}
 
 	if (!ip_iface || !ip6_config) {
@@ -679,9 +679,9 @@ update_ip6_routing_and_dns (NMPolicy *policy, gboolean force_update)
 			nm_act_request_set_default6 (req, FALSE);
 	}
 
-	named_mgr = nm_named_manager_get ();
+	dns_mgr = nm_dns_manager_get ();
-	nm_named_manager_add_ip6_config (named_mgr, ip_iface, ip6_config, dns_type);
+	nm_dns_manager_add_ip6_config (dns_mgr, ip_iface, ip6_config, dns_type);
-	g_object_unref (named_mgr);
+	g_object_unref (dns_mgr);
 
 	/* Now set new default active connection _after_ updating DNS info, so that
 	 * if the connection is shared dnsmasq picks up the right stuff.

src/nm-system.c

@@ -44,7 +44,6 @@
 
 #include "nm-system.h"
 #include "nm-device.h"
-#include "nm-named-manager.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-logging.h"

src/supplicant-manager/Makefile.am

@@ -5,8 +5,7 @@ INCLUDES = \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/include \
 	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/marshallers \
+	-I${top_builddir}/marshallers
-	-I${top_srcdir}/src/named-manager
 
 noinst_LTLIBRARIES = libsupplicant-manager.la
 

src/vpn-manager/Makefile.am

@@ -5,7 +5,7 @@ INCLUDES = \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/marshallers \
-	-I${top_srcdir}/src/named-manager \
+	-I${top_srcdir}/src/dns-manager \
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
 
 

src/vpn-manager/nm-vpn-connection.c

@@ -44,7 +44,7 @@
 #include "nm-properties-changed-signal.h"
 #include "nm-dbus-glib-types.h"
 #include "NetworkManagerUtils.h"
-#include "nm-named-manager.h"
+#include "nm-dns-manager.h"
 #include "nm-netlink-monitor.h"
 #include "nm-glib-compat.h"
 
@@ -543,15 +543,15 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
 	nm_system_device_set_up_down_with_iface (priv->ip_iface, TRUE, NULL);
 
 	if (nm_system_apply_ip4_config (priv->ip_iface, config, 0, NM_IP4_COMPARE_FLAG_ALL)) {
-		NMNamedManager *named_mgr;
+		NMDnsManager *dns_mgr;
 
 		/* Add any explicit route to the VPN gateway through the parent device */
 		priv->gw_route = nm_system_add_ip4_vpn_gateway_route (priv->parent_dev, config);
 
 		/* Add the VPN to DNS */
-		named_mgr = nm_named_manager_get ();
+		dns_mgr = nm_dns_manager_get ();
-		nm_named_manager_add_ip4_config (named_mgr, priv->ip_iface, config, NM_NAMED_IP_CONFIG_TYPE_VPN);
+		nm_dns_manager_add_ip4_config (dns_mgr, priv->ip_iface, config, NM_DNS_IP_CONFIG_TYPE_VPN);
-		g_object_unref (named_mgr);
+		g_object_unref (dns_mgr);
 
 		priv->ip4_config = config;
 
@@ -899,12 +899,12 @@ vpn_cleanup (NMVPNConnection *connection)
 
 	if (priv->ip4_config) {
 		NMIP4Config *parent_config;
-		NMNamedManager *named_mgr;
+		NMDnsManager *dns_mgr;
 
 		/* Remove attributes of the VPN's IP4 Config */
-		named_mgr = nm_named_manager_get ();
+		dns_mgr = nm_dns_manager_get ();
-		nm_named_manager_remove_ip4_config (named_mgr, priv->ip_iface, priv->ip4_config);
+		nm_dns_manager_remove_ip4_config (dns_mgr, priv->ip_iface, priv->ip4_config);
-		g_object_unref (named_mgr);
+		g_object_unref (dns_mgr);
 
 		/* Remove any previously added VPN gateway host route */
 		if (priv->gw_route)