[Xfce4-commits] [xfce/xfce4-power-manager] 01/05: Fix inconsistent function parameter order

[noreply at xfce.org]

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

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

commit 7259ffb65c7a27d60842023a51597b8bc06bae2f
Author: Harald Judt <h.judt at gmx.at>
Date:   Mon Jun 16 12:21:52 2014 +0200

    Fix inconsistent function parameter order
    
    Function parameter order is inconsistent, this can only lead to problems.
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 settings/xfpm-settings.c |   84 +++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 5419e8d..e9da0c7 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -746,11 +746,11 @@ void on_spindown_hdd_changed	(GtkWidget *w, XfconfChannel *channel)
 }
 
 static void
-xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_hibernate, 
-			  gboolean auth_suspend, gboolean can_shutdown, 
-			  gboolean can_suspend, gboolean can_hibernate, 
-			  gboolean has_lcd_brightness, gboolean has_lid,
-			  gboolean devkit_disk, gboolean can_spin_down)
+xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
+                          gboolean auth_hibernate, gboolean can_suspend,
+                          gboolean can_hibernate, gboolean can_shutdown,
+                          gboolean has_lcd_brightness, gboolean has_lid,
+                          gboolean devkit_disk, gboolean can_spin_down)
 {
     gboolean valid;
     gint list_value;
@@ -977,10 +977,10 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_hibernate,
 }
 
 static void
-xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend, 
-		     gboolean auth_hibernate, gboolean can_suspend, 
-		     gboolean can_hibernate, gboolean has_lcd_brightness, 
-		     gboolean has_lid, gboolean devkit_disk, gboolean can_spin_down)
+xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
+                     gboolean auth_hibernate, gboolean can_suspend,
+                     gboolean can_hibernate, gboolean has_lcd_brightness,
+                     gboolean has_lid, gboolean devkit_disk, gboolean can_spin_down)
 {
     GtkWidget *inact;
     GtkWidget *lid;
@@ -1121,11 +1121,11 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
 }
 
 static void
-xfpm_settings_general (XfconfChannel *channel, gboolean auth_hibernate, 
-		       gboolean auth_suspend, gboolean can_shutdown,  
-		       gboolean can_suspend, gboolean can_hibernate,
-		       gboolean has_sleep_button, gboolean has_hibernate_button,
-		       gboolean has_power_button)
+xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
+                       gboolean auth_hibernate, gboolean can_suspend,
+                       gboolean can_hibernate, gboolean can_shutdown,
+                       gboolean has_sleep_button, gboolean has_hibernate_button,
+                       gboolean has_power_button)
 {
     GtkWidget *power;
     GtkWidget *power_label;
@@ -1327,9 +1327,9 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_hibernate,
 }
 
 static void
-xfpm_settings_advanced (XfconfChannel *channel, gboolean system_laptop, 
-		        gboolean auth_hibernate, gboolean auth_suspend,
-			gboolean can_suspend, gboolean can_hibernate)
+xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
+                        gboolean auth_hibernate, gboolean can_suspend,
+                        gboolean can_hibernate, gboolean system_laptop)
 {
     guint val;
     gchar *str;
@@ -2098,27 +2098,27 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean system_laptop,
 
     settings_create_devices_list ();
 
-    xfpm_settings_on_ac (channel, 
-			 auth_hibernate, 
-			 auth_suspend, 
-			 can_suspend, 
-			 can_hibernate, 
-			 has_lcd_brightness, 
-			 has_lid,
-			 devkit_disk,
-			 can_spin_down);
-    
+    xfpm_settings_on_ac (channel,
+                         auth_suspend,
+                         auth_hibernate,
+                         can_suspend,
+                         can_hibernate,
+                         has_lcd_brightness,
+                         has_lid,
+                         devkit_disk,
+                         can_spin_down);
+
     if ( system_laptop )
-	xfpm_settings_on_battery (channel,
-				  auth_hibernate, 
-				  auth_suspend, 
-				  can_shutdown, 
-				  can_suspend, 
-				  can_hibernate, 
-				  has_lcd_brightness, 
-				  has_lid,
-				  devkit_disk,
-				  can_spin_down);
+    xfpm_settings_on_battery (channel,
+                              auth_suspend,
+                              auth_hibernate,
+                              can_suspend,
+                              can_hibernate,
+                              can_shutdown,
+                              has_lcd_brightness,
+                              has_lid,
+                              devkit_disk,
+                              can_spin_down);
     else
     {
 	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml ,"display_onbattery")));
@@ -2133,11 +2133,11 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean system_laptop,
 	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml ,"on-battery-lid")));
     }
     
-    xfpm_settings_general   (channel, auth_hibernate, auth_suspend, can_shutdown, can_suspend, can_hibernate,
-			     has_sleep_button, has_hibernate_button, has_power_button );
-			     
-    xfpm_settings_advanced  (channel, system_laptop, auth_hibernate, auth_suspend, can_suspend, can_hibernate);
-    
+    xfpm_settings_general (channel, auth_suspend, auth_hibernate, can_suspend, can_hibernate, can_shutdown,
+                           has_sleep_button, has_hibernate_button, has_power_button );
+
+    xfpm_settings_advanced (channel, auth_suspend, auth_hibernate, can_suspend, can_hibernate, system_laptop);
+
     if ( id != 0 )
     {
 	plugged_box = GTK_WIDGET (gtk_builder_get_object (xml, "plug-child"));

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