clean up glib includes (bgo #564376)

Only <glib.h> and <gtk/gtk.h> need to be included.
2024-07-23 11:14:29 +00:00 · 2009-01-19 00:16:40 -05:00 · 2009-01-19 00:16:40 -05:00 · bac45aa0d5
parent f2e8870338
commit bac45aa0d5
27 changed files with 26 additions and 27 deletions
--- a/libnm-glib/nm-access-point.h
+++ b/libnm-glib/nm-access-point.h
@ -24,7 +24,7 @@
 #ifndef NM_ACCESS_POINT_H
 #define NM_ACCESS_POINT_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <NetworkManager.h>
 #include "nm-object.h"
--- a/libnm-glib/nm-active-connection.h
+++ b/libnm-glib/nm-active-connection.h
@ -24,7 +24,7 @@
 #ifndef NM_ACTIVE_CONNECTION_H
 #define NM_ACTIVE_CONNECTION_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include "nm-object.h"
 #include <nm-connection.h>
--- a/libnm-glib/nm-client.h
+++ b/libnm-glib/nm-client.h
@ -24,7 +24,7 @@
 #ifndef NM_CLIENT_H
 #define NM_CLIENT_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include <NetworkManager.h>
--- a/libnm-glib/nm-device.h
+++ b/libnm-glib/nm-device.h
@ -24,7 +24,7 @@
 #ifndef NM_DEVICE_H
 #define NM_DEVICE_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-object.h"
--- a/libnm-glib/nm-dhcp4-config.h
+++ b/libnm-glib/nm-dhcp4-config.h
@ -24,7 +24,7 @@
 #ifndef NM_DHCP4_CONFIG_H
 #define NM_DHCP4_CONFIG_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-object.h"
--- a/libnm-glib/nm-ip4-config.h
+++ b/libnm-glib/nm-ip4-config.h
@ -24,7 +24,7 @@
 #ifndef NM_IP4_CONFIG_H
 #define NM_IP4_CONFIG_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-object.h"
--- a/libnm-glib/nm-object-cache.h
+++ b/libnm-glib/nm-object-cache.h
@ -23,7 +23,7 @@
 #ifndef NM_OBJECT_CACHE_H
 #define NM_OBJECT_CACHE_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include "nm-object.h"

--- a/libnm-glib/nm-object.h
+++ b/libnm-glib/nm-object.h
@ -24,7 +24,7 @@
 #ifndef NM_OBJECT_H
 #define NM_OBJECT_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>

--- a/libnm-glib/nm-vpn-connection.h
+++ b/libnm-glib/nm-vpn-connection.h
@ -24,7 +24,7 @@
 #ifndef NM_VPN_CONNECTION_H
 #define NM_VPN_CONNECTION_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-active-connection.h"
--- a/libnm-glib/nm-vpn-plugin.h
+++ b/libnm-glib/nm-vpn-plugin.h
@ -24,7 +24,7 @@
 #ifndef NM_VPN_PLUGIN_H
 #define NM_VPN_PLUGIN_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include <NetworkManagerVPN.h>
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@ -26,7 +26,7 @@
 #ifndef NM_SETTING_H
 #define NM_SETTING_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>

 G_BEGIN_DECLS
--- a/src/NetworkManagerAP.h
+++ b/src/NetworkManagerAP.h
@ -23,7 +23,6 @@
 #define NM_ACCESS_POINT_H

 #include <glib.h>
-#include <glib/gtypes.h>
 #include <glib-object.h>
 #include <time.h>
 #include "NetworkManager.h"
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@ -22,7 +22,7 @@
 #ifndef NM_DHCP_MANAGER_H
 #define NM_DHCP_MANAGER_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>

 #include <nm-setting-ip4-config.h>
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.h
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h
@ -21,7 +21,7 @@
 #ifndef NM_DNSMASQ_MANAGER_H
 #define NM_DNSMASQ_MANAGER_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>

 #include "nm-ip4-config.h"
--- a/src/nm-activation-request.h
+++ b/src/nm-activation-request.h
@ -21,7 +21,7 @@
 #ifndef NM_ACTIVATION_REQUEST_H
 #define NM_ACTIVATION_REQUEST_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include "nm-connection.h"
 #include "nm-active-connection.h"
--- a/src/nm-dhcp4-config.h
+++ b/src/nm-dhcp4-config.h
@ -21,7 +21,7 @@
 #ifndef NM_DHCP4_CONFIG_H
 #define NM_DHCP4_CONFIG_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>

 #define NM_TYPE_DHCP4_CONFIG            (nm_dhcp4_config_get_type ())
--- a/src/nm-hal-manager.h
+++ b/src/nm-hal-manager.h
@ -22,7 +22,7 @@
 #ifndef NM_HAL_MANAGER_H
 #define NM_HAL_MANAGER_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>

 G_BEGIN_DECLS
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@ -21,7 +21,7 @@
 #ifndef NM_IP4_CONFIG_H
 #define NM_IP4_CONFIG_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>

 #include "nm-setting-ip4-config.h"
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@ -22,7 +22,7 @@
 #ifndef NM_MANAGER_H
 #define NM_MANAGER_H 1

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-device.h"
--- a/src/ppp-manager/nm-ppp-manager.h
+++ b/src/ppp-manager/nm-ppp-manager.h
@ -22,7 +22,7 @@
 #ifndef NM_PPP_MANAGER_H
 #define NM_PPP_MANAGER_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>

 #include "nm-ppp-status.h"
--- a/src/ppp-manager/nm-pppd-plugin.c
+++ b/src/ppp-manager/nm-pppd-plugin.c
@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>

--- a/src/vpn-manager/nm-vpn-connection.h
+++ b/src/vpn-manager/nm-vpn-connection.h
@ -22,7 +22,7 @@
 #ifndef NM_VPN_CONNECTION_H
 #define NM_VPN_CONNECTION_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include "NetworkManagerVPN.h"
 #include "nm-device.h"
--- a/src/vpn-manager/nm-vpn-manager.h
+++ b/src/vpn-manager/nm-vpn-manager.h
@ -22,7 +22,7 @@
 #ifndef NM_VPN_MANAGER_H
 #define NM_VPN_MANAGER_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include "nm-vpn-connection.h"
 #include "nm-activation-request.h"
--- a/src/vpn-manager/nm-vpn-service.h
+++ b/src/vpn-manager/nm-vpn-service.h
@ -22,7 +22,7 @@
 #ifndef NM_VPN_SERVICE_H
 #define NM_VPN_SERVICE_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include "nm-device.h"
 #include "nm-vpn-connection.h"
--- a/system-settings/plugins/ifupdown/plugin.c
+++ b/system-settings/plugins/ifupdown/plugin.c
@ -30,7 +30,7 @@
 #include <gmodule.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <glib/gslist.h>
+#include <glib.h>
 #include <nm-setting-connection.h>

 #include "interface_parser.h"
--- a/system-settings/src/nm-system-config-error.h
+++ b/system-settings/src/nm-system-config-error.h
@ -22,7 +22,7 @@
 #ifndef NM_SYSTEM_CONFIG_ERROR_H
 #define NM_SYSTEM_CONFIG_ERROR_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>

 enum {
--- a/system-settings/src/nm-system-config-hal-manager.h
+++ b/system-settings/src/nm-system-config-hal-manager.h
@ -22,7 +22,7 @@
 #ifndef NM_SYSTEM_CONFIG_HAL_MANAGER_H
 #define NM_SYSTEM_CONFIG_HAL_MANAGER_H

-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "NetworkManager.h"