network: Remove unnecessary nm-default.h
This commit is contained in:
Robert Ancell
Georges Basile Stavracas Neto
parent
8bcc2f811a
commit
f63ac35b41
18 changed files with 22 additions and 116 deletions
|
|
@ -20,10 +20,7 @@
|
|||
* Copyright 2012 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "eap-method.h"
|
||||
#include "eap-method-fast.h"
|
||||
|
|
|
|||
|
|
@ -20,10 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "eap-method.h"
|
||||
#include "eap-method-leap.h"
|
||||
|
|
|
|||
|
|
@ -20,10 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "eap-method.h"
|
||||
#include "eap-method-peap.h"
|
||||
|
|
|
|||
|
|
@ -20,10 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "eap-method.h"
|
||||
#include "eap-method-simple.h"
|
||||
|
|
@ -288,7 +285,10 @@ eap_method_simple_dispose (GObject *object)
|
|||
g_signal_handlers_disconnect_by_data (self->password_entry, self);
|
||||
g_signal_handlers_disconnect_by_data (self->show_password_check, self);
|
||||
|
||||
nm_clear_g_source (&self->idle_func_id);
|
||||
if (self->idle_func_id != 0) {
|
||||
g_source_remove (self->idle_func_id);
|
||||
self->idle_func_id = 0;
|
||||
}
|
||||
|
||||
G_OBJECT_CLASS (eap_method_simple_parent_class)->dispose (object);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,10 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "eap-method.h"
|
||||
#include "eap-method-tls.h"
|
||||
|
|
|
|||
|
|
@ -20,10 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "eap-method.h"
|
||||
#include "eap-method-simple.h"
|
||||
|
|
|
|||
|
|
@ -21,13 +21,8 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "eap-method.h"
|
||||
#include "utils.h"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <NetworkManager.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
* Copyright 2009 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include "helpers.h"
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@
|
|||
#ifndef _HELPERS_H_
|
||||
#define _HELPERS_H_
|
||||
|
||||
#include <NetworkManager.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
typedef const char * (*HelperSecretFunc)(NMSetting *);
|
||||
|
||||
void helper_fill_secret_entry (NMConnection *connection,
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/* NetworkManager -- Network link manager
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* (C) Copyright 2015 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#ifndef __NM_DEFAULT_H__
|
||||
#define __NM_DEFAULT_H__
|
||||
|
||||
#define LIBNM_GLIB_BUILD
|
||||
#define NETWORKMANAGER_COMPILATION
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
/* always include these headers for our internal source files. */
|
||||
|
||||
#ifndef ___CONFIG_H__
|
||||
#define ___CONFIG_H__
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <libnm/nm-connection.h>
|
||||
#include <libnm/nm-setting-wireless-security.h>
|
||||
#include <libnm/nm-setting-8021x.h>
|
||||
|
||||
static inline gboolean
|
||||
nm_clear_g_source (guint *id)
|
||||
{
|
||||
if (id && *id) {
|
||||
g_source_remove (*id);
|
||||
*id = 0;
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#endif /* __NM_DEFAULT_H__ */
|
||||
|
|
@ -20,9 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "wireless-security.h"
|
||||
#include "wireless-security-resources.h"
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <NetworkManager.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
|||
|
|
@ -20,10 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "eap-method.h"
|
||||
#include "eap-method-fast.h"
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "ws-leap.h"
|
||||
#include "wireless-security.h"
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "ws-wep-key.h"
|
||||
#include "wireless-security.h"
|
||||
|
|
|
|||
|
|
@ -20,10 +20,7 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "ws-wpa-eap.h"
|
||||
#include "wireless-security.h"
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@
|
|||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "ws-wpa-psk.h"
|
||||
#include "wireless-security.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue