change the order of the ||'ed items in the if to avoid using an
2006-01-23 Elijah Newren <newren gmail com> * src/display.c (meta_display_check_threshold_reached): change the order of the ||'ed items in the if to avoid using an uninitialized value * src/prefs.c (meta_prefs_init): fix a couple uninitialized value problems
This commit is contained in:
parent
9abec54da6
commit
405e21a82a
@ -1,3 +1,12 @@
|
|||||||
|
2006-01-23 Elijah Newren <newren gmail com>
|
||||||
|
|
||||||
|
* src/display.c (meta_display_check_threshold_reached): change the
|
||||||
|
order of the ||'ed items in the if to avoid using an uninitialized
|
||||||
|
value
|
||||||
|
|
||||||
|
* src/prefs.c (meta_prefs_init): fix a couple uninitialized value
|
||||||
|
problems
|
||||||
|
|
||||||
2006-01-21 Elijah Newren <newren gmail com>
|
2006-01-21 Elijah Newren <newren gmail com>
|
||||||
|
|
||||||
Patch from Christian Kirbach to prevent a critical warning crasher
|
Patch from Christian Kirbach to prevent a critical warning crasher
|
||||||
|
@ -3616,8 +3616,8 @@ meta_display_check_threshold_reached (MetaDisplay *display,
|
|||||||
int y)
|
int y)
|
||||||
{
|
{
|
||||||
/* Don't bother doing the check again if we've already reached the threshold */
|
/* Don't bother doing the check again if we've already reached the threshold */
|
||||||
if (display->grab_threshold_movement_reached ||
|
if (meta_prefs_get_raise_on_click () ||
|
||||||
meta_prefs_get_raise_on_click ())
|
display->grab_threshold_movement_reached)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (ABS (display->grab_initial_x - x) >= 8 ||
|
if (ABS (display->grab_initial_x - x) >= 8 ||
|
||||||
|
@ -435,8 +435,11 @@ meta_prefs_init (void)
|
|||||||
update_button_layout (str_val);
|
update_button_layout (str_val);
|
||||||
g_free (str_val);
|
g_free (str_val);
|
||||||
|
|
||||||
if (get_bool (KEY_VISUAL_BELL, &bool_val) ||
|
bool_val = provide_visual_bell;
|
||||||
get_bool (KEY_AUDIBLE_BELL, &bool_val_2))
|
bool_val_2 = bell_is_audible;
|
||||||
|
gboolean update_visual = get_bool (KEY_VISUAL_BELL, &bool_val);
|
||||||
|
gboolean update_audible = get_bool (KEY_AUDIBLE_BELL, &bool_val_2);
|
||||||
|
if (update_visual || update_audible)
|
||||||
update_visual_bell (bool_val, bool_val_2);
|
update_visual_bell (bool_val, bool_val_2);
|
||||||
|
|
||||||
str_val = gconf_client_get_string (default_client, KEY_VISUAL_BELL_TYPE,
|
str_val = gconf_client_get_string (default_client, KEY_VISUAL_BELL_TYPE,
|
||||||
|
Loading…
Reference in New Issue
Block a user