ubports-volte/libmce-glib
1
0
Fork 0
forked from ubports/core_hybris-support_libmce-glib-repowerd-stub
Code Pull Requests Activity

[libmce-glib] Shuffled includes a bit. JB#43321

Browse Source 
The goal was to avoid pulling in <glib-object.h> unnecessarily.
Not that it was a big deal...
This commit is contained in:
Slava Monich
2022-01-19 14:15:16 +02:00
parent 2e0818c642
commit d83584dbd2
11 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/mce_battery.h
View File

@@ -37,9 +37,11 @@
#ifndef MCE_BATTERY_H #ifndef MCE_BATTERY_H
#define MCE_BATTERY_H #define MCE_BATTERY_H
/* Since 1.0.6 */
#include "mce_types.h" #include "mce_types.h"
/* Since 1.0.6 */ #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@@ -53,13 +55,13 @@ typedef enum mce_battery_status {
typedef struct mce_battery_priv MceBatteryPriv; typedef struct mce_battery_priv MceBatteryPriv;
typedef struct mce_battery { struct mce_battery {
GObject object; GObject object;
MceBatteryPriv* priv; MceBatteryPriv* priv;
gboolean valid; gboolean valid;
guint level; guint level;
MCE_BATTERY_STATUS status; MCE_BATTERY_STATUS status;
} MceBattery; }; /* MceBattery */
typedef void typedef void
(*MceBatteryFunc)( (*MceBatteryFunc)(
@@ -104,7 +106,7 @@ mce_battery_remove_handler(
void void
mce_battery_remove_handlers( mce_battery_remove_handlers(
MceBattery* battery, MceBattery* battery,
gulong *ids, gulong* ids,
guint count); guint count);
#define mce_battery_remove_all_handlers(d, ids) \ #define mce_battery_remove_all_handlers(d, ids) \

10
include/mce_charger.h
View File

@@ -37,9 +37,11 @@
#ifndef MCE_CHARGER_H #ifndef MCE_CHARGER_H
#define MCE_CHARGER_H #define MCE_CHARGER_H
/* Since 1.0.6 */
#include "mce_types.h" #include "mce_types.h"
/* Since 1.0.6 */ #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@@ -51,12 +53,12 @@ typedef enum mce_charger_state {
typedef struct mce_charger_priv MceChargerPriv; typedef struct mce_charger_priv MceChargerPriv;
typedef struct mce_charger { struct mce_charger {
GObject object; GObject object;
MceChargerPriv* priv; MceChargerPriv* priv;
gboolean valid; gboolean valid;
MCE_CHARGER_STATE state; MCE_CHARGER_STATE state;
} MceCharger; }; /* MceCharger */
typedef void typedef void
(*MceChargerFunc)( (*MceChargerFunc)(
@@ -95,7 +97,7 @@ mce_charger_remove_handler(
void void
mce_charger_remove_handlers( mce_charger_remove_handlers(
MceCharger* charger, MceCharger* charger,
gulong *ids, gulong* ids,
guint count); guint count);
#define mce_charger_remove_all_handlers(d, ids) \ #define mce_charger_remove_all_handlers(d, ids) \

8
include/mce_display.h
View File

@@ -39,6 +39,8 @@
#include "mce_types.h" #include "mce_types.h"
#include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum mce_display_state { typedef enum mce_display_state {
@@ -49,12 +51,12 @@ typedef enum mce_display_state {
typedef struct mce_display_priv MceDisplayPriv; typedef struct mce_display_priv MceDisplayPriv;
typedef struct mce_display { struct mce_display {
GObject object; GObject object;
MceDisplayPriv* priv; MceDisplayPriv* priv;
gboolean valid; gboolean valid;
MCE_DISPLAY_STATE state; MCE_DISPLAY_STATE state;
} MceDisplay; }; /* MceDisplay */
typedef void typedef void
(*MceDisplayFunc)( (*MceDisplayFunc)(
@@ -93,7 +95,7 @@ mce_display_remove_handler(
void void
mce_display_remove_handlers( mce_display_remove_handlers(
MceDisplay* display, MceDisplay* display,
gulong *ids, gulong* ids,
guint count); guint count);
#define mce_display_remove_all_handlers(d, ids) \ #define mce_display_remove_all_handlers(d, ids) \

1
include/mce_log.h
View File

@@ -38,6 +38,7 @@
#define MCE_LOG_H #define MCE_LOG_H
#include "mce_types.h" #include "mce_types.h"
#include <gutil_types.h> #include <gutil_types.h>
G_BEGIN_DECLS G_BEGIN_DECLS

8
include/mce_tklock.h
View File

@@ -39,6 +39,8 @@
#include "mce_types.h" #include "mce_types.h"
#include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum mce_tklock_mode { typedef enum mce_tklock_mode {
@@ -53,13 +55,13 @@ typedef enum mce_tklock_mode {
typedef struct mce_tklock_priv MceTklockPriv; typedef struct mce_tklock_priv MceTklockPriv;
typedef struct mce_tklock { struct mce_tklock {
GObject object; GObject object;
MceTklockPriv* priv; MceTklockPriv* priv;
gboolean valid; gboolean valid;
MCE_TKLOCK_MODE mode; MCE_TKLOCK_MODE mode;
gboolean locked; gboolean locked;
} MceTklock; }; /* MceTklock */
typedef void typedef void
(*MceTklockFunc)( (*MceTklockFunc)(
@@ -104,7 +106,7 @@ mce_tklock_remove_handler(
void void
mce_tklock_remove_handlers( mce_tklock_remove_handlers(
MceTklock* tklock, MceTklock* tklock,
gulong *ids, gulong* ids,
guint count); guint count);
#define mce_tklock_remove_all_handlers(t, ids) \ #define mce_tklock_remove_all_handlers(t, ids) \

10
include/mce_types.h
View File

@@ -38,7 +38,15 @@
#define MCE_TYPES_H #define MCE_TYPES_H
#include <glib.h> #include <glib.h>
#include <glib-object.h>
G_BEGIN_DECLS
typedef struct mce_battery MceBattery;
typedef struct mce_charger MceCharger;
typedef struct mce_display MceDisplay;
typedef struct mce_tklock MceTklock;
G_END_DECLS
#endif /* MCE_TYPES_H */ #endif /* MCE_TYPES_H */

2
src/mce_battery.c
View File

@@ -357,7 +357,7 @@ mce_battery_remove_handler(
void void
mce_battery_remove_handlers( mce_battery_remove_handlers(
MceBattery* self, MceBattery* self,
gulong *ids, gulong* ids,
guint count) guint count)
{ {
gutil_disconnect_handlers(self, ids, count); gutil_disconnect_handlers(self, ids, count);

2
src/mce_charger.c
View File

@@ -257,7 +257,7 @@ mce_charger_remove_handler(
void void
mce_charger_remove_handlers( mce_charger_remove_handlers(
MceCharger* self, MceCharger* self,
gulong *ids, gulong* ids,
guint count) guint count)
{ {
gutil_disconnect_handlers(self, ids, count); gutil_disconnect_handlers(self, ids, count);

2
src/mce_display.c
View File

@@ -257,7 +257,7 @@ mce_display_remove_handler(
void void
mce_display_remove_handlers( mce_display_remove_handlers(
MceDisplay* self, MceDisplay* self,
gulong *ids, gulong* ids,
guint count) guint count)
{ {
gutil_disconnect_handlers(self, ids, count); gutil_disconnect_handlers(self, ids, count);

2
src/mce_proxy.h
View File

@@ -39,6 +39,8 @@
#include "mce_types_p.h" #include "mce_types_p.h"
#include <glib-object.h>
typedef struct mce_proxy_priv MceProxyPriv; typedef struct mce_proxy_priv MceProxyPriv;
struct _ComNokiaMceSignal; struct _ComNokiaMceSignal;
struct _ComNokiaMceRequest; struct _ComNokiaMceRequest;

2
src/mce_tklock.c
View File

@@ -289,7 +289,7 @@ mce_tklock_remove_handler(
void void
mce_tklock_remove_handlers( mce_tklock_remove_handlers(
MceTklock* self, MceTklock* self,
gulong *ids, gulong* ids,
guint count) guint count)
{ {
gutil_disconnect_handlers(self, ids, count); gutil_disconnect_handlers(self, ids, count);