From 6b7875b9714d5872f80b6b4012f24fb8f548aca2 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Mon, 19 Nov 2018 14:12:59 +0800 Subject: Avoid compile warning for g_type_class_add_private - capplet/gsm-app-dialog.c - capplet/gsm-app-dialog.h - capplet/gsm-properties-dialog.c - capplet/gsm-properties-dialog.h - capplet/gsp-app-manager.c - capplet/gsp-app-manager.h - capplet/gsp-app.c - capplet/gsp-app.h - mate-session/gsm-app.c - mate-session/gsm-app.h - mate-session/gsm-autostart-app.c - mate-session/gsm-autostart-app.h - mate-session/gsm-client.c - mate-session/gsm-client.h - mate-session/gsm-consolekit.c - mate-session/gsm-consolekit.h - mate-session/gsm-dbus-client.c - mate-session/gsm-dbus-client.h - mate-session/gsm-inhibit-dialog.c - mate-session/gsm-inhibit-dialog.h - mate-session/gsm-inhibitor.c - mate-session/gsm-inhibitor.h - mate-session/gsm-logout-dialog.c - mate-session/gsm-logout-dialog.h - mate-session/gsm-store.c - mate-session/gsm-store.h - mate-session/gsm-systemd.c - mate-session/gsm-systemd.h - mate-session/gsm-xsmp-client.c - mate-session/gsm-xsmp-client.h - mate-session/gsm-xsmp-server.c - mate-session/gsm-xsmp-server.h --- mate-session/gsm-logout-dialog.h | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) (limited to 'mate-session/gsm-logout-dialog.h') diff --git a/mate-session/gsm-logout-dialog.h b/mate-session/gsm-logout-dialog.h index dcde2cb..2166521 100644 --- a/mate-session/gsm-logout-dialog.h +++ b/mate-session/gsm-logout-dialog.h @@ -26,9 +26,10 @@ #include -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS + +#define GSM_TYPE_LOGOUT_DIALOG (gsm_logout_dialog_get_type ()) +G_DECLARE_FINAL_TYPE (GsmLogoutDialog, gsm_logout_dialog, GSM, LOGOUT_DIALOG, GtkMessageDialog) enum { @@ -40,38 +41,11 @@ enum GSM_LOGOUT_RESPONSE_SLEEP }; -#define GSM_TYPE_LOGOUT_DIALOG (gsm_logout_dialog_get_type ()) -#define GSM_LOGOUT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_LOGOUT_DIALOG, GsmLogoutDialog)) -#define GSM_LOGOUT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_LOGOUT_DIALOG, GsmLogoutDialogClass)) -#define GSM_IS_LOGOUT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_LOGOUT_DIALOG)) -#define GSM_IS_LOGOUT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_LOGOUT_DIALOG)) -#define GSM_LOGOUT_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_LOGOUT_DIALOG, GsmLogoutDialogClass)) - -typedef struct _GsmLogoutDialog GsmLogoutDialog; -typedef struct _GsmLogoutDialogClass GsmLogoutDialogClass; -typedef struct _GsmLogoutDialogPrivate GsmLogoutDialogPrivate; - -struct _GsmLogoutDialog -{ - GtkMessageDialog parent; - - GsmLogoutDialogPrivate *priv; -}; - -struct _GsmLogoutDialogClass -{ - GtkMessageDialogClass parent_class; -}; - -GType gsm_logout_dialog_get_type (void) G_GNUC_CONST; - GtkWidget *gsm_get_logout_dialog (GdkScreen *screen, guint32 activate_time); GtkWidget *gsm_get_shutdown_dialog (GdkScreen *screen, guint32 activate_time); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __GSM_LOGOUT_DIALOG_H__ */ -- cgit v1.2.1