AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

x11: Clean up xsettings header

Browse Source 
Move private struct definitions into source file, remove unneeded C++
guards.
This commit is contained in:
Benjamin Otte 2013-02-12 16:47:45 +01:00
parent 0c58cb744c
commit 2b83062fc6
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gdk/x11/xsettings-client.c
View File

@ -38,6 +38,25 @@
#include <X11/Xlib.h>
#include <X11/Xmd.h> /* For CARD16 */
typedef struct _XSettingsBuffer XSettingsBuffer;
typedef enum
{
XSETTINGS_SUCCESS,
XSETTINGS_ACCESS,
XSETTINGS_FAILED,
XSETTINGS_NO_ENTRY,
XSETTINGS_DUPLICATE_ENTRY
} XSettingsResult;
struct _XSettingsBuffer
{
char byte_order;
size_t len;
unsigned char *data;
unsigned char *pos;
};
struct _XSettingsClient
{
GdkScreen *screen;

26
gdk/x11/xsettings-client.h
View File

@ -26,10 +26,6 @@
#include <gdk/gdkscreen.h>
#include <X11/Xlib.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* Renames for GDK inclusion */
#define xsettings_client_destroy _gdk_x11_xsettings_client_destroy
@ -39,7 +35,6 @@ extern "C" {
#define xsettings_setting_equal _gdk_x11_xsettings_setting_equal
#define xsettings_setting_free _gdk_x11_xsettings_setting_free
typedef struct _XSettingsBuffer XSettingsBuffer;
typedef struct _XSettingsColor XSettingsColor;
typedef struct _XSettingsSetting XSettingsSetting;
typedef struct _XSettingsClient XSettingsClient;
@ -61,23 +56,6 @@ typedef enum
XSETTINGS_ACTION_DELETED
} XSettingsAction;
typedef enum
{
XSETTINGS_SUCCESS,
XSETTINGS_ACCESS,
XSETTINGS_FAILED,
XSETTINGS_NO_ENTRY,
XSETTINGS_DUPLICATE_ENTRY
} XSettingsResult;
struct _XSettingsBuffer
{
char byte_order;
size_t len;
unsigned char *data;
unsigned char *pos;
};
struct _XSettingsColor
{
unsigned short red, green, blue, alpha;
@ -119,8 +97,4 @@ const XSettingsSetting *
xsettings_client_get_setting (XSettingsClient *client,
const char *name);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* XSETTINGS_CLIENT_H */