Ticket #40116: patch_quartz-src-yelp-application.c.2.diff

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

replaces <gdk/gdkx.h> with <gdk/gdk.h>, removes metacity-specific kludge

  • src/

    old new  
    3030#include <gio/gsettingsbackend.h>
    3131#include <glib/gi18n.h>
    3232#include <gtk/gtk.h>
    33 #include <gdk/gdkx.h>
     33#include <gdk/gdk.h>
    3434#include <stdlib.h>
    3535
    3636#include "yelp-bookmarks.h"
     
    466466    yelp_window_load_uri (window, uri);
    467467
    468468    gtk_widget_show_all (GTK_WIDGET (window));
    469 
    470     /* Metacity no longer does anything useful with gtk_window_present */
    471     gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
    472     if (gdk_window)
    473         gdk_x11_window_move_to_current_desktop (gdk_window);
    474 
    475     /* Ensure we actually present the window when invoked from the command
    476      * line. This is somewhat evil, but the minor evil of Yelp stealing
    477      * focus (after you requested it) is outweighed for me by the major
    478      * evil of no help window appearing when you click Help.
    479      */
    480     if (data->timestamp == 0)
    481         data->timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window)));
    482 
    483     gtk_window_present_with_time (GTK_WINDOW (window), data->timestamp);
     469    gtk_window_present (GTK_WIDGET (window));
    484470
    485471    g_object_unref (uri);
    486472    g_free (data);