diff options
| author | Michal Ratajsky <[email protected]> | 2014-07-05 02:16:45 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-10-09 16:51:29 +0200 |
| commit | 1eadf051aed2cbf103e2e9653107339be01a5740 (patch) | |
| tree | 1e3d0763437792f1e0cad37c2c68c47a396c25e6 /plugins/media-keys/msd-media-keys-manager.h | |
| parent | 8481ebdc843ec212e59f98c8ff5f718485f864c0 (diff) | |
| download | mate-settings-daemon-1eadf051aed2cbf103e2e9653107339be01a5740.tar.bz2 mate-settings-daemon-1eadf051aed2cbf103e2e9653107339be01a5740.tar.xz | |
Clean things up a bit, update copyright, remove unused code, fix NEWS and compiler warnings
Diffstat (limited to 'plugins/media-keys/msd-media-keys-manager.h')
| -rw-r--r-- | plugins/media-keys/msd-media-keys-manager.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/plugins/media-keys/msd-media-keys-manager.h b/plugins/media-keys/msd-media-keys-manager.h index 1bcabf2..2afb5bc 100644 --- a/plugins/media-keys/msd-media-keys-manager.h +++ b/plugins/media-keys/msd-media-keys-manager.h @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * Copyright (C) 2007 William Jon McCann <[email protected]> + * Copyright (C) 2014 Michal Ratajsky <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,11 +22,10 @@ #ifndef __MSD_MEDIA_KEYS_MANAGER_H #define __MSD_MEDIA_KEYS_MANAGER_H +#include <glib.h> #include <glib-object.h> -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS #define MSD_TYPE_MEDIA_KEYS_MANAGER (msd_media_keys_manager_get_type ()) #define MSD_MEDIA_KEYS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_MEDIA_KEYS_MANAGER, MsdMediaKeysManager)) @@ -34,21 +34,23 @@ extern "C" { #define MSD_IS_MEDIA_KEYS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_MEDIA_KEYS_MANAGER)) #define MSD_MEDIA_KEYS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_MEDIA_KEYS_MANAGER, MsdMediaKeysManagerClass)) -typedef struct MsdMediaKeysManagerPrivate MsdMediaKeysManagerPrivate; +typedef struct _MsdMediaKeysManager MsdMediaKeysManager; +typedef struct _MsdMediaKeysManagerClass MsdMediaKeysManagerClass; +typedef struct _MsdMediaKeysManagerPrivate MsdMediaKeysManagerPrivate; -typedef struct +struct _MsdMediaKeysManager { GObject parent; MsdMediaKeysManagerPrivate *priv; -} MsdMediaKeysManager; +}; -typedef struct +struct _MsdMediaKeysManagerClass { GObjectClass parent_class; void (* media_player_key_pressed) (MsdMediaKeysManager *manager, const char *application, const char *key); -} MsdMediaKeysManagerClass; +}; GType msd_media_keys_manager_get_type (void); @@ -65,8 +67,6 @@ gboolean msd_media_keys_manager_release_media_player_keys (MsdMedia const char *application, GError **error); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __MSD_MEDIA_KEYS_MANAGER_H */ |