[Xfce4-commits] [xfce/xfce4-power-manager] 04/17: Rename ENABLE_BRIGHTNESS_CONTROL to HANDLE_BRIGHTNESS_KEYS

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

hjudt pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 970b3c206c1f2c3ce1fb15316ee0a212a2470ed1
Author: Harald Judt <h.judt at gmx.at>
Date:   Sat Jul 19 11:46:44 2014 +0200

    Rename ENABLE_BRIGHTNESS_CONTROL to HANDLE_BRIGHTNESS_KEYS
---
 src/xfpm-backlight.c |   10 +++++-----
 src/xfpm-config.h    |    2 +-
 src/xfpm-xfconf.c    |    8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index 9b75be3..4b4dc3e 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -200,19 +200,19 @@ xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBa
     gint32 level;
     gboolean ret = TRUE;
     
-    gboolean enable_brightness, show_popup;
+    gboolean handle_brightness_keys, show_popup;
     
     g_object_get (G_OBJECT (backlight->priv->conf),
-                  ENABLE_BRIGHTNESS_CONTROL, &enable_brightness,
-		  SHOW_BRIGHTNESS_POPUP, &show_popup,
+                  HANDLE_BRIGHTNESS_KEYS, &handle_brightness_keys,
+                  SHOW_BRIGHTNESS_POPUP, &show_popup,
                   NULL);
     
     if ( type != BUTTON_MON_BRIGHTNESS_UP && type != BUTTON_MON_BRIGHTNESS_DOWN )
 	return; /* sanity check, can this ever happen? */
 
     backlight->priv->block = TRUE;
-    if ( !enable_brightness )
-	ret = xfpm_brightness_get_level (backlight->priv->brightness, &level);
+    if ( !handle_brightness_keys )
+        ret = xfpm_brightness_get_level (backlight->priv->brightness, &level);
     else
     {
 	if ( type == BUTTON_MON_BRIGHTNESS_UP )
diff --git a/src/xfpm-config.h b/src/xfpm-config.h
index 70c6113..e434cf9 100644
--- a/src/xfpm-config.h
+++ b/src/xfpm-config.h
@@ -65,7 +65,7 @@ G_BEGIN_DECLS
 
 #define     	CRITICAL_POWER_LEVEL        	"critical-power-level"
 #define     	SHOW_BRIGHTNESS_POPUP        	"show-brightness-popup"
-#define     	ENABLE_BRIGHTNESS_CONTROL       "change-brightness-on-key-events"
+#define     	HANDLE_BRIGHTNESS_KEYS          "handle-brightness-keys"
 
 #define 	SHOW_TRAY_ICON_CFG          	"show-tray-icon"
 #define 	CRITICAL_BATT_ACTION_CFG    	"critical-power-action"
diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c
index 88795ab..35acda8 100644
--- a/src/xfpm-xfconf.c
+++ b/src/xfpm-xfconf.c
@@ -60,7 +60,7 @@ enum
     PROP_ENABLE_CPU_FREQ,
     PROP_CRITICAL_LEVEL,
     PROP_SHOW_BRIGHTNESS_POPUP,
-    PROP_ENABLE_BRIGHTNESS,
+    PROP_HANDLE_BRIGHTNESS_KEYS,
     PROP_TRAY_ICON,
     PROP_CRITICAL_BATTERY_ACTION,
     PROP_POWER_BUTTON,
@@ -284,11 +284,11 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
                                                            G_PARAM_READWRITE));
     
     /**
-     * XfpmXfconf::show-brightness-popup
+     * XfpmXfconf::handle-brightness-keys
      **/
     g_object_class_install_property (object_class,
-                                     PROP_ENABLE_BRIGHTNESS,
-                                     g_param_spec_boolean (ENABLE_BRIGHTNESS_CONTROL,
+                                     PROP_HANDLE_BRIGHTNESS_KEYS,
+                                     g_param_spec_boolean (HANDLE_BRIGHTNESS_KEYS,
                                                            NULL, NULL,
                                                            TRUE,
                                                            G_PARAM_READWRITE));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.