I would think the better solution would be to not use Xkb to intercept the
bells when a sound theme is not in use. (I also think it looks very
strange for this patch to comment out some lines with C++-style // and
others with C-style /* */ - why not just #if 0 / #endif around the whole
block?)
-alan-
Jerry Tan wrote:
> I don't want to upstream this patch.
>
> because the reporter hope system bell work like before,
>
> but in metacity's code, it only beep when call libcanberry API failed.
>
>
>> Are you going to submit this upstream?
>> You flagged it as "branding", but I don't believe it qualifies.
>>
>> Laca
>>
>> On Wed, 2009-12-23 at 18:22 +0800, Jerry Tan wrote:
>>
>>> reporter request that no matter what sound theme is set,
>>>
>>> they still expect system bell work like before.
>>>
>>>
>>> plain text document attachment (metacity-09-force-system-bell.diff)
>>> --- metacity-2.28.0/src/core/bell.c 2009-09-09 04:55:35.000000000
>>> +0800
>>> +++ /backup/jtan/bell.c 2009-12-23 17:18:47.623372430 +0800
>>> @@ -310,15 +310,20 @@
>>>
>>> ca_proplist_destroy (p);
>>>
>>> - if (res != CA_SUCCESS&& res != CA_ERROR_DISABLED)
>>> - {
>>> + XkbForceBell(display->xdisplay, xkb_bell_event->percent);
>>> +
>>> +
>>> + //if (res != CA_SUCCESS&& res != CA_ERROR_DISABLED)
>>> + //{
>>> /* ...and in case that failed we use the classic X11
>>> bell. */
>>> + /*
>>> XkbForceDeviceBell (display->xdisplay,
>>> xkb_bell_event->device,
>>> xkb_bell_event->bell_class,
>>> xkb_bell_event->bell_id,
>>> xkb_bell_event->percent);
>>> - }
>>> + */
>>> + //}
>>> }
>>> }
>>> #endif /* HAVE_XKB */
>>>
>>
>>
>
--
-Alan Coopersmith- alan.coopersmith at sun.com
Sun Microsystems, Inc. - X Window System Engineering
