← Back to branch summary

~ubuntu-branches/ubuntu/precise/vte/precise

« back to all changes in this revision

Viewing changes to src/vtebg.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2010-12-13 17:00:11 UTC
  • mfrom: (1.1.59 upstream)
  • Revision ID: james.westby@ubuntu.com-20101213170011-lp89kb01cvvzlpzq
Tags: 1:0.27.2-0ubuntu1
* fix_gtk3_api_changes.patch:
  - Fix GTK3 API breakage
* debian/control:
  - Drop libvte-bin package, after consulting with Debian
* debian/rules:
  - Use separate libexecdir to put binaries in separate folder
    for the gtk3 version of the library

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/vtebg.c
24
24
#include "debug.h"
25
25
#include "marshal.h"
26
26
#include "vtebg.h"
 
27
#include "vte-gtk-compat.h"
27
28
 
28
29
#ifdef GDK_WINDOWING_X11
29
30
#include <gdk/gdkx.h>
128
129
        g_free(pixmaps);
129
130
 out:
130
131
        _vte_bg_display_sync(bg);
131
 
        gdk_error_trap_pop();
 
132
        gdk_error_trap_pop_ignored ();
132
133
 
133
134
        return surface;
134
135
}
239
240
 
240
241
                window = gdk_screen_get_root_window(screen);
241
242
                pvt->native.window = window;
 
243
#if GTK_CHECK_VERSION (2, 91, 6)
 
244
                pvt->native.native_window = gdk_x11_window_get_xid(window);
 
245
#else
242
246
                pvt->native.native_window = gdk_x11_drawable_get_xid(window);
 
247
#endif
 
248
#if GTK_CHECK_VERSION (2, 90, 8)
 
249
                pvt->native.display = gdk_window_get_display(window);
 
250
#else
243
251
                pvt->native.display = gdk_drawable_get_display(GDK_DRAWABLE(window));
 
252
#endif
244
253
                pvt->native.native_atom = gdk_x11_get_xatom_by_name_for_display(pvt->native.display, "_XROOTPMAP_ID");
245
254
                pvt->native.atom = gdk_x11_xatom_to_atom_for_display(pvt->native.display, pvt->native.native_atom);
246
255
                pvt->root_surface = vte_bg_root_surface(bg);