[network-manager-applet: 7/8] all: include <gtk/gtk.h> via "nm-default.h"

From: Thomas Haller <thaller src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-applet: 7/8] all: include <gtk/gtk.h> via "nm-default.h"
Date: Wed, 24 Feb 2016 00:13:07 +0000 (UTC)
commit fda989e14ba3a0071afe9b10f24cbcba15d07838
Author: Thomas Haller <thaller redhat com>
Date:   Wed Feb 24 00:53:19 2016 +0100

    all: include <gtk/gtk.h> via "nm-default.h"

 shared/nm-default.h                          |    2 ++
 src/applet-device-broadband.c                |    2 --
 src/applet-device-bt.c                       |    2 --
 src/applet-device-ethernet.c                 |    2 --
 src/applet-device-wifi.c                     |    2 --
 src/applet-dialogs.c                         |    2 --
 src/applet.c                                 |    4 ----
 src/connection-editor/ce-polkit-button.c     |    2 --
 src/connection-editor/main.c                 |    1 -
 src/connection-editor/nm-connection-editor.c |    2 --
 src/connection-editor/nm-connection-list.c   |    2 --
 src/connection-editor/page-8021x-security.c  |    2 --
 src/connection-editor/page-bluetooth.c       |    2 --
 src/connection-editor/page-bond.c            |    1 -
 src/connection-editor/page-bridge-port.c     |    2 --
 src/connection-editor/page-bridge.c          |    1 -
 src/connection-editor/page-dcb.c             |    2 --
 src/connection-editor/page-dsl.c             |    2 --
 src/connection-editor/page-ethernet.c        |    2 --
 src/connection-editor/page-general.c         |    2 --
 src/connection-editor/page-infiniband.c      |    2 --
 src/connection-editor/page-ip4.c             |    2 --
 src/connection-editor/page-ip6.c             |    2 --
 src/connection-editor/page-master.c          |    1 -
 src/connection-editor/page-mobile.c          |    2 --
 src/connection-editor/page-ppp.c             |    2 --
 src/connection-editor/page-team-port.c       |    2 --
 src/connection-editor/page-team.c            |    1 -
 src/connection-editor/page-vlan.c            |    2 --
 src/connection-editor/page-vpn.c             |    2 --
 src/connection-editor/page-wifi-security.c   |    2 --
 src/connection-editor/page-wifi.c            |    2 --
 src/connection-editor/vpn-helpers.c          |    1 -
 src/libnm-gtk/nm-mobile-wizard.c             |    1 -
 src/libnm-gtk/nm-vpn-password-dialog.c       |    6 ++----
 src/libnm-gtk/nm-wifi-dialog.c               |    2 --
 src/libnma/nma-mobile-wizard.c               |    1 -
 src/libnma/nma-vpn-password-dialog.c         |    6 ++----
 src/libnma/nma-wifi-dialog.c                 |    2 --
 src/main.c                                   |    2 --
 src/utils/utils.c                            |    3 +--
 src/wireless-security/eap-method.c           |    1 -
 src/wireless-security/wireless-security.c    |    2 --
 43 files changed, 7 insertions(+), 81 deletions(-)
---
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 0a09fa0..a673eb0 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -51,6 +51,8 @@
 #include "gsystem-local-alloc.h"
 #include "nm-macros-internal.h"
 
+#include <gtk/gtk.h>
+
 /*****************************************************************************/
 
 #if ((NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB) || ((NETWORKMANAGER_COMPILATION) == 
NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY)
diff --git a/src/applet-device-broadband.c b/src/applet-device-broadband.c
index 3bfb839..e2a809d 100644
--- a/src/applet-device-broadband.c
+++ b/src/applet-device-broadband.c
@@ -22,8 +22,6 @@
 
 #include <ctype.h>
 
-#include <gtk/gtk.h>
-
 #include <NetworkManager.h>
 
 #include "applet.h"
diff --git a/src/applet-device-bt.c b/src/applet-device-bt.c
index 10f288e..e53e096 100644
--- a/src/applet-device-bt.c
+++ b/src/applet-device-bt.c
@@ -23,8 +23,6 @@
 
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
-
 #include "applet.h"
 #include "applet-device-bt.h"
 #include "applet-dialogs.h"
diff --git a/src/applet-device-ethernet.c b/src/applet-device-ethernet.c
index 235f7a1..baa4b76 100644
--- a/src/applet-device-ethernet.c
+++ b/src/applet-device-ethernet.c
@@ -23,8 +23,6 @@
 
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
-
 #include "applet.h"
 #include "applet-device-ethernet.h"
 #include "ethernet-dialog.h"
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 4aa9203..b768fb0 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -27,8 +27,6 @@
 #include <netinet/ether.h>
 #include <ctype.h>
 
-#include <gtk/gtk.h>
-
 #include "applet.h"
 #include "applet-device-wifi.h"
 #include "ap-menu-item.h"
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index 38b5988..ff5b1bd 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -28,8 +28,6 @@
 
 #include <NetworkManager.h>
 
-#include <gtk/gtk.h>
-
 #include "applet-dialogs.h"
 #include "utils.h"
 
diff --git a/src/applet.c b/src/applet.c
index 51b943e..dde4bcb 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -32,13 +32,9 @@
 #include <time.h>
 #include <string.h>
 #include <strings.h>
-#include <gtk/gtk.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <stdlib.h>
-
-#include <gio/gio.h>
-
 #include <libnotify/notify.h>
 
 #include "applet.h"
diff --git a/src/connection-editor/ce-polkit-button.c b/src/connection-editor/ce-polkit-button.c
index c77d495..677cffe 100644
--- a/src/connection-editor/ce-polkit-button.c
+++ b/src/connection-editor/ce-polkit-button.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "ce-polkit-button.h"
 
 G_DEFINE_TYPE (CEPolkitButton, ce_polkit_button, GTK_TYPE_BUTTON)
diff --git a/src/connection-editor/main.c b/src/connection-editor/main.c
index 96e64f5..34b0aeb 100644
--- a/src/connection-editor/main.c
+++ b/src/connection-editor/main.c
@@ -27,7 +27,6 @@
 #include <signal.h>
 
 #include <dbus/dbus.h>
-#include <gtk/gtk.h>
 #include <glib-unix.h>
 
 #include "gsystem-local-alloc.h"
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index 3117798..430ce8f 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -28,8 +28,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index 6b528fb..c561f66 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include "ce-page.h"
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index 9e0233a..5af6111 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "wireless-security.h"
 #include "page-ethernet.h"
 #include "page-8021x-security.h"
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index 6006c9d..ff3ca43 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <NetworkManager.h>
 
 #include "page-bluetooth.h"
diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
index 90a327d..392fa5f 100644
--- a/src/connection-editor/page-bond.c
+++ b/src/connection-editor/page-bond.c
@@ -21,7 +21,6 @@
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
 
 #include "page-bond.h"
 #include "page-infiniband.h"
diff --git a/src/connection-editor/page-bridge-port.c b/src/connection-editor/page-bridge-port.c
index a154528..09bae1f 100644
--- a/src/connection-editor/page-bridge-port.c
+++ b/src/connection-editor/page-bridge-port.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "page-bridge-port.h"
 
 G_DEFINE_TYPE (CEPageBridgePort, ce_page_bridge_port, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c
index e6fcc12..cc4fefe 100644
--- a/src/connection-editor/page-bridge.c
+++ b/src/connection-editor/page-bridge.c
@@ -21,7 +21,6 @@
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
 
 #include "page-bridge.h"
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/page-dcb.c b/src/connection-editor/page-dcb.c
index bd83ff7..05ba431 100644
--- a/src/connection-editor/page-dcb.c
+++ b/src/connection-editor/page-dcb.c
@@ -26,8 +26,6 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <gtk/gtk.h>
-
 #include "page-dcb.h"
 
 G_DEFINE_TYPE (CEPageDcb, ce_page_dcb, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
index 6997958..f6a0e45 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "page-dsl.h"
 #include "nm-connection-editor.h"
 
diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
index c9bc03b..536ae9c 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <net/ethernet.h>
 
-#include <gtk/gtk.h>
-
 #include "page-ethernet.h"
 
 G_DEFINE_TYPE (CEPageEthernet, ce_page_ethernet, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c
index 772554f..3b8b002 100644
--- a/src/connection-editor/page-general.c
+++ b/src/connection-editor/page-general.c
@@ -20,8 +20,6 @@
 
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
-
 #include "page-general.h"
 
 G_DEFINE_TYPE (CEPageGeneral, ce_page_general, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
index a478c31..3f934a2 100644
--- a/src/connection-editor/page-infiniband.c
+++ b/src/connection-editor/page-infiniband.c
@@ -20,8 +20,6 @@
 
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
-
 #include <net/if_arp.h>
 #include <linux/if_infiniband.h>
 
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index c85d28b..b457448 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index d9ed371..124269e 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c
index 43b7daf..d85bed7 100644
--- a/src/connection-editor/page-master.c
+++ b/src/connection-editor/page-master.c
@@ -21,7 +21,6 @@
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
 
 #include <NetworkManager.h>
 
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index 9aac0dd..8a1aa64 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "page-mobile.h"
 #include "nm-connection-editor.h"
 #include "nma-mobile-wizard.h"
diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c
index 49990c1..e9b4ac6 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "page-ppp.h"
 #include "ppp-auth-methods-dialog.h"
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/page-team-port.c b/src/connection-editor/page-team-port.c
index 8570008..e033ccf 100644
--- a/src/connection-editor/page-team-port.c
+++ b/src/connection-editor/page-team-port.c
@@ -22,8 +22,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "page-team-port.h"
 
 G_DEFINE_TYPE (CEPageTeamPort, ce_page_team_port, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
index f32600d..cc14533 100644
--- a/src/connection-editor/page-team.c
+++ b/src/connection-editor/page-team.c
@@ -23,7 +23,6 @@
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
 
 #include "page-team.h"
 #include "page-infiniband.h"
diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c
index b8be85f..9dea191 100644
--- a/src/connection-editor/page-vlan.c
+++ b/src/connection-editor/page-vlan.c
@@ -24,8 +24,6 @@
 #include <string.h>
 #include <net/ethernet.h>
 
-#include <gtk/gtk.h>
-
 #include "page-vlan.h"
 #include "connection-helpers.h"
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index 30f53c4..d07f491 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "page-vpn.h"
 #include "connection-helpers.h"
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
index d84305b..405ca3d 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "wireless-security.h"
 #include "page-wifi.h"
 #include "page-wifi-security.h"
diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
index b8abab7..44dd4d3 100644
--- a/src/connection-editor/page-wifi.c
+++ b/src/connection-editor/page-wifi.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <math.h>
 
-#include <gtk/gtk.h>
-
 #include "nm-connection-editor.h"
 #include "page-wifi.h"
 
diff --git a/src/connection-editor/vpn-helpers.c b/src/connection-editor/vpn-helpers.c
index 8ab49c6..ecfc850 100644
--- a/src/connection-editor/vpn-helpers.c
+++ b/src/connection-editor/vpn-helpers.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <gmodule.h>
-#include <gtk/gtk.h>
 
 #include "vpn-helpers.h"
 #include "utils.h"
diff --git a/src/libnm-gtk/nm-mobile-wizard.c b/src/libnm-gtk/nm-mobile-wizard.c
index 5b6cd0a..afc6cc0 100644
--- a/src/libnm-gtk/nm-mobile-wizard.c
+++ b/src/libnm-gtk/nm-mobile-wizard.c
@@ -23,7 +23,6 @@
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
 
 #include <NetworkManager.h>
 #include <nm-setting-gsm.h>
diff --git a/src/libnm-gtk/nm-vpn-password-dialog.c b/src/libnm-gtk/nm-vpn-password-dialog.c
index 9add8de..1f5ff37 100644
--- a/src/libnm-gtk/nm-vpn-password-dialog.c
+++ b/src/libnm-gtk/nm-vpn-password-dialog.c
@@ -24,8 +24,6 @@
 
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
-
 #include "nm-vpn-password-dialog.h"
 
 G_DEFINE_TYPE (NMAVpnPasswordDialog, nma_vpn_password_dialog, GTK_TYPE_DIALOG)
@@ -39,7 +37,7 @@ typedef struct {
        gboolean show_password;
        gboolean show_password_secondary;
        gboolean show_password_ternary;
-       
+
        /* Internal widgetry and flags */
        GtkWidget *password_entry;
        GtkWidget *password_entry_secondary;
@@ -49,7 +47,7 @@ typedef struct {
        GtkWidget *grid_alignment;
        GtkWidget *grid;
        GtkSizeGroup *group;
-       
+
        char *primary_password_label;
        char *secondary_password_label;
        char *ternary_password_label;
diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
index 125a69f..1bf1bf4 100644
--- a/src/libnm-gtk/nm-wifi-dialog.c
+++ b/src/libnm-gtk/nm-wifi-dialog.c
@@ -23,8 +23,6 @@
 #include "nm-default.h"
 
 #include <string.h>
-
-#include <gtk/gtk.h>
 #include <netinet/ether.h>
 
 #include <nm-client.h>
diff --git a/src/libnma/nma-mobile-wizard.c b/src/libnma/nma-mobile-wizard.c
index 5646fd3..ddfb129 100644
--- a/src/libnma/nma-mobile-wizard.c
+++ b/src/libnma/nma-mobile-wizard.c
@@ -23,7 +23,6 @@
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
 
 #include <NetworkManager.h>
 #include <nm-setting-gsm.h>
diff --git a/src/libnma/nma-vpn-password-dialog.c b/src/libnma/nma-vpn-password-dialog.c
index de72816..7a7f2bf 100644
--- a/src/libnma/nma-vpn-password-dialog.c
+++ b/src/libnma/nma-vpn-password-dialog.c
@@ -24,8 +24,6 @@
 
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
-
 #include "nma-vpn-password-dialog.h"
 
 G_DEFINE_TYPE (NMAVpnPasswordDialog, nma_vpn_password_dialog, GTK_TYPE_DIALOG)
@@ -39,7 +37,7 @@ typedef struct {
        gboolean show_password;
        gboolean show_password_secondary;
        gboolean show_password_ternary;
-       
+
        /* Internal widgetry and flags */
        GtkWidget *password_entry;
        GtkWidget *password_entry_secondary;
@@ -49,7 +47,7 @@ typedef struct {
        GtkWidget *grid_alignment;
        GtkWidget *grid;
        GtkSizeGroup *group;
-       
+
        char *primary_password_label;
        char *secondary_password_label;
        char *ternary_password_label;
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c
index 1f03990..d92fc1c 100644
--- a/src/libnma/nma-wifi-dialog.c
+++ b/src/libnma/nma-wifi-dialog.c
@@ -23,8 +23,6 @@
 #include "nm-default.h"
 
 #include <string.h>
-
-#include <gtk/gtk.h>
 #include <netinet/ether.h>
 
 #include <NetworkManager.h>
diff --git a/src/main.c b/src/main.c
index 3084b25..ee3de68 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,8 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <gtk/gtk.h>
-
 #include "applet.h"
 
 gboolean shell_debug = FALSE;
diff --git a/src/utils/utils.c b/src/utils/utils.c
index b951476..fd573cc 100644
--- a/src/utils/utils.c
+++ b/src/utils/utils.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 #include <netinet/ether.h>
-#include <gtk/gtk.h>
 
 #include "utils.h"
 
@@ -59,7 +58,7 @@ utils_ether_addr_valid (const struct ether_addr *test_addr)
 
        if (test_addr->ether_addr_octet[0] & 1)                 /* Multicast addresses */
                return FALSE;
-       
+
        return TRUE;
 }
 
diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
index 7e157e8..e771b58 100644
--- a/src/wireless-security/eap-method.c
+++ b/src/wireless-security/eap-method.c
@@ -23,7 +23,6 @@
 
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/wireless-security/wireless-security.c b/src/wireless-security/wireless-security.c
index fa87075..515c991 100644
--- a/src/wireless-security/wireless-security.c
+++ b/src/wireless-security/wireless-security.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "wireless-security.h"
 #include "eap-method.h"
 #include "utils.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]