[Goodies-commits] r5618 - xfce4-power-manager/trunk/src

[Ali Abdallah]

Author: aliov
Date: 2008-10-14 15:45:31 +0000 (Tue, 14 Oct 2008)
New Revision: 5618

Modified:
   xfce4-power-manager/trunk/src/xfpm-ac-adapter.c
   xfce4-power-manager/trunk/src/xfpm-button.c
   xfce4-power-manager/trunk/src/xfpm-common.h
   xfce4-power-manager/trunk/src/xfpm-driver.c
   xfce4-power-manager/trunk/src/xfpm-driver.h
Log:
Moving some enum types to xfpm-common.h

Modified: xfce4-power-manager/trunk/src/xfpm-ac-adapter.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-ac-adapter.c	2008-10-14 15:37:58 UTC (rev 5617)
+++ xfce4-power-manager/trunk/src/xfpm-ac-adapter.c	2008-10-14 15:45:31 UTC (rev 5618)
@@ -49,10 +49,11 @@
 
 #include <glib/gi18n.h>
 
+#include "xfpm-common.h"
+
 #include "xfpm-hal.h"
 #include "xfpm-driver.h"
 #include "xfpm-ac-adapter.h"
-#include "xfpm-common.h"
 #include "xfpm-notify.h"
 #include "xfpm-debug.h"
 

Modified: xfce4-power-manager/trunk/src/xfpm-button.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button.c	2008-10-14 15:37:58 UTC (rev 5617)
+++ xfce4-power-manager/trunk/src/xfpm-button.c	2008-10-14 15:45:31 UTC (rev 5618)
@@ -99,13 +99,6 @@
 
 };
 
-typedef enum
-{
-    LID,
-    SLEEP,
-    POWER
-    
-} XfpmSwitchButton;
 
 G_DEFINE_TYPE(XfpmButton,xfpm_button,G_TYPE_OBJECT)
 

Modified: xfce4-power-manager/trunk/src/xfpm-common.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-common.h	2008-10-14 15:37:58 UTC (rev 5617)
+++ xfce4-power-manager/trunk/src/xfpm-common.h	2008-10-14 15:45:31 UTC (rev 5618)
@@ -58,6 +58,23 @@
 #define ON_AC_DPMS_TIMEOUTS_CFG     "/xfce4-power-manager/on-ac-monitor-dpms-timeouts"
 #endif
 
+typedef enum 
+{
+    SYSTEM_LAPTOP,
+    SYSTEM_DESKTOP,
+    SYSTEM_SERVER,
+    SYSTEM_UNKNOWN
+    
+} SystemFormFactor;
+
+typedef enum
+{
+    LID,
+    SLEEP,
+    POWER
+    
+} XfpmSwitchButton;
+
 GdkPixbuf* xfpm_load_icon(const gchar *icon_name,gint size);
 void       xfpm_lock_screen(void);
 void       xfpm_preferences(void);

Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-14 15:37:58 UTC (rev 5617)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-14 15:45:31 UTC (rev 5618)
@@ -53,6 +53,8 @@
 #include <libxfcegui4/libxfcegui4.h>
 #include <xfconf/xfconf.h>
 
+#include "xfpm-common.h"
+
 #include "xfpm-driver.h"
 #include "xfpm-debug.h"
 #include "xfpm-battery.h"
@@ -62,7 +64,6 @@
 #include "xfpm-lcd-brightness.h"
 #include "xfpm-notify.h"
 #include "xfpm-enum-types.h"
-#include "xfpm-common.h"
 #include "xfpm-settings.h"
 
 #ifdef HAVE_LIBNOTIFY

Modified: xfce4-power-manager/trunk/src/xfpm-driver.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.h	2008-10-14 15:37:58 UTC (rev 5617)
+++ xfce4-power-manager/trunk/src/xfpm-driver.h	2008-10-14 15:45:31 UTC (rev 5618)
@@ -35,15 +35,6 @@
 #include "xfpm-dpms.h"
 #endif
 
-typedef enum 
-{
-    SYSTEM_LAPTOP,
-    SYSTEM_DESKTOP,
-    SYSTEM_SERVER,
-    SYSTEM_UNKNOWN
-    
-} SystemFormFactor;
-
 G_BEGIN_DECLS
 
 #define XFPM_TYPE_DRIVER   (xfpm_driver_get_type())