diff options
| author | Brent Hull <[email protected]> | 2012-10-30 15:55:35 -0400 |
|---|---|---|
| committer | Brent Hull <[email protected]> | 2012-10-30 15:55:35 -0400 |
| commit | 060a4507145425c02c6aa0ef810138c04d38f5a9 (patch) | |
| tree | 696262b89d749abf74ccec08260969679ef70d6e /src/gpm-engine.c | |
| parent | e58350ab1a00d55e82f7ae97589562e10a77c485 (diff) | |
| download | mate-power-manager-060a4507145425c02c6aa0ef810138c04d38f5a9.tar.bz2 mate-power-manager-060a4507145425c02c6aa0ef810138c04d38f5a9.tar.xz | |
Use gsettings enums (partially from GNOME)
Diffstat (limited to 'src/gpm-engine.c')
| -rw-r--r-- | src/gpm-engine.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gpm-engine.c b/src/gpm-engine.c index b006c32..0f9d0c1 100644 --- a/src/gpm-engine.c +++ b/src/gpm-engine.c @@ -513,7 +513,6 @@ gpm_engine_recalculate_state (GpmEngine *engine) static void gpm_engine_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmEngine *engine) { - gchar *icon_policy; if (g_strcmp0 (key, GPM_SETTINGS_USE_TIME_POLICY) == 0) { engine->priv->use_time_primary = g_settings_get_boolean (settings, key); @@ -521,9 +520,7 @@ gpm_engine_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmEn } else if (g_strcmp0 (key, GPM_SETTINGS_ICON_POLICY) == 0) { /* do we want to display the icon in the tray */ - icon_policy = g_settings_get_string (settings, key); - engine->priv->icon_policy = gpm_icon_policy_from_string (icon_policy); - g_free (icon_policy); + engine->priv->icon_policy = g_settings_get_enum (settings, key); /* perhaps change icon */ gpm_engine_recalculate_state_icon (engine); @@ -1045,7 +1042,6 @@ phone_device_refresh_cb (GpmPhone *phone, guint idx, GpmEngine *engine) static void gpm_engine_init (GpmEngine *engine) { - gchar *icon_policy; engine->priv = GPM_ENGINE_GET_PRIVATE (engine); @@ -1084,9 +1080,7 @@ gpm_engine_init (GpmEngine *engine) engine->priv->previous_summary = NULL; /* do we want to display the icon in the tray */ - icon_policy = g_settings_get_string (engine->priv->settings, GPM_SETTINGS_ICON_POLICY); - engine->priv->icon_policy = gpm_icon_policy_from_string (icon_policy); - g_free (icon_policy); + engine->priv->icon_policy = g_settings_get_enum (engine->priv->settings, GPM_SETTINGS_ICON_POLICY); /* get percentage policy */ engine->priv->low_percentage = g_settings_get_int (engine->priv->settings, GPM_SETTINGS_PERCENTAGE_LOW); |