File mutter-gcc45.patch of Package mutter
From 11061a23b1a7dc85784749d9059b0f9e99807c5a Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Wed, 31 Mar 2010 20:34:02 +0000
Subject: Fix build with gcc 4.5
Based on patch by Dominique Leuenberger
<dominique-gnomezilla@leuenberger.net>
https://bugzilla.gnome.org/show_bug.cgi?id=606719
---
Index: mutter-2.29.1_0.2/src/core/core.c
===================================================================
--- mutter-2.29.1_0.2.orig/src/core/core.c
+++ mutter-2.29.1_0.2/src/core/core.c
@@ -526,6 +526,9 @@ meta_core_get_menu_accelerator (MetaMenu
switch (menu_op)
{
+ case META_MENU_OP_NONE:
+ name = "none";
+ break;
case META_MENU_OP_DELETE:
name = "close";
break;
Index: mutter-2.29.1_0.2/src/core/window.c
===================================================================
--- mutter-2.29.1_0.2.orig/src/core/window.c
+++ mutter-2.29.1_0.2/src/core/window.c
@@ -7119,9 +7119,12 @@ menu_callback (MetaWindowMenu *menu,
{
meta_verbose ("Menu op %u on %s\n", op, window->desc);
- /* op can be 0 for none */
switch (op)
{
+ case META_MENU_OP_NONE:
+ /* nothing */
+ break;
+
case META_MENU_OP_DELETE:
meta_window_delete (window, timestamp);
break;
@@ -7209,10 +7212,6 @@ menu_callback (MetaWindowMenu *menu,
meta_window_shove_titlebar_onscreen (window);
break;
- case 0:
- /* nothing */
- break;
-
default:
meta_warning (G_STRLOC": Unknown window op\n");
break;
@@ -7265,8 +7264,8 @@ meta_window_show_menu (MetaWindow *windo
window->display->window_with_menu = NULL;
}
- ops = 0;
- insensitive = 0;
+ ops = META_MENU_OP_NONE;
+ insensitive = META_MENU_OP_NONE;
ops |= (META_MENU_OP_DELETE | META_MENU_OP_MINIMIZE | META_MENU_OP_MOVE | META_MENU_OP_RESIZE);
Index: mutter-2.29.1_0.2/src/include/common.h
===================================================================
--- mutter-2.29.1_0.2.orig/src/include/common.h
+++ mutter-2.29.1_0.2/src/include/common.h
@@ -52,6 +52,7 @@ typedef enum
typedef enum
{
+ META_MENU_OP_NONE = 0,
META_MENU_OP_DELETE = 1 << 0,
META_MENU_OP_MINIMIZE = 1 << 1,
META_MENU_OP_UNMAXIMIZE = 1 << 2,