mirror of
https://github.com/brl/mutter.git
synced 2024-11-21 15:40:41 -05:00
Patch from Jens Granseuer to fix more build issues with gcc 2.95. #327050.
2006-01-15 Elijah Newren <newren@gmail.com> Patch from Jens Granseuer to fix more build issues with gcc 2.95. #327050. * src/boxes.c (meta_rectangle_edge_cmp_ignore_type): * src/window.c (meta_window_show): Remove C99 style variable initiailization
This commit is contained in:
parent
50bcc976bc
commit
ef792fc1f7
@ -1,3 +1,12 @@
|
||||
2006-01-15 Elijah Newren <newren@gmail.com>
|
||||
|
||||
Patch from Jens Granseuer to fix more build issues with gcc 2.95.
|
||||
#327050.
|
||||
|
||||
* src/boxes.c (meta_rectangle_edge_cmp_ignore_type):
|
||||
* src/window.c (meta_window_show):
|
||||
Remove C99 style variable initiailization
|
||||
|
||||
2006-01-14 Elijah Newren <newren gmail com>
|
||||
|
||||
* src/window.c (__window_is_terminal): Don't dereference a NULL
|
||||
|
@ -1226,6 +1226,7 @@ meta_rectangle_edge_cmp_ignore_type (gconstpointer a, gconstpointer b)
|
||||
{
|
||||
const MetaEdge *a_edge_rect = (gconstpointer) a;
|
||||
const MetaEdge *b_edge_rect = (gconstpointer) b;
|
||||
int a_compare, b_compare;
|
||||
|
||||
/* Edges must be both vertical or both horizontal, or it doesn't make
|
||||
* sense to compare them.
|
||||
@ -1233,8 +1234,6 @@ meta_rectangle_edge_cmp_ignore_type (gconstpointer a, gconstpointer b)
|
||||
g_assert ((a_edge_rect->rect.width == 0 && b_edge_rect->rect.width == 0) ||
|
||||
(a_edge_rect->rect.height == 0 && b_edge_rect->rect.height == 0));
|
||||
|
||||
int a_compare, b_compare;
|
||||
|
||||
a_compare = b_compare = 0; /* gcc-3.4.2 sucks at figuring initialized'ness */
|
||||
|
||||
if (a_edge_rect->side_type == META_DIRECTION_LEFT ||
|
||||
|
@ -1980,8 +1980,9 @@ meta_window_show (MetaWindow *window)
|
||||
*/
|
||||
if (!place_on_top_on_map && needs_stacking_adjustment)
|
||||
{
|
||||
gboolean overlap;
|
||||
g_assert (focus_window != NULL);
|
||||
gboolean overlap = windows_overlap (window, focus_window);
|
||||
overlap = windows_overlap (window, focus_window);
|
||||
|
||||
/* We want alt tab to go to the denied-focus window */
|
||||
ensure_mru_position_after (window, focus_window);
|
||||
|
Loading…
Reference in New Issue
Block a user