[Xfce4-commits] [xfce/xfce4-power-manager] 02/05: Fix up parameter order for settings dialog creation function too
noreply at xfce.org
noreply at xfce.org
Mon Jun 16 17:42:26 CEST 2014
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 80039fd294ba0ec6a9d73d307e30dbf30f93696b
Author: Harald Judt <h.judt at gmx.at>
Date: Mon Jun 16 12:30:40 2014 +0200
Fix up parameter order for settings dialog creation function too
Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
settings/xfpm-settings-main.c | 4 ++--
settings/xfpm-settings.c | 16 ++++++++--------
settings/xfpm-settings.h | 32 +++++++++++++++-----------------
3 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/settings/xfpm-settings-main.c b/settings/xfpm-settings-main.c
index 6071315..563aba9 100644
--- a/settings/xfpm-settings-main.c
+++ b/settings/xfpm-settings-main.c
@@ -168,8 +168,8 @@ int main (int argc, char **argv)
g_hash_table_destroy (config_hash);
- dialog = xfpm_settings_dialog_new (channel, has_battery, auth_hibernate, auth_suspend,
- can_shutdown, can_suspend, can_hibernate, has_lcd_brightness,
+ dialog = xfpm_settings_dialog_new (channel, auth_suspend, auth_hibernate,
+ can_suspend, can_hibernate, can_shutdown, has_battery, has_lcd_brightness,
has_lid, has_sleep_button, has_hibernate_button, has_power_button,
devkit_disk, can_spin_down, socket_id);
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index e9da0c7..d2027af 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -2001,14 +2001,14 @@ delete_event_cb (GtkWidget *plug, GdkEvent *ev, XfconfChannel *channel)
}
GtkWidget *
-xfpm_settings_dialog_new (XfconfChannel *channel, gboolean system_laptop,
- gboolean auth_hibernate, gboolean auth_suspend,
- gboolean can_shutdown, gboolean can_suspend,
- gboolean can_hibernate, gboolean has_lcd_brightness,
- gboolean has_lid, gboolean has_sleep_button,
- gboolean has_hibernate_button, gboolean has_power_button,
- gboolean devkit_disk, gboolean can_spin_down,
- GdkNativeWindow id)
+xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
+ gboolean auth_hibernate, gboolean can_suspend,
+ gboolean can_hibernate, gboolean can_shutdown,
+ gboolean system_laptop, gboolean has_lcd_brightness,
+ gboolean has_lid, gboolean has_sleep_button,
+ gboolean has_hibernate_button, gboolean has_power_button,
+ gboolean devkit_disk, gboolean can_spin_down,
+ GdkNativeWindow id)
{
GtkWidget *plug;
GtkWidget *dialog;
diff --git a/settings/xfpm-settings.h b/settings/xfpm-settings.h
index 7dd1444..b70a002 100644
--- a/settings/xfpm-settings.h
+++ b/settings/xfpm-settings.h
@@ -22,22 +22,20 @@
#define __XFPM_SETTINGS_H
-GtkWidget *xfpm_settings_dialog_new (XfconfChannel *channel,
- gboolean has_battery,
- gboolean auth_hibernate,
- gboolean auth_suspend,
- gboolean can_shutdown,
- gboolean can_suspend,
- gboolean can_hibernate,
- gboolean has_lcd_brightness,
- gboolean has_lid,
- gboolean has_sleep_button,
- gboolean has_hibernate_button,
- gboolean has_power_button,
- gboolean devkit_disk,
- gboolean can_spin_down,
- GdkNativeWindow id);
-
-
+GtkWidget *xfpm_settings_dialog_new (XfconfChannel *channel,
+ gboolean auth_suspend,
+ gboolean auth_hibernate,
+ gboolean can_suspend,
+ gboolean can_hibernate,
+ gboolean can_shutdown,
+ gboolean has_battery,
+ gboolean has_lcd_brightness,
+ gboolean has_lid,
+ gboolean has_sleep_button,
+ gboolean has_hibernate_button,
+ gboolean has_power_button,
+ gboolean devkit_disk,
+ gboolean can_spin_down,
+ GdkNativeWindow id);
#endif /* __XFPM_SETTINGS_H */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list