diff options
| author | Wu Xiaotian <[email protected]> | 2019-05-09 15:39:36 +0800 |
|---|---|---|
| committer | ZenWalker <[email protected]> | 2019-05-16 11:38:50 +0200 |
| commit | 985bd4ed7b4341aea9b85a232969140708150972 (patch) | |
| tree | 78fb8a604cf7b40fe5424324ec137803bfd9a37a /mate-panel/libmate-panel-applet-private | |
| parent | 2c838847a593718f230d4f9bf17fe707d6390b81 (diff) | |
| download | mate-panel-985bd4ed7b4341aea9b85a232969140708150972.tar.bz2 mate-panel-985bd4ed7b4341aea9b85a232969140708150972.tar.xz | |
[mate-panel] Avoid deprecated g_type_class_add_private
Diffstat (limited to 'mate-panel/libmate-panel-applet-private')
3 files changed, 14 insertions, 27 deletions
diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-container.c b/mate-panel/libmate-panel-applet-private/panel-applet-container.c index 5d1923aa..04ee799b 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applet-container.c +++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.c @@ -69,9 +69,6 @@ static const AppletPropertyInfo applet_properties [] = { { "locked-down", "LockedDown" } }; -#define MATE_PANEL_APPLET_CONTAINER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_APPLET_CONTAINER, MatePanelAppletContainerPrivate)) - #define MATE_PANEL_APPLET_BUS_NAME "org.mate.panel.applet.%s" #define MATE_PANEL_APPLET_FACTORY_INTERFACE "org.mate.panel.applet.AppletFactory" #define MATE_PANEL_APPLET_FACTORY_OBJECT_PATH "/org/mate/panel/applet/%s" @@ -79,7 +76,7 @@ static const AppletPropertyInfo applet_properties [] = { static gboolean mate_panel_applet_container_plug_removed (MatePanelAppletContainer *container); -G_DEFINE_TYPE (MatePanelAppletContainer, mate_panel_applet_container, GTK_TYPE_EVENT_BOX); +G_DEFINE_TYPE_WITH_PRIVATE (MatePanelAppletContainer, mate_panel_applet_container, GTK_TYPE_EVENT_BOX); GQuark mate_panel_applet_container_error_quark (void) { @@ -88,7 +85,7 @@ GQuark mate_panel_applet_container_error_quark (void) static void mate_panel_applet_container_init(MatePanelAppletContainer* container) { - container->priv = MATE_PANEL_APPLET_CONTAINER_GET_PRIVATE (container); + container->priv = mate_panel_applet_container_get_instance_private (container); container->priv->pending_ops = g_hash_table_new_full (g_direct_hash, g_direct_equal, @@ -175,8 +172,6 @@ mate_panel_applet_container_class_init (MatePanelAppletContainerClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (MatePanelAppletContainerPrivate)); - gobject_class->dispose = mate_panel_applet_container_dispose; signals[APPLET_BROKEN] = diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c index 006bdb0a..c20e5cb2 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c +++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c @@ -35,10 +35,6 @@ #include "panel-applet-container.h" #include "panel-applet-frame-dbus.h" -G_DEFINE_TYPE (MatePanelAppletFrameDBus, - mate_panel_applet_frame_dbus, - PANEL_TYPE_APPLET_FRAME) - struct _MatePanelAppletFrameDBusPrivate { MatePanelAppletContainer *container; @@ -53,6 +49,9 @@ typedef enum { APPLET_HAS_HANDLE = 1 << 2 } MatePanelAppletFlags; +G_DEFINE_TYPE_WITH_PRIVATE (MatePanelAppletFrameDBus, + mate_panel_applet_frame_dbus, + PANEL_TYPE_APPLET_FRAME) static guint get_mate_panel_applet_orient (PanelOrientation orientation) @@ -336,9 +335,7 @@ mate_panel_applet_frame_dbus_init (MatePanelAppletFrameDBus *frame) { GtkWidget *container; - frame->priv = G_TYPE_INSTANCE_GET_PRIVATE (frame, - PANEL_TYPE_APPLET_FRAME_DBUS, - MatePanelAppletFrameDBusPrivate); + frame->priv = mate_panel_applet_frame_dbus_get_instance_private (frame); container = mate_panel_applet_container_new (); gtk_widget_show (container); @@ -383,8 +380,6 @@ mate_panel_applet_frame_dbus_class_init (MatePanelAppletFrameDBusClass *class) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); gtk_widget_class_set_css_name (widget_class, "MatePanelAppletFrameDBus"); - - g_type_class_add_private (class, sizeof (MatePanelAppletFrameDBusPrivate)); } static void diff --git a/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c index 43263dae..57e268c2 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c +++ b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c @@ -31,20 +31,21 @@ #include "panel-applet-frame-dbus.h" #include "panel-applets-manager-dbus.h" +struct _MatePanelAppletsManagerDBusPrivate +{ + GHashTable *applet_factories; + GList *monitors; +}; + G_DEFINE_TYPE_WITH_CODE (MatePanelAppletsManagerDBus, mate_panel_applets_manager_dbus, PANEL_TYPE_APPLETS_MANAGER, + G_ADD_PRIVATE(MatePanelAppletsManagerDBus) g_io_extension_point_implement (MATE_PANEL_APPLETS_MANAGER_EXTENSION_POINT_NAME, g_define_type_id, "dbus", 10)) -struct _MatePanelAppletsManagerDBusPrivate -{ - GHashTable *applet_factories; - GList *monitors; -}; - typedef gint (* ActivateAppletFunc) (void); typedef GtkWidget * (* GetAppletWidgetFunc) (const gchar *factory_id, guint uid); @@ -600,9 +601,7 @@ mate_panel_applets_manager_dbus_finalize (GObject *object) static void mate_panel_applets_manager_dbus_init (MatePanelAppletsManagerDBus *manager) { - manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, - PANEL_TYPE_APPLETS_MANAGER_DBUS, - MatePanelAppletsManagerDBusPrivate); + manager->priv = mate_panel_applets_manager_dbus_get_instance_private (manager); manager->priv->applet_factories = g_hash_table_new_full (g_str_hash, g_str_equal, @@ -627,6 +626,4 @@ mate_panel_applets_manager_dbus_class_init (MatePanelAppletsManagerDBusClass *cl manager_class->get_applet_info_from_old_id = mate_panel_applets_manager_dbus_get_applet_info_from_old_id; manager_class->load_applet = mate_panel_applets_manager_dbus_load_applet; manager_class->get_applet_widget = mate_panel_applets_manager_dbus_get_applet_widget; - - g_type_class_add_private (class, sizeof (MatePanelAppletsManagerDBusPrivate)); } |