← Back to branch summary

~ubuntu-branches/ubuntu/precise/libcanberra/precise

« back to all changes in this revision

Viewing changes to src/canberra-gtk-module.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2011-10-17 12:49:05 UTC
  • Revision ID: package-import@ubuntu.com-20111017124905-yhrfb9tsjooqm0hf
Tags: 0.28-0ubuntu11
https://launchpad.net/bugs/840858
* Use 3.0 (quilt)
* debian/rules: Move autoreconf before debhelper
* debian/patches/02_nodisplay_autostart.patch:
  - Dropped, we shouldn't hide turning the login sound on or off
    from users (LP: #840858)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/canberra-gtk-module.c
370
370
 
371
371
        xembed = gdk_x11_get_xatom_by_name_for_display(d, "_XEMBED_INFO");
372
372
 
 
373
        /* be robust against not existing XIDs (LP: #834403) */
 
374
        gdk_error_trap_push();
373
375
        if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
374
376
                               xembed,
375
377
                               0, 2, False, xembed, &type_return,
378
380
                return FALSE;
379
381
        }
380
382
 
 
383
 
 
384
#if GTK_CHECK_VERSION(3,0,0)
 
385
        gdk_error_trap_pop_ignored();
 
386
#else
 
387
        gdk_error_trap_pop();
 
388
#endif
 
389
 
381
390
        if (type_return == xembed && format_return == 32 && data)
382
391
                ret = TRUE;
383
392