summaryrefslogtreecommitdiff
path: root/mate-panel/libpanel-util/panel-session-manager.h
diff options
context:
space:
mode:
authoryetist <[email protected]>2018-09-04 14:27:45 +0800
committerraveit65 <[email protected]>2018-11-14 11:23:09 +0100
commita34f531da4f03eecfc38414295ebe70742dfad71 (patch)
treeabfa3927f6a29faed1167f64ee7f3d96d77451f8 /mate-panel/libpanel-util/panel-session-manager.h
parenta73abb84d55ed6757f05b28484bbe0080ee5d129 (diff)
downloadmate-panel-a34f531da4f03eecfc38414295ebe70742dfad71.tar.bz2
mate-panel-a34f531da4f03eecfc38414295ebe70742dfad71.tar.xz
Migrate mate-panel from dbus-glib to gdbus
- Code optimization - Put GDBusProxy in PanelSessionManager struct
Diffstat (limited to 'mate-panel/libpanel-util/panel-session-manager.h')
-rw-r--r--mate-panel/libpanel-util/panel-session-manager.h29
1 files changed, 3 insertions, 26 deletions
diff --git a/mate-panel/libpanel-util/panel-session-manager.h b/mate-panel/libpanel-util/panel-session-manager.h
index 1e1d8fc5..98d09c94 100644
--- a/mate-panel/libpanel-util/panel-session-manager.h
+++ b/mate-panel/libpanel-util/panel-session-manager.h
@@ -27,31 +27,10 @@
#include <glib-object.h>
-#include "panel-dbus-service.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
#define PANEL_TYPE_SESSION_MANAGER (panel_session_manager_get_type ())
-#define PANEL_SESSION_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_SESSION_MANAGER, PanelSessionManager))
-#define PANEL_SESSION_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_SESSION_MANAGER, PanelSessionManagerClass))
-#define PANEL_IS_SESSION_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_SESSION_MANAGER))
-#define PANEL_IS_SESSION_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_SESSION_MANAGER))
-#define PANEL_SESSION_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_SESSION_MANAGER, PanelSessionManagerClass))
-
-typedef struct _PanelSessionManager PanelSessionManager;
-typedef struct _PanelSessionManagerClass PanelSessionManagerClass;
-
-struct _PanelSessionManager {
- PanelDBusService parent;
-};
-
-struct _PanelSessionManagerClass {
- PanelDBusServiceClass parent_class;
-};
-
-GType panel_session_manager_get_type (void);
+G_DECLARE_FINAL_TYPE (PanelSessionManager, panel_session_manager, PANEL, SESSION_MANAGER, GObject);
/* Keep in sync with the values defined in mate-session/session.h */
typedef enum {
@@ -68,8 +47,6 @@ void panel_session_manager_request_shutdown (PanelSessionManager *session);
gboolean panel_session_manager_is_shutdown_available (PanelSessionManager *session);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* PANEL_SESSION_MANAGER_H */