diff options
| author | Stefano Karapetsas <[email protected]> | 2012-10-31 01:41:08 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-10-31 01:41:08 -0700 |
| commit | 83dc101045267b2e793af3af4716f1cf02089ac6 (patch) | |
| tree | 631437e0c5df2754ed31d4b5e31a1b5ca9d134e3 /src/gpm-backlight.c | |
| parent | 543b06f44cafd70fe708fd54a82cba198a6da73b (diff) | |
| parent | aa88be1d4a4e545b4141b0065b094d49d3d3a81b (diff) | |
| download | mate-power-manager-83dc101045267b2e793af3af4716f1cf02089ac6.tar.bz2 mate-power-manager-83dc101045267b2e793af3af4716f1cf02089ac6.tar.xz | |
Merge pull request #18 from bhull2010/master
Fix for two batteries appearing
Diffstat (limited to 'src/gpm-backlight.c')
| -rw-r--r-- | src/gpm-backlight.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c index c0479fd..c88e220 100644 --- a/src/gpm-backlight.c +++ b/src/gpm-backlight.c @@ -53,7 +53,6 @@ #include "gpm-idle.h" #include "gpm-marshal.h" #include "gpm-stock-icons.h" -#include "gpm-prefs-server.h" #include "egg-console-kit.h" #define GPM_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_BACKLIGHT, GpmBacklightPrivate)) @@ -724,9 +723,6 @@ gpm_backlight_class_init (GpmBacklightClass *klass) static void gpm_backlight_init (GpmBacklight *backlight) { - gboolean lid_is_present = TRUE; - GpmPrefsServer *prefs_server; - backlight->priv = GPM_BACKLIGHT_GET_PRIVATE (backlight); /* record our idle time */ @@ -745,19 +741,6 @@ gpm_backlight_init (GpmBacklight *backlight) /* gets caps */ backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness); - /* we use UPower to see if we should show the lid UI */ - g_object_get (backlight->priv->client, - "lid-is-present", &lid_is_present, - NULL); - - /* expose ui in prefs program */ - prefs_server = gpm_prefs_server_new (); - if (lid_is_present) - gpm_prefs_server_set_capability (prefs_server, GPM_PREFS_SERVER_LID); - if (backlight->priv->can_dim) - gpm_prefs_server_set_capability (prefs_server, GPM_PREFS_SERVER_BACKLIGHT); - g_object_unref (prefs_server); - /* watch for dim value changes */ backlight->priv->conf = mateconf_client_get_default (); |