[network-manager-applet/th/tmp: 1/5] include: cleanup include of "config.h"
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/th/tmp: 1/5] include: cleanup include of "config.h"
- Date: Tue, 16 Feb 2016 19:01:13 +0000 (UTC)
commit 5c4691b489450aaf5ef69f28b5f07177f5924c0c
Author: Thomas Haller <thaller redhat com>
Date: Tue Feb 16 18:33:38 2016 +0100
include: cleanup include of "config.h"
Don't check for #ifdef HAVE_CONFIG_H" and include the file
with single quotes.
Also, don't include "config.h" in a header file.
src/ap-menu-item.c | 4 +---
src/applet-agent.c | 4 +---
src/applet-device-broadband.c | 4 +---
src/applet-device-bt.c | 4 +---
src/applet-device-ethernet.c | 4 +---
src/applet-device-wifi.c | 4 +---
src/applet-vpn-request.c | 3 ++-
src/applet.c | 4 +---
src/applet.h | 4 ----
src/connection-editor/ce-page.c | 2 +-
src/connection-editor/ce-polkit-button.c | 2 ++
src/connection-editor/connection-helpers.c | 2 +-
src/connection-editor/main.c | 4 +---
src/connection-editor/nm-connection-list.c | 3 ++-
src/connection-editor/ppp-auth-methods-dialog.c | 2 ++
src/ethernet-dialog.c | 4 +---
src/libnm-gtk/nm-ui-utils.c | 4 +---
src/libnm-gtk/nm-vpn-password-dialog.c | 2 +-
src/libnm-gtk/nm-wifi-dialog.c | 2 +-
src/libnm-gtk/nm-wireless-dialog.c | 2 +-
src/libnma/nma-ui-utils.c | 4 +---
src/libnma/nma-vpn-password-dialog.c | 2 +-
src/libnma/nma-wifi-dialog.c | 2 +-
src/main.c | 4 +---
src/mb-menu-item.c | 4 +---
src/mobile-helpers.c | 2 ++
src/utils/tests/test-utils.c | 2 ++
src/utils/utils.c | 3 ++-
src/wireless-security/eap-method-leap.c | 2 ++
src/wireless-security/eap-method-simple.c | 2 ++
src/wireless-security/helpers.c | 2 ++
src/wireless-security/ws-dynamic-wep.c | 2 ++
src/wireless-security/ws-leap.c | 2 ++
src/wireless-security/ws-wep-key.c | 2 ++
src/wireless-security/ws-wpa-eap.c | 2 ++
src/wireless-security/ws-wpa-psk.c | 2 ++
36 files changed, 50 insertions(+), 53 deletions(-)
---
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index fe5f484..b5c7a61 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -21,9 +21,7 @@
* Copyright 2005 - 2014 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <stdio.h>
#include <glib/gi18n.h>
diff --git a/src/applet-agent.c b/src/applet-agent.c
index 0fabbf5..714313b 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -19,9 +19,7 @@
* Copyright 2011 - 2014 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib/gi18n.h>
#include <string.h>
diff --git a/src/applet-device-broadband.c b/src/applet-device-broadband.c
index 66ae9a5..4464b79 100644
--- a/src/applet-device-broadband.c
+++ b/src/applet-device-broadband.c
@@ -18,9 +18,7 @@
* (C) Copyright 2012 Aleksander Morgado <aleksander gnu org>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <ctype.h>
diff --git a/src/applet-device-bt.c b/src/applet-device-bt.c
index 5ec2f5e..3c18440 100644
--- a/src/applet-device-bt.c
+++ b/src/applet-device-bt.c
@@ -21,9 +21,7 @@
* Copyright 2008 Novell, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
diff --git a/src/applet-device-ethernet.c b/src/applet-device-ethernet.c
index 4fafaeb..59de051 100644
--- a/src/applet-device-ethernet.c
+++ b/src/applet-device-ethernet.c
@@ -21,9 +21,7 @@
* Copyright 2008 Novell, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 9bf60fa..79d36a6 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -20,9 +20,7 @@
* Copyright 2008 - 2014 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/src/applet-vpn-request.c b/src/applet-vpn-request.c
index 25d51c5..4ef4e27 100644
--- a/src/applet-vpn-request.c
+++ b/src/applet-vpn-request.c
@@ -20,7 +20,8 @@
* Copyright 2004 - 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/applet.c b/src/applet.c
index 3d31d7e..73680c4 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -27,9 +27,7 @@
* Copyright 2001, 2002 Free Software Foundation
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <time.h>
#include <string.h>
diff --git a/src/applet.h b/src/applet.h
index f4e58e1..40aef69 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -22,10 +22,6 @@
#ifndef APPLET_H
#define APPLET_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <gtk/gtk.h>
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index d8425d8..1a75db6 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -20,7 +20,7 @@
* Copyright 2008 - 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <net/ethernet.h>
#include <netinet/ether.h>
diff --git a/src/connection-editor/ce-polkit-button.c b/src/connection-editor/ce-polkit-button.c
index 2269eb5..2c02040 100644
--- a/src/connection-editor/ce-polkit-button.c
+++ b/src/connection-editor/ce-polkit-button.c
@@ -20,6 +20,8 @@
* Copyright 2009 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gtk/gtk.h>
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index ed2cd52..10d0b15 100644
--- a/src/connection-editor/connection-helpers.c
+++ b/src/connection-editor/connection-helpers.c
@@ -18,7 +18,7 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <glib/gi18n.h>
diff --git a/src/connection-editor/main.c b/src/connection-editor/main.c
index d2e3110..2864f8e 100644
--- a/src/connection-editor/main.c
+++ b/src/connection-editor/main.c
@@ -20,9 +20,7 @@
* Copyright 2004 - 2014 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+# include "config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index 2f5ac0d..f23c8cb 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -21,7 +21,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/src/connection-editor/ppp-auth-methods-dialog.c b/src/connection-editor/ppp-auth-methods-dialog.c
index 873ceef..ff40000 100644
--- a/src/connection-editor/ppp-auth-methods-dialog.c
+++ b/src/connection-editor/ppp-auth-methods-dialog.c
@@ -20,6 +20,8 @@
* Copyright 2008 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <netinet/in.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/src/ethernet-dialog.c b/src/ethernet-dialog.c
index 03ded50..30114ab 100644
--- a/src/ethernet-dialog.c
+++ b/src/ethernet-dialog.c
@@ -21,9 +21,7 @@
* Copyright 2008 - 2014 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib/gi18n.h>
diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
index 8be86b6..0dca148 100644
--- a/src/libnm-gtk/nm-ui-utils.c
+++ b/src/libnm-gtk/nm-ui-utils.c
@@ -18,9 +18,7 @@
* Copyright 2007 - 2015 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <string.h>
diff --git a/src/libnm-gtk/nm-vpn-password-dialog.c b/src/libnm-gtk/nm-vpn-password-dialog.c
index 266b6b1..f7f1cc5 100644
--- a/src/libnm-gtk/nm-vpn-password-dialog.c
+++ b/src/libnm-gtk/nm-vpn-password-dialog.c
@@ -22,7 +22,7 @@
* Dan Williams <dcbw redhat com>
*/
-#include <config.h>
+#include "config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
index 396217b..b5c2599 100644
--- a/src/libnm-gtk/nm-wifi-dialog.c
+++ b/src/libnm-gtk/nm-wifi-dialog.c
@@ -20,7 +20,7 @@
* (C) Copyright 2007 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
diff --git a/src/libnm-gtk/nm-wireless-dialog.c b/src/libnm-gtk/nm-wireless-dialog.c
index efa2a3a..74dfd64 100644
--- a/src/libnm-gtk/nm-wireless-dialog.c
+++ b/src/libnm-gtk/nm-wireless-dialog.c
@@ -20,7 +20,7 @@
* (C) Copyright 2007 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <nm-client.h>
diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
index 690c43c..f538ab9 100644
--- a/src/libnma/nma-ui-utils.c
+++ b/src/libnma/nma-ui-utils.c
@@ -17,9 +17,7 @@
* Copyright 2015 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <string.h>
diff --git a/src/libnma/nma-vpn-password-dialog.c b/src/libnma/nma-vpn-password-dialog.c
index 50b00ff..6de5d2b 100644
--- a/src/libnma/nma-vpn-password-dialog.c
+++ b/src/libnma/nma-vpn-password-dialog.c
@@ -22,7 +22,7 @@
* Dan Williams <dcbw redhat com>
*/
-#include <config.h>
+#include "config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c
index 9b49fa1..e85203e 100644
--- a/src/libnma/nma-wifi-dialog.c
+++ b/src/libnma/nma-wifi-dialog.c
@@ -20,7 +20,7 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
diff --git a/src/main.c b/src/main.c
index bfd4914..3c29ed6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,9 +22,7 @@
* (C) Copyright 2005 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+# include "config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/src/mb-menu-item.c b/src/mb-menu-item.c
index 77ce716..7ae5619 100644
--- a/src/mb-menu-item.c
+++ b/src/mb-menu-item.c
@@ -21,9 +21,7 @@
* Copyright (C) 2005 - 2010 Red Hat, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <stdio.h>
#include <glib/gi18n.h>
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index 963237b..1ede761 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -20,6 +20,8 @@
* Copyright 2010 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <ctype.h>
#include <glib/gi18n.h>
diff --git a/src/utils/tests/test-utils.c b/src/utils/tests/test-utils.c
index 10e11a5..9578653 100644
--- a/src/utils/tests/test-utils.c
+++ b/src/utils/tests/test-utils.c
@@ -20,6 +20,8 @@
* (C) Copyright 2009 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/src/utils/utils.c b/src/utils/utils.c
index 769718c..fe300ba 100644
--- a/src/utils/utils.c
+++ b/src/utils/utils.c
@@ -20,7 +20,8 @@
* Copyright 2007 - 2015 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
#include <glib.h>
diff --git a/src/wireless-security/eap-method-leap.c b/src/wireless-security/eap-method-leap.c
index 599f80f..de404f6 100644
--- a/src/wireless-security/eap-method-leap.c
+++ b/src/wireless-security/eap-method-leap.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <ctype.h>
#include <string.h>
#include <glib/gi18n.h>
diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
index 4044f48..2a86196 100644
--- a/src/wireless-security/eap-method-simple.c
+++ b/src/wireless-security/eap-method-simple.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <ctype.h>
#include <string.h>
#include <glib/gi18n.h>
diff --git a/src/wireless-security/helpers.c b/src/wireless-security/helpers.c
index b972dc0..e7902f2 100644
--- a/src/wireless-security/helpers.c
+++ b/src/wireless-security/helpers.c
@@ -20,6 +20,8 @@
* Copyright 2009 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include "helpers.h"
void
diff --git a/src/wireless-security/ws-dynamic-wep.c b/src/wireless-security/ws-dynamic-wep.c
index 3b083b7..35f6e19 100644
--- a/src/wireless-security/ws-dynamic-wep.c
+++ b/src/wireless-security/ws-dynamic-wep.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib/gi18n.h>
#include <ctype.h>
#include <string.h>
diff --git a/src/wireless-security/ws-leap.c b/src/wireless-security/ws-leap.c
index a39558d..662e6e5 100644
--- a/src/wireless-security/ws-leap.c
+++ b/src/wireless-security/ws-leap.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/src/wireless-security/ws-wep-key.c b/src/wireless-security/ws-wep-key.c
index 21cc119..ce94ddd 100644
--- a/src/wireless-security/ws-wep-key.c
+++ b/src/wireless-security/ws-wep-key.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/src/wireless-security/ws-wpa-eap.c b/src/wireless-security/ws-wpa-eap.c
index d82112c..b00826b 100644
--- a/src/wireless-security/ws-wpa-eap.c
+++ b/src/wireless-security/ws-wpa-eap.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib/gi18n.h>
#include <ctype.h>
#include <string.h>
diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c
index 11a2752..45034f3 100644
--- a/src/wireless-security/ws-wpa-psk.c
+++ b/src/wireless-security/ws-wpa-psk.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <ctype.h>
#include <string.h>
#include <glib/gi18n.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]