AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk: Stop using gdk_notify_startup_complete_with_id

Browse Source 
This function is about to go away. Instead, use the
display-specific function that this is a wrapper of.
This commit is contained in:
Matthias Clasen 2017-11-16 22:45:04 -05:00
parent 419a9af28c
commit dca8c8e189
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkwindow.c
View File

@ -2654,15 +2654,13 @@ gtk_window_set_startup_id (GtkWindow *window,
*/
if (startup_id_is_fake (priv->startup_id))
gtk_window_present_with_time (window, timestamp);
else
else
{
gdk_window_set_startup_id (gdk_window,
priv->startup_id);
gdk_window_set_startup_id (gdk_window, priv->startup_id);
/* If window is mapped, terminate the startup-notification too */
if (_gtk_widget_get_mapped (widget) &&
!disable_startup_notification)
gdk_notify_startup_complete_with_id (priv->startup_id);
if (_gtk_widget_get_mapped (widget) && !disable_startup_notification)
gdk_display_notify_startup_complete (gtk_widget_get_display (widget), priv->startup_id);
}
}
@ -6182,15 +6180,13 @@ gtk_window_map (GtkWidget *widget)
{
/* Make sure we have a "real" id */
if (!startup_id_is_fake (priv->startup_id))
gdk_notify_startup_complete_with_id (priv->startup_id);
gdk_display_notify_startup_complete (gtk_widget_get_display (widget), priv->startup_id);
g_free (priv->startup_id);
priv->startup_id = NULL;
}
else
{
gdk_notify_startup_complete ();
}
else
gdk_display_notify_startup_complete (gtk_widget_get_display (widget), NULL);
}
/* if mnemonics visible is not already set