brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Drop MetaDisplay startup sequence API

Browse Source 
We now have MetaStartupNotification/Sequence in place
This commit is contained in:
Carlos Garnacho 2018-08-22 23:36:42 +02:00 committed by Georges Basile Stavracas Neto
parent ec6a536d36
commit 7635d0631b
2 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/core/display.c
View File

@ -146,7 +146,6 @@ enum
ACTIVE_WORKSPACE_CHANGED, ACTIVE_WORKSPACE_CHANGED,
IN_FULLSCREEN_CHANGED, IN_FULLSCREEN_CHANGED,
SHOWING_DESKTOP_CHANGED, SHOWING_DESKTOP_CHANGED,
STARTUP_SEQUENCE_CHANGED,
RESTACKED, RESTACKED,
WORKAREAS_CHANGED, WORKAREAS_CHANGED,
LAST_SIGNAL LAST_SIGNAL
@ -464,13 +463,6 @@ meta_display_class_init (MetaDisplayClass *klass)
NULL, NULL, NULL, NULL, NULL, NULL,
G_TYPE_NONE, 0); 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] = display_signals[RESTACKED] =
g_signal_new ("restacked", g_signal_new ("restacked",
G_TYPE_FROM_CLASS (klass), 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 static void
on_ui_scaling_factor_changed (MetaSettings *settings, on_ui_scaling_factor_changed (MetaSettings *settings,
MetaDisplay *display) MetaDisplay *display)
@ -762,8 +719,6 @@ meta_display_open (void)
display->workspace_manager = meta_workspace_manager_new (display); display->workspace_manager = meta_workspace_manager_new (display);
display->startup_notification = meta_startup_notification_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); 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_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 /* Sets the initial_timestamp and initial_workspace properties
* of a window according to information given us by the * of a window according to information given us by the
* startup-notification library. * startup-notification library.

2
src/meta/display.h
View File

@ -173,8 +173,6 @@ void meta_display_get_size (MetaDisplay *display,
void meta_display_set_cursor (MetaDisplay *display, void meta_display_set_cursor (MetaDisplay *display,
MetaCursor cursor); MetaCursor cursor);
GSList *meta_display_get_startup_sequences (MetaDisplay *display);
/** /**
* MetaDisplayDirection: * MetaDisplayDirection:
* @META_DISPLAY_UP: up * @META_DISPLAY_UP: up