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/panel-applets-manager-dbus.c | |
| 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/panel-applets-manager-dbus.c')
| -rw-r--r-- | mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c | 19 |
1 files changed, 8 insertions, 11 deletions
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)); } |