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/panel-menu-items.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/panel-menu-items.c')
| -rw-r--r-- | mate-panel/panel-menu-items.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c index 6ea12c20..a8722f23 100644 --- a/mate-panel/panel-menu-items.c +++ b/mate-panel/panel-menu-items.c @@ -59,14 +59,6 @@ #define MAX_BOOKMARK_ITEMS 100 -G_DEFINE_TYPE(PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) -G_DEFINE_TYPE(PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) - -#define PANEL_PLACE_MENU_ITEM_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE((o), PANEL_TYPE_PLACE_MENU_ITEM, PanelPlaceMenuItemPrivate)) -#define PANEL_DESKTOP_MENU_ITEM_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE((o), PANEL_TYPE_DESKTOP_MENU_ITEM, PanelDesktopMenuItemPrivate)) - struct _PanelPlaceMenuItemPrivate { GtkWidget *menu; PanelWidget *panel; @@ -101,6 +93,9 @@ struct _PanelDesktopMenuItemPrivate { guint append_lock_logout : 1; }; +G_DEFINE_TYPE_WITH_PRIVATE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) +G_DEFINE_TYPE_WITH_PRIVATE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) + static void activate_uri_on_screen(const char* uri, GdkScreen* screen) { panel_show_uri(screen, uri, gtk_get_current_event_time(), NULL); @@ -1352,7 +1347,7 @@ panel_place_menu_item_init (PanelPlaceMenuItem *menuitem) char *bookmarks_filename; GError *error; - menuitem->priv = PANEL_PLACE_MENU_ITEM_GET_PRIVATE (menuitem); + menuitem->priv = panel_place_menu_item_get_instance_private (menuitem); if (mate_gsettings_schema_exists (CAJA_DESKTOP_SCHEMA)) { menuitem->priv->caja_desktop_settings = g_settings_new (CAJA_DESKTOP_SCHEMA); @@ -1454,7 +1449,7 @@ panel_place_menu_item_init (PanelPlaceMenuItem *menuitem) static void panel_desktop_menu_item_init (PanelDesktopMenuItem *menuitem) { - menuitem->priv = PANEL_DESKTOP_MENU_ITEM_GET_PRIVATE (menuitem); + menuitem->priv = panel_desktop_menu_item_get_instance_private (menuitem); } static void @@ -1463,8 +1458,6 @@ panel_place_menu_item_class_init (PanelPlaceMenuItemClass *klass) GObjectClass *gobject_class = (GObjectClass *) klass; gobject_class->finalize = panel_place_menu_item_finalize; - - g_type_class_add_private (klass, sizeof (PanelPlaceMenuItemPrivate)); } static void @@ -1473,8 +1466,6 @@ panel_desktop_menu_item_class_init (PanelDesktopMenuItemClass *klass) GObjectClass *gobject_class = (GObjectClass *) klass; gobject_class->finalize = panel_desktop_menu_item_finalize; - - g_type_class_add_private (klass, sizeof (PanelDesktopMenuItemPrivate)); } GtkWidget* panel_place_menu_item_new(gboolean use_image) |