Ticket #40493: patch-src-yelp-application.c.diff

src/

@@ -30 +30 @@
 #include <gio/gsettingsbackend.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
 #include <stdlib.h>
 
 #include "yelp-bookmarks.h"
@@ -466 +466 @@
     yelp_window_load_uri (window, uri);
 
     gtk_widget_show_all (GTK_WIDGET (window));
-
-    /* Metacity no longer does anything useful with gtk_window_present */
-    gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
-    if (gdk_window)
-        gdk_x11_window_move_to_current_desktop (gdk_window);
-
-    /* Ensure we actually present the window when invoked from the command
-     * line. This is somewhat evil, but the minor evil of Yelp stealing
-     * focus (after you requested it) is outweighed for me by the major
-     * evil of no help window appearing when you click Help.
-     */
-    if (data->timestamp == 0)
-        data->timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window)));
-
-    gtk_window_present_with_time (GTK_WINDOW (window), data->timestamp);
+    gtk_window_present_with_time (GTK_WIDGET (window), GDK_CURRENT_TIME);
 
     g_object_unref (uri);
     g_free (data);