Ticket #39766: patch_quartz-src-yelp-application.c.diff

File patch_quartz-src-yelp-application.c.diff, 1.2 KB (added by c.herbig@…, 11 years ago)
  • src/yelp-application.c

    old new  
    3030#include <gio/gsettingsbackend.h>
    3131#include <glib/gi18n.h>
    3232#include <gtk/gtk.h>
    33 #include <gdk/gdkx.h>
    3433
    3534#include "yelp-settings.h"
    3635#include "yelp-view.h"
     
    539538    yelp_window_load_uri (window, uri);
    540539
    541540    gtk_widget_show_all (GTK_WIDGET (window));
    542 
    543     /* Metacity no longer does anything useful with gtk_window_present */
    544     gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
    545     if (gdk_window)
    546         gdk_x11_window_move_to_current_desktop (gdk_window);
    547 
    548     /* Ensure we actually present the window when invoked from the command
    549      * line. This is somewhat evil, but the minor evil of Yelp stealing
    550      * focus (after you requested it) is outweighed for me by the major
    551      * evil of no help window appearing when you click Help.
    552      */
    553     if (data->timestamp == 0)
    554         data->timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window)));
    555 
    556     gtk_window_present_with_time (GTK_WINDOW (window), data->timestamp);
     541    gtk_window_present (GTK_WIDGET (window));
    557542
    558543    g_free (data);
    559544}