diff options
| author | Pablo Barciela <[email protected]> | 2019-09-04 01:25:50 +0200 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2019-10-02 06:48:58 -0400 |
| commit | 7ceb9c9ab46ba65b488e501b248678652c56dc2e (patch) | |
| tree | 1b60a5b940f5b94a140052e2663217897bd368d3 | |
| parent | 26da2557c9533adad570051e26ced830a231ecfa (diff) | |
| download | mate-screensaver-7ceb9c9ab46ba65b488e501b248678652c56dc2e.tar.bz2 mate-screensaver-7ceb9c9ab46ba65b488e501b248678652c56dc2e.tar.xz | |
gs-window-x11: avoid 'g_type_class_add_private'
| -rw-r--r-- | src/gs-window-x11.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c index 4c4224d..723c162 100644 --- a/src/gs-window-x11.c +++ b/src/gs-window-x11.c @@ -58,8 +58,6 @@ enum #define MAX_QUEUED_EVENTS 16 #define INFO_BAR_SECONDS 30 -#define GS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_WINDOW, GSWindowPrivate)) - struct GSWindowPrivate { GdkMonitor *monitor; @@ -142,7 +140,7 @@ enum static guint signals [LAST_SIGNAL] = { 0, }; -G_DEFINE_TYPE (GSWindow, gs_window, GTK_TYPE_WINDOW) +G_DEFINE_TYPE_WITH_PRIVATE (GSWindow, gs_window, GTK_TYPE_WINDOW) static void set_invisible_cursor (GdkWindow *window, @@ -2335,8 +2333,6 @@ gs_window_class_init (GSWindowClass *klass) widget_class->grab_broken_event = gs_window_real_grab_broken; widget_class->visibility_notify_event = gs_window_real_visibility_notify_event; - g_type_class_add_private (klass, sizeof (GSWindowPrivate)); - signals [ACTIVITY] = g_signal_new ("activity", G_TYPE_FROM_CLASS (object_class), @@ -2454,7 +2450,7 @@ on_drawing_area_draw (GtkWidget *widget, static void gs_window_init (GSWindow *window) { - window->priv = GS_WINDOW_GET_PRIVATE (window); + window->priv = gs_window_get_instance_private (window); window->priv->geometry.x = -1; window->priv->geometry.y = -1; |