summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmate-panel-applet/mate-panel-applet-factory.c4
-rw-r--r--libmate-panel-applet/mate-panel-applet-factory.h37
2 files changed, 14 insertions, 27 deletions
diff --git a/libmate-panel-applet/mate-panel-applet-factory.c b/libmate-panel-applet/mate-panel-applet-factory.c
index c9a331a6..90c2c24f 100644
--- a/libmate-panel-applet/mate-panel-applet-factory.c
+++ b/libmate-panel-applet/mate-panel-applet-factory.c
@@ -47,10 +47,6 @@ struct _MatePanelAppletFactory {
guint next_uid;
};
-struct _MatePanelAppletFactoryClass {
- GObjectClass base_class;
-};
-
#define MATE_PANEL_APPLET_FACTORY_OBJECT_PATH "/org/mate/panel/applet/%s"
#define MATE_PANEL_APPLET_FACTORY_SERVICE_NAME "org.mate.panel.applet.%s"
diff --git a/libmate-panel-applet/mate-panel-applet-factory.h b/libmate-panel-applet/mate-panel-applet-factory.h
index 3eb9a22d..2a8eeb07 100644
--- a/libmate-panel-applet/mate-panel-applet-factory.h
+++ b/libmate-panel-applet/mate-panel-applet-factory.h
@@ -26,28 +26,19 @@
#include "mate-panel-applet.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PANEL_TYPE_APPLET_FACTORY (mate_panel_applet_factory_get_type ())
-#define MATE_PANEL_APPLET_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_APPLET_FACTORY, MatePanelAppletFactory))
-#define MATE_PANEL_APPLET_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PANEL_TYPE_APPLET_FACTORY, MatePanelAppletFactoryClass))
-#define PANEL_IS_APPLET_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_APPLET_FACTORY))
-
-typedef struct _MatePanelAppletFactory MatePanelAppletFactory;
-typedef struct _MatePanelAppletFactoryClass MatePanelAppletFactoryClass;
-
-GType mate_panel_applet_factory_get_type (void) G_GNUC_CONST;
-MatePanelAppletFactory *mate_panel_applet_factory_new (const gchar *applet_id,
- gboolean out_of_process,
- GType applet_type,
- GClosure *closure);
-gboolean mate_panel_applet_factory_register_service (MatePanelAppletFactory *factory);
-GtkWidget *mate_panel_applet_factory_get_applet_widget (const gchar *id,
- guint uid);
-#ifdef __cplusplus
-}
-#endif
+G_BEGIN_DECLS
+
+#define PANEL_TYPE_APPLET_FACTORY mate_panel_applet_factory_get_type ()
+G_DECLARE_FINAL_TYPE (MatePanelAppletFactory, mate_panel_applet_factory, MATE_PANEL, APPLET_FACTORY, GObject)
+
+MatePanelAppletFactory *mate_panel_applet_factory_new (const gchar *applet_id,
+ gboolean out_of_process,
+ GType applet_type,
+ GClosure *closure);
+gboolean mate_panel_applet_factory_register_service (MatePanelAppletFactory *factory);
+GtkWidget *mate_panel_applet_factory_get_applet_widget (const gchar *id,
+ guint uid);
+
+G_END_DECLS
#endif /* MATE_PANEL_APPLET_FACTORY_H */