diff options
| author | Dan Winship <danw@gnome.org> | 2013-03-11 16:15:14 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-04-03 10:23:49 -0400 |
| commit | a15558daed7b94fd810303451089f7799d3eb65d (patch) | |
| tree | c393b78cf91483f8bebd4713adbedd8c2ef4779b /src/dns-manager/nm-dns-dnsmasq.c | |
| parent | 6d9aae3b472f8a9bce1af781d766c5314188da66 (diff) | |
| download | NetworkManager-a15558daed7b94fd810303451089f7799d3eb65d.tar.gz | |
dns-manager: minor cleanups
Remove the unused NMDnsPlugin::init method, some unused #includes, and
an out-of-date comment.
Use the correct macro for the default "/etc/resolv.conf" path.
Simplify NMDnsManager::dispose() a bit.
Make nm_dns_dnsmasq_new() return an NMDnsPlugin* rather than
NMDnsDnsmasq*.
Diffstat (limited to 'src/dns-manager/nm-dns-dnsmasq.c')
| -rw-r--r-- | src/dns-manager/nm-dns-dnsmasq.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index f7e27da3fe..61b08c674e 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -387,12 +387,6 @@ child_quit (NMDnsPlugin *plugin, gint status) /****************************************************************/ static gboolean -init (NMDnsPlugin *plugin) -{ - return TRUE; -} - -static gboolean is_caching (NMDnsPlugin *plugin) { return TRUE; @@ -406,10 +400,10 @@ get_name (NMDnsPlugin *plugin) /****************************************************************/ -NMDnsDnsmasq * +NMDnsPlugin * nm_dns_dnsmasq_new (void) { - return (NMDnsDnsmasq *) g_object_new (NM_TYPE_DNS_DNSMASQ, NULL); + return g_object_new (NM_TYPE_DNS_DNSMASQ, NULL); } static void @@ -435,7 +429,6 @@ nm_dns_dnsmasq_class_init (NMDnsDnsmasqClass *dns_class) object_class->dispose = dispose; - plugin_class->init = init; plugin_class->child_quit = child_quit; plugin_class->is_caching = is_caching; plugin_class->update = update; |