[network-manager-openvpn/nm-1-2] build: drop direct includes of <glib.h> and <glib-object.h>



commit d2d7d918a753b803ed0f32839e88fdc6d94b5607
Author: Thomas Haller <thaller redhat com>
Date:   Thu Apr 28 19:20:00 2016 +0200

    build: drop direct includes of <glib.h> and <glib-object.h>
    
    Every source file includes "nm-default.h", which in turn inclues
    "nm-glib.h". No need to include glib base libraries redundantly.
    
    (cherry picked from commit 304eb5930539cd4e29bc7991adf9133fc9d929da)

 properties/auth-helpers.h  |    1 -
 properties/import-export.h |    2 --
 properties/nm-openvpn.h    |    2 --
 shared/utils.h             |    2 --
 src/nm-openvpn-service.h   |    2 --
 5 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/properties/auth-helpers.h b/properties/auth-helpers.h
index 88b1529..13d8dcf 100644
--- a/properties/auth-helpers.h
+++ b/properties/auth-helpers.h
@@ -22,7 +22,6 @@
 #ifndef _AUTH_HELPERS_H_
 #define _AUTH_HELPERS_H_
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #ifdef NM_OPENVPN_OLD
diff --git a/properties/import-export.h b/properties/import-export.h
index 91e079f..fb8d921 100644
--- a/properties/import-export.h
+++ b/properties/import-export.h
@@ -22,8 +22,6 @@
 #ifndef _IMPORT_EXPORT_H_
 #define _IMPORT_EXPORT_H_
 
-#include <glib.h>
-
 #ifdef NM_OPENVPN_OLD
 #include <nm-connection.h>
 #else /* !NM_OPENVPN_OLD */
diff --git a/properties/nm-openvpn.h b/properties/nm-openvpn.h
index bda4888..b19fe37 100644
--- a/properties/nm-openvpn.h
+++ b/properties/nm-openvpn.h
@@ -23,8 +23,6 @@
 #ifndef _NM_OPENVPN_H_
 #define _NM_OPENVPN_H_
 
-#include <glib-object.h>
-
 #define OPENVPN_TYPE_EDITOR_PLUGIN                (openvpn_editor_plugin_get_type ())
 #define OPENVPN_EDITOR_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
OPENVPN_TYPE_EDITOR_PLUGIN, OpenvpnEditorPlugin))
 #define OPENVPN_EDITOR_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), OPENVPN_TYPE_EDITOR_PLUGIN, 
OpenvpnEditorPluginClass))
diff --git a/shared/utils.h b/shared/utils.h
index 3d86762..76491a5 100644
--- a/shared/utils.h
+++ b/shared/utils.h
@@ -22,8 +22,6 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include <glib.h>
-
 #define NMV_OVPN_TAG_AUTH               "auth"
 #define NMV_OVPN_TAG_AUTH_NOCACHE       "auth-nocache"
 #define NMV_OVPN_TAG_AUTH_USER_PASS     "auth-user-pass"
diff --git a/src/nm-openvpn-service.h b/src/nm-openvpn-service.h
index df2ce60..60edcfd 100644
--- a/src/nm-openvpn-service.h
+++ b/src/nm-openvpn-service.h
@@ -23,8 +23,6 @@
 #ifndef NM_OPENVPN_SERVICE_H
 #define NM_OPENVPN_SERVICE_H
 
-#include <glib.h>
-#include <glib-object.h>
 #include <nm-vpn-service-plugin.h>
 
 #include "nm-openvpn-service-defines.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]