← Back to branch summary

~muktupavels/metacity/adwaita-icon-theme-lp-1414613

« back to all changes in this revision

Viewing changes to src/core/bell.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-08-23 11:12:43 UTC
  • mfrom: (1.3.3)
  • mto: (2.5.2 sid) (1.4.2)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: package-import@ubuntu.com-20120823111243-0hjp8cv5xn2jr6jc
Import upstream version 2.34.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/bell.c
131
131
      XFreeGC (display->xdisplay, gc);
132
132
    }
133
133
 
134
 
  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK &&
 
134
  if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK &&
135
135
      !display->mouse_mode)
136
136
    meta_display_increment_focus_sentinel (display);
137
137
  XFlush (display->xdisplay);
265
265
{
266
266
  switch (meta_prefs_get_visual_bell_type ()) 
267
267
    {
268
 
    case META_VISUAL_BELL_FULLSCREEN_FLASH:
 
268
    case G_DESKTOP_VISUAL_BELL_FULLSCREEN_FLASH:
269
269
      bell_flash_fullscreen (display, xkb_ev);
270
270
      break;
271
 
    case META_VISUAL_BELL_FRAME_FLASH:
 
271
    case G_DESKTOP_VISUAL_BELL_FRAME_FLASH:
272
272
      bell_flash_frame (display, xkb_ev); /* does nothing yet */
273
273
      break;
274
 
    case META_VISUAL_BELL_INVALID:
275
 
      /* do nothing */
276
 
      break;
277
274
    }
278
275
}
279
276
 
282
279
                  XkbAnyEvent *xkb_ev)
283
280
{
284
281
  /* flash something */
285
 
  if (meta_prefs_get_visual_bell ()) 
 
282
  if (meta_prefs_get_visual_bell ())
286
283
    bell_visual_notify (display, xkb_ev);
287
284
 
288
285
  if (meta_prefs_bell_is_audible ())