[gnome-power-manager] Don't poke NetworkManager at suspend and resume

[Richard Hughes <rhughes src gnome org>]

commit ecea55d524ca6c3a802dde46c06b979bc55e14ca
Author: Richard Hughes <richard hughsie com>
Date:   Tue Aug 31 19:23:20 2010 +0100

    Don't poke NetworkManager at suspend and resume
    
    The NetworkManager daemon now listens for signals from UPower, which
    is the right way to do this.

 data/org.gnome.power-manager.gschema.migrate |    1 -
 data/org.gnome.power-manager.gschema.xml     |    5 -
 po/POTFILES.in                               |    1 -
 src/Makefile.am                              |    2 -
 src/gpm-control.c                            |   20 -----
 src/gpm-networkmanager.c                     |  102 --------------------------
 src/gpm-networkmanager.h                     |   32 --------
 7 files changed, 0 insertions(+), 163 deletions(-)
---
diff --git a/data/org.gnome.power-manager.gschema.migrate b/data/org.gnome.power-manager.gschema.migrate
index d619fe8..7300083 100644
--- a/data/org.gnome.power-manager.gschema.migrate
+++ b/data/org.gnome.power-manager.gschema.migrate
@@ -24,7 +24,6 @@ schema-version = /apps/gnome-power-manager/general/installed_schema
 use-profile-time = /apps/gnome-power-manager/general/use_profile_time
 use-time-for-policy = /apps/gnome-power-manager/general/use_time_for_policy
 check-type-cpu = /apps/gnome-power-manager/general/check_type_cpu
-network-sleep = /apps/gnome-power-manager/general/network_sleep
 lock-use-screensaver = /apps/gnome-power-manager/lock/use_screensaver_settings
 lock-blank-screen = /apps/gnome-power-manager/lock/blank_screen
 lock-suspend = /apps/gnome-power-manager/lock/suspend
diff --git a/data/org.gnome.power-manager.gschema.xml b/data/org.gnome.power-manager.gschema.xml
index 60882ed..e496fd8 100644
--- a/data/org.gnome.power-manager.gschema.xml
+++ b/data/org.gnome.power-manager.gschema.xml
@@ -145,11 +145,6 @@
       <summary>Check CPU load before sleeping</summary>
       <description>If the CPU load should be checked before doing the idle action.</description>
     </key>
-    <key name="network-sleep" type="b">
-      <default>false</default>
-      <summary>Whether NetworkManager should be connected and disconnected on sleep.</summary>
-      <description>Whether NetworkManager should disconnect before suspending or hibernating and connect on resume.</description>
-    </key>
     <key name="lock-use-screensaver" type="b">
       <default>true</default>
       <summary>Use gnome-screensaver lock setting</summary>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f484432..31421e8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,7 +24,6 @@ src/gpm-idle.c
 src/gpm-load.c
 src/gpm-main.c
 src/gpm-manager.c
-src/gpm-networkmanager.c
 src/gpm-screensaver.c
 src/gpm-statistics.c
 src/gpm-tray-icon.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f5ca1e..d3baebf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -161,8 +161,6 @@ gnome_power_manager_SOURCES =				\
 	gpm-screensaver.c				\
 	gpm-session.h					\
 	gpm-session.c					\
-	gpm-networkmanager.h				\
-	gpm-networkmanager.c				\
 	gpm-stock-icons.h				\
 	gsd-media-keys-window.h				\
 	gsd-media-keys-window.c				\
diff --git a/src/gpm-control.c b/src/gpm-control.c
index 91857c4..816f6ef 100644
--- a/src/gpm-control.c
+++ b/src/gpm-control.c
@@ -49,7 +49,6 @@
 #include "gpm-screensaver.h"
 #include "gpm-common.h"
 #include "gpm-control.h"
-#include "gpm-networkmanager.h"
 
 #define GPM_CONTROL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_CONTROL, GpmControlPrivate))
 
@@ -140,7 +139,6 @@ gpm_control_suspend (GpmControl *control, GError **error)
 	gboolean allowed;
 	gboolean ret = FALSE;
 	gboolean do_lock;
-	gboolean nm_sleep;
 	gboolean lock_gnome_keyring;
 	GnomeKeyringResult keyres;
 	GpmScreensaver *screensaver;
@@ -171,10 +169,6 @@ gpm_control_suspend (GpmControl *control, GError **error)
 		gpm_screensaver_lock (screensaver);
 	}
 
-	nm_sleep = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_NETWORKMANAGER_SLEEP);
-	if (nm_sleep)
-		gpm_networkmanager_sleep ();
-
 	/* Do the suspend */
 	egg_debug ("emitting sleep");
 	g_signal_emit (control, signals [SLEEP], 0, GPM_CONTROL_ACTION_SUSPEND);
@@ -190,10 +184,6 @@ gpm_control_suspend (GpmControl *control, GError **error)
 			gpm_screensaver_remove_throttle (screensaver, throttle_cookie);
 	}
 
-	nm_sleep = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_NETWORKMANAGER_SLEEP);
-	if (nm_sleep)
-		gpm_networkmanager_wake ();
-
 out:
 	g_object_unref (screensaver);
 	return ret;
@@ -208,7 +198,6 @@ gpm_control_hibernate (GpmControl *control, GError **error)
 	gboolean allowed;
 	gboolean ret = FALSE;
 	gboolean do_lock;
-	gboolean nm_sleep;
 	gboolean lock_gnome_keyring;
 	GnomeKeyringResult keyres;
 	GpmScreensaver *screensaver;
@@ -240,10 +229,6 @@ gpm_control_hibernate (GpmControl *control, GError **error)
 		gpm_screensaver_lock (screensaver);
 	}
 
-	nm_sleep = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_NETWORKMANAGER_SLEEP);
-	if (nm_sleep)
-		gpm_networkmanager_sleep ();
-
 	egg_debug ("emitting sleep");
 	g_signal_emit (control, signals [SLEEP], 0, GPM_CONTROL_ACTION_HIBERNATE);
 
@@ -257,11 +242,6 @@ gpm_control_hibernate (GpmControl *control, GError **error)
 		if (throttle_cookie)
 			gpm_screensaver_remove_throttle (screensaver, throttle_cookie);
 	}
-
-	nm_sleep = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_NETWORKMANAGER_SLEEP);
-	if (nm_sleep)
-		gpm_networkmanager_wake ();
-
 out:
 	g_object_unref (screensaver);
 	return ret;