network: Move common code to common location

Remove duplicate header file for these functions

panels/network/cc-wifi-hotspot-dialog.c

@@ -30,9 +30,9 @@
 #include <libmm-glib.h>
 
 #include "list-box-helper.h"
-#include "connection-editor/ui-helpers.h"
 #include "cc-wifi-hotspot-dialog.h"
 #include "cc-network-resources.h"
+#include "ui-helpers.h"
 
 /**
  * @short_description: WWAN network type selection dialog

panels/network/connection-editor/meson.build

@@ -11,7 +11,6 @@ sources = files(
   'ce-page-wifi.c',
   'ce-page.c',
   'net-connection-editor.c',
-  'ui-helpers.c',
   'vpn-helpers.c'
 )
 
@@ -40,7 +39,7 @@ sources += gnome.compile_resources(
 libconnection_editor = static_library(
   name,
   sources: sources,
-  include_directories: [top_inc, common_inc, wireless_security_inc],
+  include_directories: [top_inc, common_inc, network_inc, wireless_security_inc],
   dependencies: deps,
   c_args: cflags,
   link_with: libwireless_security

panels/network/meson.build

@@ -3,6 +3,8 @@ deps = common_deps + network_manager_deps + [
   dependency('gmodule-2.0')
 ]
 
+network_inc = include_directories('.')
+
 subdir('wireless-security')
 subdir('connection-editor')
 
@@ -46,7 +48,8 @@ sources = files(
   'net-proxy.c',
   'net-vpn.c',
   'network-dialogs.c',
-  'panel-common.c'
+  'panel-common.c',
+  'ui-helpers.c'
 )
 
 resource_data = files(

panels/network/wireless-security/eap-method-fast.c

@@ -25,9 +25,9 @@
 #include "eap-method.h"
 #include "eap-method-fast.h"
 #include "eap-method-simple.h"
-#include "wireless-security.h"
-#include "utils.h"
 #include "helpers.h"
+#include "ui-helpers.h"
+#include "wireless-security.h"
 
 #define I_NAME_COLUMN 0
 #define I_ID_COLUMN   1

panels/network/wireless-security/eap-method-leap.c

@@ -24,10 +24,10 @@
 
 #include "eap-method.h"
 #include "eap-method-leap.h"
-#include "wireless-security.h"
 #include "helpers.h"
 #include "nma-ui-utils.h"
-#include "utils.h"
+#include "ui-helpers.h"
+#include "wireless-security.h"
 
 struct _EAPMethodLEAP {
 	GtkGrid parent;

panels/network/wireless-security/eap-method-peap.c

@@ -25,8 +25,9 @@
 #include "eap-method.h"
 #include "eap-method-peap.h"
 #include "eap-method-simple.h"
+#include "helpers.h"
+#include "ui-helpers.h"
 #include "wireless-security.h"
-#include "utils.h"
 
 #define I_NAME_COLUMN 0
 #define I_ID_COLUMN   1

panels/network/wireless-security/eap-method-simple.c

@@ -24,10 +24,10 @@
 
 #include "eap-method.h"
 #include "eap-method-simple.h"
-#include "wireless-security.h"
 #include "helpers.h"
 #include "nma-ui-utils.h"
-#include "utils.h"
+#include "ui-helpers.h"
+#include "wireless-security.h"
 
 struct _EAPMethodSimple {
 	GtkGrid parent;

panels/network/wireless-security/eap-method-tls.c

@@ -24,10 +24,10 @@
 
 #include "eap-method.h"
 #include "eap-method-tls.h"
-#include "wireless-security.h"
 #include "helpers.h"
 #include "nma-ui-utils.h"
-#include "utils.h"
+#include "ui-helpers.h"
+#include "wireless-security.h"
 
 struct _EAPMethodTLS {
 	GtkGrid parent;

panels/network/wireless-security/eap-method-ttls.c

@@ -25,8 +25,8 @@
 #include "eap-method.h"
 #include "eap-method-simple.h"
 #include "eap-method-ttls.h"
+#include "helpers.h"
 #include "wireless-security.h"
-#include "utils.h"
 
 #define I_NAME_COLUMN 0
 #define I_ID_COLUMN   1

panels/network/wireless-security/eap-method.c

@@ -25,8 +25,8 @@
 #include <glib/gi18n.h>
 
 #include "eap-method.h"
-#include "utils.h"
 #include "helpers.h"
+#include "ui-helpers.h"
 
 G_DEFINE_INTERFACE (EAPMethod, eap_method, G_TYPE_OBJECT)
 

panels/network/wireless-security/helpers.h

@@ -26,6 +26,12 @@
 #include <NetworkManager.h>
 #include <gtk/gtk.h>
 
+#define NMA_ERROR (g_quark_from_static_string ("nma-error-quark"))
+
+typedef enum  {
+	NMA_ERROR_GENERIC
+} NMAError;
+
 typedef const char * (*HelperSecretFunc)(NMSetting *);
 
 void helper_fill_secret_entry (NMConnection *connection,

panels/network/wireless-security/meson.build

@@ -63,6 +63,6 @@ sources += gnome.compile_resources(
 libwireless_security = static_library(
   name,
   sources: sources,
-  include_directories: top_inc,
+  include_directories: [top_inc, network_inc],
   dependencies: deps
 )

panels/network/wireless-security/utils.h

@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager Applet -- allow user control over networking
- *
- * Dan Williams <dcbw@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2007 - 2015 Red Hat, Inc.
- */
-
-#include <nm-setting-wired.h>
-#include <nm-setting-connection.h>
-
-#define NMA_ERROR (g_quark_from_static_string ("nma-error-quark"))
-
-typedef enum  {
-	NMA_ERROR_GENERIC
-} NMAError;
-
-extern void widget_set_error (GtkWidget *widget);
-extern void widget_unset_error (GtkWidget *widget);

panels/network/wireless-security/wireless-security.c

@@ -22,9 +22,9 @@
 
 #include <glib/gi18n.h>
 
+#include "helpers.h"
 #include "wireless-security.h"
 #include "wireless-security-resources.h"
-#include "utils.h"
 
 typedef struct  {
 	char *username, *password;

panels/network/wireless-security/ws-leap.c

@@ -22,11 +22,11 @@
 
 #include <glib/gi18n.h>
 
-#include "ws-leap.h"
-#include "wireless-security.h"
 #include "helpers.h"
 #include "nma-ui-utils.h"
-#include "utils.h"
+#include "ui-helpers.h"
+#include "wireless-security.h"
+#include "ws-leap.h"
 
 struct _WirelessSecurityLEAP {
 	WirelessSecurity parent;

panels/network/wireless-security/ws-wep-key.c

@@ -22,11 +22,11 @@
 
 #include <glib/gi18n.h>
 
-#include "ws-wep-key.h"
-#include "wireless-security.h"
-#include "utils.h"
 #include "helpers.h"
 #include "nma-ui-utils.h"
+#include "ui-helpers.h"
+#include "ws-wep-key.h"
+#include "wireless-security.h"
 
 struct _WirelessSecurityWEPKey {
 	WirelessSecurity parent;

panels/network/wireless-security/ws-wpa-psk.c

@@ -23,11 +23,11 @@
 #include <ctype.h>
 #include <glib/gi18n.h>
 
-#include "ws-wpa-psk.h"
-#include "wireless-security.h"
 #include "helpers.h"
 #include "nma-ui-utils.h"
-#include "utils.h"
+#include "ui-helpers.h"
+#include "ws-wpa-psk.h"
+#include "wireless-security.h"
 
 #define WPA_PMK_LEN 32