← Back to branch summary

~ubuntu-branches/ubuntu/wily/mutter/wily

« back to all changes in this revision

Viewing changes to src/core/bell.c

  • Committer: Bazaar Package Importer
  • Author(s): Rico Tzschichholz
  • Date: 2011-04-10 22:27:59 UTC
  • mfrom: (0.7.1 upstream) (0.3.20 experimental)
  • Revision ID: james.westby@ubuntu.com-20110410222759-o6n1i5p0unsti44n
Tags: 3.0.0-0ubuntu1
https://launchpad.net/bugs/742458
* New upstream release

* Merge with debian experimental (LP: #742458), remaining changes:
  + debian/patches/03_link_gles2.patch: Link to clutter-glx-1.0
    explicitily at the end of link flags, to bring in libGLESv2 on armel.
* debian/control.in:
  + rename gir package to gir1.2-mutter-3.0
* debian/libmutter0.symbols:
  + updated
* debian/patches:
  + fix 03_link_gles2.patch 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/bell.c
51
51
#include <config.h>
52
52
#include "bell.h"
53
53
#include "screen-private.h"
54
 
#include "prefs.h"
 
54
#include <meta/prefs.h>
55
55
#ifdef HAVE_LIBCANBERRA
56
56
#include <canberra-gtk.h>
57
57
#endif
149
149
#ifdef HAVE_XKB
150
150
static void
151
151
bell_flash_fullscreen (MetaDisplay *display, 
152
 
                            XkbAnyEvent *xkb_ev)
 
152
                       XkbAnyEvent *xkb_ev)
153
153
{
154
154
  XkbBellNotifyEvent *xkb_bell_ev = (XkbBellNotifyEvent *) xkb_ev;
155
155
  MetaScreen *screen;
159
159
    {
160
160
      screen = meta_display_screen_for_xwindow (display, xkb_bell_ev->window);
161
161
      if (screen)
162
 
        bell_flash_screen (display, screen);
 
162
        {
 
163
          if (display->compositor)
 
164
            meta_compositor_flash_screen (display->compositor, screen);
 
165
          else
 
166
            bell_flash_screen (display, screen);
 
167
        }
163
168
    }
164
169
  else 
165
170
    {
167
172
      while (screen_list) 
168
173
        {
169
174
          screen = (MetaScreen *) screen_list->data;
170
 
          bell_flash_screen (display, screen);
 
175
          if (display->compositor)
 
176
            meta_compositor_flash_screen (display->compositor, screen);
 
177
          else
 
178
            bell_flash_screen (display, screen);
171
179
          screen_list = screen_list->next;
172
180
        }
173
181
    }