diff options
| author | Brent Hull <[email protected]> | 2012-10-27 21:17:07 -0400 |
|---|---|---|
| committer | Brent Hull <[email protected]> | 2012-10-27 21:17:07 -0400 |
| commit | aa88be1d4a4e545b4141b0065b094d49d3d3a81b (patch) | |
| tree | 631437e0c5df2754ed31d4b5e31a1b5ca9d134e3 /src/gpm-manager.c | |
| parent | 543b06f44cafd70fe708fd54a82cba198a6da73b (diff) | |
| download | mate-power-manager-aa88be1d4a4e545b4141b0065b094d49d3d3a81b.tar.bz2 mate-power-manager-aa88be1d4a4e545b4141b0065b094d49d3d3a81b.tar.xz | |
Get device capabilities in the preferences capplet, not the daemon (GNOME fix for bug #617529 originally by Richard Hughes)
Diffstat (limited to 'src/gpm-manager.c')
| -rw-r--r-- | src/gpm-manager.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/gpm-manager.c b/src/gpm-manager.c index ec787be..a84f338 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -56,7 +56,6 @@ #include "gpm-backlight.h" #include "gpm-session.h" #include "gpm-stock-icons.h" -#include "gpm-prefs-server.h" #include "gpm-tray-icon.h" #include "gpm-engine.h" #include "gpm-upower.h" @@ -81,7 +80,6 @@ struct GpmManagerPrivate GpmDisks *disks; GpmDpms *dpms; GpmIdle *idle; - GpmPrefsServer *prefs_server; GpmControl *control; GpmScreensaver *screensaver; GpmTrayIcon *tray_icon; @@ -375,7 +373,7 @@ gpm_manager_sync_policy_sleep (GpmManager *manager) * Turn off the backlight of the LCD when we shut the lid, and lock * if required. This is required because some laptops do not turn off the * LCD backlight when the lid is closed. - * See http://bugzilla.mate.org/show_bug.cgi?id=321313 + * See http://bugzilla.gnome.org/show_bug.cgi?id=321313 * * Return value: Success. **/ @@ -711,17 +709,6 @@ gpm_manager_perform_policy (GpmManager *manager, const gchar *policy_key, const } /** - * gpm_manager_get_preferences_options: - **/ -gboolean -gpm_manager_get_preferences_options (GpmManager *manager, gint *capability, GError **error) -{ - g_return_val_if_fail (manager != NULL, FALSE); - g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE); - return gpm_prefs_server_get_capability (manager->priv->prefs_server, capability); -} - -/** * gpm_manager_idle_do_sleep: * @manager: This class instance * @@ -1930,9 +1917,6 @@ gpm_manager_init (GpmManager *manager) /* don't apply policy when not active, so listen to ConsoleKit */ manager->priv->console = egg_console_kit_new (); - /* this is a singleton, so we keep a master copy open here */ - manager->priv->prefs_server = gpm_prefs_server_new (); - manager->priv->notification_general = NULL; manager->priv->notification_warning_low = NULL; manager->priv->notification_discharging = NULL; @@ -2085,7 +2069,6 @@ gpm_manager_finalize (GObject *object) g_object_unref (manager->priv->engine); g_object_unref (manager->priv->tray_icon); g_object_unref (manager->priv->screensaver); - g_object_unref (manager->priv->prefs_server); g_object_unref (manager->priv->control); g_object_unref (manager->priv->button); g_object_unref (manager->priv->backlight); |