[mutter/wip/carlosg/startup-sequences: 63/66] core: Drop MetaDisplay startup sequence API



commit 16fa09378c94053d236b47d3cd50016c9bfa149f
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Aug 22 23:36:42 2018 +0200

    core: Drop MetaDisplay startup sequence API
    
    We now have MetaStartupNotification/Sequence in place

 src/core/display.c | 57 ------------------------------------------------------
 src/meta/display.h |  2 --
 2 files changed, 59 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index c1aaa4eef..d4c96c03a 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -146,7 +146,6 @@ enum
   ACTIVE_WORKSPACE_CHANGED,
   IN_FULLSCREEN_CHANGED,
   SHOWING_DESKTOP_CHANGED,
-  STARTUP_SEQUENCE_CHANGED,
   RESTACKED,
   WORKAREAS_CHANGED,
   LAST_SIGNAL
@@ -464,13 +463,6 @@ meta_display_class_init (MetaDisplayClass *klass)
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
-  display_signals[STARTUP_SEQUENCE_CHANGED] =
-    g_signal_new ("startup-sequence-changed",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, G_TYPE_POINTER);
-
   display_signals[RESTACKED] =
     g_signal_new ("restacked",
                   G_TYPE_FROM_CLASS (klass),
@@ -628,41 +620,6 @@ gesture_tracker_state_changed (MetaGestureTracker   *tracker,
     }
 }
 
-static void
-on_startup_notification_changed (MetaStartupNotification *sn,
-                                 gpointer                 sequence,
-                                 MetaDisplay             *display)
-{
-  GSList *sequences, *l;
-  SnStartupSequence *seq;
-
-  g_slist_free (display->startup_sequences);
-  display->startup_sequences = NULL;
-
-  sequences =
-    meta_startup_notification_get_sequences (display->startup_notification);
-
-  for (l = sequences; l; l = l->next)
-    {
-      if (!META_IS_STARTUP_SEQUENCE_X11 (l->data))
-        continue;
-
-      g_object_get (G_OBJECT (l->data),
-                    "seq", &seq,
-                    NULL);
-      display->startup_sequences = g_slist_prepend (display->startup_sequences,
-                                                    seq);
-    }
-
-  if (META_IS_STARTUP_SEQUENCE_X11 (sequence))
-    {
-      g_object_get (G_OBJECT (sequence),
-                    "seq", &seq,
-                    NULL);
-      g_signal_emit_by_name (display, "startup-sequence-changed", seq);
-    }
-}
-
 static void
 on_ui_scaling_factor_changed (MetaSettings *settings,
                               MetaDisplay  *display)
@@ -762,8 +719,6 @@ meta_display_open (void)
   display->workspace_manager = meta_workspace_manager_new (display);
 
   display->startup_notification = meta_startup_notification_new (display);
-  g_signal_connect (display->startup_notification, "changed",
-                    G_CALLBACK (on_startup_notification_changed), display);
 
   display->bell = meta_bell_new (display);
 
@@ -3127,18 +3082,6 @@ meta_display_hide_tile_preview (MetaDisplay *display)
   meta_compositor_hide_tile_preview (display->compositor);
 }
 
-/**
- * meta_display_get_startup_sequences: (skip)
- * @display:
- *
- * Return value: (transfer none): Currently active #SnStartupSequence items
- */
-GSList *
-meta_display_get_startup_sequences (MetaDisplay *display)
-{
-  return display->startup_sequences;
-}
-
 /* Sets the initial_timestamp and initial_workspace properties
  * of a window according to information given us by the
  * startup-notification library.
diff --git a/src/meta/display.h b/src/meta/display.h
index d8e460499..0045fb726 100644
--- a/src/meta/display.h
+++ b/src/meta/display.h
@@ -173,8 +173,6 @@ void meta_display_get_size (MetaDisplay *display,
 void meta_display_set_cursor (MetaDisplay *display,
                               MetaCursor   cursor);
 
-GSList *meta_display_get_startup_sequences (MetaDisplay *display);
-
 /**
  * MetaDisplayDirection:
  * @META_DISPLAY_UP: up


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]