diff options
author | Xan Lopez <xlopez@igalia.com> | 2011-11-16 00:06:16 +0800 |
---|---|---|
committer | Xan Lopez <xlopez@igalia.com> | 2011-11-16 00:06:16 +0800 |
commit | 1e8f2bd6fdf325a412343b475d89d7afc0ba394b (patch) | |
tree | cbd2c52f1157db317a345d4f9946ea0aa0d39e9b /lib | |
parent | 4b9f2d366db4eba0449f032f821d1ecc6345e2c3 (diff) | |
download | gsoc2013-epiphany-1e8f2bd6fdf325a412343b475d89d7afc0ba394b.tar gsoc2013-epiphany-1e8f2bd6fdf325a412343b475d89d7afc0ba394b.tar.gz gsoc2013-epiphany-1e8f2bd6fdf325a412343b475d89d7afc0ba394b.tar.bz2 gsoc2013-epiphany-1e8f2bd6fdf325a412343b475d89d7afc0ba394b.tar.lz gsoc2013-epiphany-1e8f2bd6fdf325a412343b475d89d7afc0ba394b.tar.xz gsoc2013-epiphany-1e8f2bd6fdf325a412343b475d89d7afc0ba394b.tar.zst gsoc2013-epiphany-1e8f2bd6fdf325a412343b475d89d7afc0ba394b.zip |
Use GNetworkMonitor to monitor network status
We can now get rid of the NetworkManager custom code.
https://bugzilla.gnome.org/show_bug.cgi?id=664096
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile.am | 1 | ||||
-rw-r--r-- | lib/ephy-network-manager-defines.h | 54 |
2 files changed, 0 insertions, 55 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 972eaf048..2a1ec7556 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -17,7 +17,6 @@ NOINST_H_FILES = \ ephy-module.h \ ephy-node-filter.h \ ephy-node-common.h \ - ephy-network-manager-defines.h \ ephy-object-helpers.h \ ephy-prefs.h \ ephy-profile-utils.h \ diff --git a/lib/ephy-network-manager-defines.h b/lib/ephy-network-manager-defines.h deleted file mode 100644 index 31439a5f3..000000000 --- a/lib/ephy-network-manager-defines.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright © 2011 Igalia S.L. - * - * 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, 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. - * - */ - -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - -#ifndef EPHY_NETWORK_MANAGER_DEFINES_H -#define EPHY_NETWORK_MANAGER_DEFINES_H - -#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" -#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" - -/** - * NMState: - * @NM_STATE_UNKNOWN: networking state is unknown - * @NM_STATE_ASLEEP: networking is not enabled - * @NM_STATE_DISCONNECTED: there is no active network connection - * @NM_STATE_DISCONNECTING: network connections are being cleaned up - * @NM_STATE_CONNECTING: a network connection is being started - * @NM_STATE_CONNECTED_LOCAL: there is only local IPv4 and/or IPv6 connectivity - * @NM_STATE_CONNECTED_SITE: there is only site-wide IPv4 and/or IPv6 connectivity - * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity - * - * #NMState values indicate the current overall networking state. - */ -typedef enum { - NM_STATE_UNKNOWN = 0, - NM_STATE_ASLEEP = 10, - NM_STATE_DISCONNECTED = 20, - NM_STATE_DISCONNECTING = 30, - NM_STATE_CONNECTING = 40, - NM_STATE_CONNECTED_LOCAL = 50, - NM_STATE_CONNECTED_SITE = 60, - NM_STATE_CONNECTED_GLOBAL = 70 -} NMState; - -#endif |