summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/ui/theme-viewer-window.ui2
-rw-r--r--libmetacity/meta-button-layout.c3
-rw-r--r--libmetacity/meta-button-private.h1
-rw-r--r--libmetacity/meta-button.h1
-rw-r--r--libmetacity/meta-frame-enums.h35
-rw-r--r--libmetacity/meta-frame-style.c2
-rw-r--r--libmetacity/meta-theme-gtk.c5
-rw-r--r--libmetacity/meta-theme-impl.c6
-rw-r--r--libmetacity/meta-theme-metacity.c12
-rw-r--r--libmetacity/meta-theme.c2
-rw-r--r--src/core/display.c8
-rw-r--r--src/core/keybindings.c2
-rw-r--r--src/core/window.c3
-rw-r--r--src/include/common.h1
-rw-r--r--src/ui/frames.c26
-rw-r--r--src/ui/frames.h1
-rw-r--r--theme-viewer/theme-viewer-window.c2
17 files changed, 21 insertions, 91 deletions
diff --git a/data/ui/theme-viewer-window.ui b/data/ui/theme-viewer-window.ui
index 866d938f..f4a9995e 100644
--- a/data/ui/theme-viewer-window.ui
+++ b/data/ui/theme-viewer-window.ui
@@ -330,7 +330,7 @@
<object class="GtkEntry" id="button_layout_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="text">appmenu:minimize,maximize,close</property>
+ <property name="text">:minimize,maximize,close</property>
<signal name="changed" handler="button_layout_entry_changed_cb" swapped="no"/>
</object>
<packing>
diff --git a/libmetacity/meta-button-layout.c b/libmetacity/meta-button-layout.c
index 01a6045f..6aded451 100644
--- a/libmetacity/meta-button-layout.c
+++ b/libmetacity/meta-button-layout.c
@@ -25,8 +25,6 @@ type_from_string (const gchar *str)
{
if (g_strcmp0 (str, "menu") == 0)
return META_BUTTON_TYPE_MENU;
- else if (g_strcmp0 (str, "appmenu") == 0)
- return META_BUTTON_TYPE_APPMENU;
else if (g_strcmp0 (str, "minimize") == 0)
return META_BUTTON_TYPE_MINIMIZE;
else if (g_strcmp0 (str, "maximize") == 0)
@@ -72,7 +70,6 @@ get_opposite_type (MetaButtonType type)
return META_BUTTON_TYPE_STICK;
case META_BUTTON_TYPE_MENU:
- case META_BUTTON_TYPE_APPMENU:
case META_BUTTON_TYPE_MINIMIZE:
case META_BUTTON_TYPE_MAXIMIZE:
case META_BUTTON_TYPE_CLOSE:
diff --git a/libmetacity/meta-button-private.h b/libmetacity/meta-button-private.h
index f849e086..2d95492e 100644
--- a/libmetacity/meta-button-private.h
+++ b/libmetacity/meta-button-private.h
@@ -37,7 +37,6 @@ typedef enum
META_BUTTON_FUNCTION_MAXIMIZE,
META_BUTTON_FUNCTION_MINIMIZE,
META_BUTTON_FUNCTION_MENU,
- META_BUTTON_FUNCTION_APPMENU,
META_BUTTON_FUNCTION_SHADE,
META_BUTTON_FUNCTION_ABOVE,
META_BUTTON_FUNCTION_STICK,
diff --git a/libmetacity/meta-button.h b/libmetacity/meta-button.h
index 9edf2753..c591719c 100644
--- a/libmetacity/meta-button.h
+++ b/libmetacity/meta-button.h
@@ -26,7 +26,6 @@ G_BEGIN_DECLS
typedef enum
{
META_BUTTON_TYPE_MENU,
- META_BUTTON_TYPE_APPMENU,
META_BUTTON_TYPE_MINIMIZE,
META_BUTTON_TYPE_MAXIMIZE,
META_BUTTON_TYPE_CLOSE,
diff --git a/libmetacity/meta-frame-enums.h b/libmetacity/meta-frame-enums.h
index 97f759ba..f1b5ea01 100644
--- a/libmetacity/meta-frame-enums.h
+++ b/libmetacity/meta-frame-enums.h
@@ -24,24 +24,23 @@ G_BEGIN_DECLS
typedef enum
{
- META_FRAME_ALLOWS_DELETE = 1 << 0,
- META_FRAME_ALLOWS_MENU = 1 << 1,
- META_FRAME_ALLOWS_APPMENU = 1 << 2,
- META_FRAME_ALLOWS_MINIMIZE = 1 << 3,
- META_FRAME_ALLOWS_MAXIMIZE = 1 << 4,
- META_FRAME_ALLOWS_VERTICAL_RESIZE = 1 << 5,
- META_FRAME_ALLOWS_HORIZONTAL_RESIZE = 1 << 6,
- META_FRAME_HAS_FOCUS = 1 << 7,
- META_FRAME_SHADED = 1 << 8,
- META_FRAME_STUCK = 1 << 9,
- META_FRAME_MAXIMIZED = 1 << 10,
- META_FRAME_ALLOWS_SHADE = 1 << 11,
- META_FRAME_ALLOWS_MOVE = 1 << 12,
- META_FRAME_FULLSCREEN = 1 << 13,
- META_FRAME_IS_FLASHING = 1 << 14,
- META_FRAME_ABOVE = 1 << 15,
- META_FRAME_TILED_LEFT = 1 << 16,
- META_FRAME_TILED_RIGHT = 1 << 17
+ META_FRAME_ALLOWS_DELETE = 1 << 0,
+ META_FRAME_ALLOWS_MENU = 1 << 1,
+ META_FRAME_ALLOWS_MINIMIZE = 1 << 2,
+ META_FRAME_ALLOWS_MAXIMIZE = 1 << 3,
+ META_FRAME_ALLOWS_VERTICAL_RESIZE = 1 << 4,
+ META_FRAME_ALLOWS_HORIZONTAL_RESIZE = 1 << 5,
+ META_FRAME_HAS_FOCUS = 1 << 6,
+ META_FRAME_SHADED = 1 << 7,
+ META_FRAME_STUCK = 1 << 8,
+ META_FRAME_MAXIMIZED = 1 << 9,
+ META_FRAME_ALLOWS_SHADE = 1 << 10,
+ META_FRAME_ALLOWS_MOVE = 1 << 11,
+ META_FRAME_FULLSCREEN = 1 << 12,
+ META_FRAME_IS_FLASHING = 1 << 13,
+ META_FRAME_ABOVE = 1 << 14,
+ META_FRAME_TILED_LEFT = 1 << 15,
+ META_FRAME_TILED_RIGHT = 1 << 16
} MetaFrameFlags;
typedef enum
diff --git a/libmetacity/meta-frame-style.c b/libmetacity/meta-frame-style.c
index fa49d5c9..ced565be 100644
--- a/libmetacity/meta-frame-style.c
+++ b/libmetacity/meta-frame-style.c
@@ -177,8 +177,6 @@ meta_button_function_to_string (MetaButtonFunction function)
return "unstick";
case META_BUTTON_FUNCTION_MENU:
return "menu";
- case META_BUTTON_FUNCTION_APPMENU:
- return "appmenu";
case META_BUTTON_FUNCTION_LEFT_LEFT_BACKGROUND:
return "left_left_background";
case META_BUTTON_FUNCTION_LEFT_MIDDLE_BACKGROUND:
diff --git a/libmetacity/meta-theme-gtk.c b/libmetacity/meta-theme-gtk.c
index 93723067..4ee117c5 100644
--- a/libmetacity/meta-theme-gtk.c
+++ b/libmetacity/meta-theme-gtk.c
@@ -654,8 +654,6 @@ get_class_from_button_type (MetaButtonType type)
return "maximize";
else if (type == META_BUTTON_TYPE_MINIMIZE)
return "minimize";
- else if (type == META_BUTTON_TYPE_APPMENU)
- return "appmenu";
return NULL;
}
@@ -851,9 +849,6 @@ meta_theme_gtk_draw_frame (MetaThemeImpl *impl,
case META_BUTTON_TYPE_MENU:
icon_name = "open-menu-symbolic";
break;
- case META_BUTTON_TYPE_APPMENU:
- pixbuf = g_object_ref (mini_icon);
- break;
case META_BUTTON_TYPE_SHADE:
case META_BUTTON_TYPE_ABOVE:
case META_BUTTON_TYPE_STICK:
diff --git a/libmetacity/meta-theme-impl.c b/libmetacity/meta-theme-impl.c
index 568844a2..68a98985 100644
--- a/libmetacity/meta-theme-impl.c
+++ b/libmetacity/meta-theme-impl.c
@@ -122,11 +122,6 @@ is_button_visible (MetaButton *button,
visible = TRUE;
break;
- case META_BUTTON_TYPE_APPMENU:
- if (flags & META_FRAME_ALLOWS_APPMENU)
- visible = TRUE;
- break;
-
case META_BUTTON_TYPE_MINIMIZE:
if (flags & META_FRAME_ALLOWS_MINIMIZE)
visible = TRUE;
@@ -223,7 +218,6 @@ strip_buttons (MetaButtonLayout *layout,
types[count++] = META_BUTTON_TYPE_MAXIMIZE;
types[count++] = META_BUTTON_TYPE_CLOSE;
types[count++] = META_BUTTON_TYPE_MENU;
- types[count++] = META_BUTTON_TYPE_APPMENU;
for (i = 0; i < count; i++)
{
diff --git a/libmetacity/meta-theme-metacity.c b/libmetacity/meta-theme-metacity.c
index e91cac47..a9df246d 100644
--- a/libmetacity/meta-theme-metacity.c
+++ b/libmetacity/meta-theme-metacity.c
@@ -42,7 +42,7 @@
* look out for.
*/
#define THEME_MAJOR_VERSION 3
-#define THEME_MINOR_VERSION 5
+#define THEME_MINOR_VERSION 4
#define THEME_VERSION (1000 * THEME_MAJOR_VERSION + THEME_MINOR_VERSION)
/* Translators: This means that an attribute which should have been found
@@ -2897,8 +2897,6 @@ meta_button_function_from_string (MetaThemeMetacity *metacity,
return META_BUTTON_FUNCTION_MINIMIZE;
else if (strcmp ("menu", str) == 0)
return META_BUTTON_FUNCTION_MENU;
- else if (strcmp ("appmenu", str) == 0)
- return META_BUTTON_FUNCTION_APPMENU;
else if (strcmp ("left_left_background", str) == 0)
return META_BUTTON_FUNCTION_LEFT_LEFT_BACKGROUND;
else if (strcmp ("left_middle_background", str) == 0)
@@ -4814,7 +4812,6 @@ is_button_allowed (MetaThemeMetacity *metacity,
return TRUE;
case META_BUTTON_TYPE_MENU:
- case META_BUTTON_TYPE_APPMENU:
case META_BUTTON_TYPE_MINIMIZE:
case META_BUTTON_TYPE_MAXIMIZE:
case META_BUTTON_TYPE_CLOSE:
@@ -4829,7 +4826,6 @@ is_button_allowed (MetaThemeMetacity *metacity,
switch (type)
{
case META_BUTTON_TYPE_MENU:
- case META_BUTTON_TYPE_APPMENU:
case META_BUTTON_TYPE_MINIMIZE:
case META_BUTTON_TYPE_MAXIMIZE:
case META_BUTTON_TYPE_CLOSE:
@@ -5344,9 +5340,6 @@ get_button_function (MetaButtonType type,
case META_BUTTON_TYPE_MENU:
return META_BUTTON_FUNCTION_MENU;
- case META_BUTTON_TYPE_APPMENU:
- return META_BUTTON_FUNCTION_APPMENU;
-
case META_BUTTON_TYPE_MINIMIZE:
return META_BUTTON_FUNCTION_MINIMIZE;
@@ -5821,9 +5814,6 @@ meta_theme_metacity_earliest_version_with_button (MetaButtonFunction function)
case META_BUTTON_FUNCTION_RIGHT_SINGLE_BACKGROUND:
return 3003;
- case META_BUTTON_FUNCTION_APPMENU:
- return 3005;
-
case META_BUTTON_FUNCTION_LAST:
default:
g_warning ("Unknown button %d", (gint) function);
diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c
index 0003e891..28a82329 100644
--- a/libmetacity/meta-theme.c
+++ b/libmetacity/meta-theme.c
@@ -356,7 +356,7 @@ meta_theme_constructed (GObject *object)
meta_theme_impl_set_composited (theme->impl, theme->composited);
meta_theme_impl_set_scale (theme->impl, theme->scale);
- button_layout = "appmenu:minimize,maximize,close";
+ button_layout = ":minimize,maximize,close";
meta_theme_set_button_layout (theme, button_layout, FALSE);
if (theme->type == META_THEME_TYPE_METACITY)
diff --git a/src/core/display.c b/src/core/display.c
index 8264fa43..abf22b60 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1082,7 +1082,6 @@ grab_op_is_mouse_only (MetaGrabOp op)
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -1135,7 +1134,6 @@ meta_grab_op_is_mouse (MetaGrabOp op)
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -1188,7 +1186,6 @@ grab_op_is_keyboard (MetaGrabOp op)
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -1241,7 +1238,6 @@ meta_grab_op_is_resizing (MetaGrabOp op)
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -1294,7 +1290,6 @@ meta_grab_op_is_moving (MetaGrabOp op)
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -3467,7 +3462,6 @@ xcursor_for_op (MetaDisplay *display,
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -3794,7 +3788,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -4828,7 +4821,6 @@ meta_resize_gravity_from_grab_op (MetaGrabOp op)
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 6c6f68da..b46a4c27 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1351,7 +1351,6 @@ meta_display_process_key_event (MetaDisplay *display,
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -1690,7 +1689,6 @@ process_keyboard_resize_grab_op_change (MetaDisplay *display,
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
diff --git a/src/core/window.c b/src/core/window.c
index 01e5df20..fefbbd67 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4853,7 +4853,6 @@ meta_window_move_resize_request (MetaWindow *window,
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -7984,7 +7983,6 @@ meta_window_update_sync_request_counter (MetaWindow *window,
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
@@ -8285,7 +8283,6 @@ meta_window_refresh_resize_popup (MetaWindow *window)
case META_GRAB_OP_CLICKING_UNMAXIMIZE:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_SHADE:
case META_GRAB_OP_CLICKING_UNSHADE:
case META_GRAB_OP_CLICKING_ABOVE:
diff --git a/src/include/common.h b/src/include/common.h
index f0612f0b..3399b2ea 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -117,7 +117,6 @@ typedef enum
META_GRAB_OP_CLICKING_UNMAXIMIZE,
META_GRAB_OP_CLICKING_DELETE,
META_GRAB_OP_CLICKING_MENU,
- META_GRAB_OP_CLICKING_APPMENU,
META_GRAB_OP_CLICKING_SHADE,
META_GRAB_OP_CLICKING_UNSHADE,
META_GRAB_OP_CLICKING_ABOVE,
diff --git a/src/ui/frames.c b/src/ui/frames.c
index dc26a1af..5af197a6 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -166,9 +166,6 @@ get_control (MetaFrames *frames,
case META_BUTTON_TYPE_MENU:
return META_FRAME_CONTROL_MENU;
- case META_BUTTON_TYPE_APPMENU:
- return META_FRAME_CONTROL_APPMENU;
-
case META_BUTTON_TYPE_MAXIMIZE:
if (flags & META_FRAME_MAXIMIZED)
return META_FRAME_CONTROL_UNMAXIMIZE;
@@ -309,10 +306,6 @@ get_control_rect (MetaFrames *frames,
type = META_BUTTON_TYPE_MENU;
break;
- case META_FRAME_CONTROL_APPMENU:
- type = META_BUTTON_TYPE_APPMENU;
- break;
-
case META_FRAME_CONTROL_MINIMIZE:
type = META_BUTTON_TYPE_MINIMIZE;
break;
@@ -1306,9 +1299,6 @@ show_tip_now (MetaFrames *frames)
case META_FRAME_CONTROL_MENU:
tiptext = _("Window Menu");
break;
- case META_FRAME_CONTROL_APPMENU:
- tiptext = _("Window App Menu");
- break;
case META_FRAME_CONTROL_MINIMIZE:
tiptext = _("Minimize Window");
break;
@@ -1494,7 +1484,6 @@ update_prelit_control (MetaFrames *frames,
case META_FRAME_CONTROL_TITLE:
case META_FRAME_CONTROL_DELETE:
case META_FRAME_CONTROL_MENU:
- case META_FRAME_CONTROL_APPMENU:
case META_FRAME_CONTROL_MINIMIZE:
case META_FRAME_CONTROL_MAXIMIZE:
case META_FRAME_CONTROL_UNMAXIMIZE:
@@ -1515,7 +1504,6 @@ update_prelit_control (MetaFrames *frames,
switch (control)
{
case META_FRAME_CONTROL_MENU:
- case META_FRAME_CONTROL_APPMENU:
case META_FRAME_CONTROL_MINIMIZE:
case META_FRAME_CONTROL_MAXIMIZE:
case META_FRAME_CONTROL_DELETE:
@@ -1776,8 +1764,6 @@ meta_frames_button_press_event (GtkWidget *widget,
op = META_GRAB_OP_CLICKING_DELETE;
else if (control == META_FRAME_CONTROL_MENU)
op = META_GRAB_OP_CLICKING_MENU;
- else if (control == META_FRAME_CONTROL_APPMENU)
- op = META_GRAB_OP_CLICKING_APPMENU;
else if (control == META_FRAME_CONTROL_SHADE)
op = META_GRAB_OP_CLICKING_SHADE;
else if (control == META_FRAME_CONTROL_UNSHADE)
@@ -2004,7 +1990,6 @@ meta_frames_button_release_event (GtkWidget *widget,
break;
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
meta_core_end_grab_op (frames->xdisplay, event->time);
break;
@@ -2117,7 +2102,6 @@ meta_frames_motion_notify_event (GtkWidget *widget,
switch (grab_op)
{
case META_GRAB_OP_CLICKING_MENU:
- case META_GRAB_OP_CLICKING_APPMENU:
case META_GRAB_OP_CLICKING_DELETE:
case META_GRAB_OP_CLICKING_MINIMIZE:
case META_GRAB_OP_CLICKING_MAXIMIZE:
@@ -2141,8 +2125,6 @@ meta_frames_motion_notify_event (GtkWidget *widget,
control = get_control (frames, frame, x, y);
if (! ((control == META_FRAME_CONTROL_MENU &&
grab_op == META_GRAB_OP_CLICKING_MENU) ||
- (control == META_FRAME_CONTROL_APPMENU &&
- grab_op == META_GRAB_OP_CLICKING_APPMENU) ||
(control == META_FRAME_CONTROL_DELETE &&
grab_op == META_GRAB_OP_CLICKING_DELETE) ||
(control == META_FRAME_CONTROL_MINIMIZE &&
@@ -2521,14 +2503,6 @@ update_button_state (MetaButtonType type,
else
state = META_BUTTON_STATE_PRELIGHT;
}
- else if (control == META_FRAME_CONTROL_APPMENU &&
- type == META_BUTTON_TYPE_APPMENU)
- {
- if (grab_op == META_GRAB_OP_CLICKING_MENU)
- state = META_BUTTON_STATE_PRESSED;
- else
- state = META_BUTTON_STATE_PRELIGHT;
- }
else if (control == META_FRAME_CONTROL_MINIMIZE &&
type == META_BUTTON_TYPE_MINIMIZE)
{
diff --git a/src/ui/frames.h b/src/ui/frames.h
index e1b4d511..8775334e 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -34,7 +34,6 @@ typedef enum
META_FRAME_CONTROL_TITLE,
META_FRAME_CONTROL_DELETE,
META_FRAME_CONTROL_MENU,
- META_FRAME_CONTROL_APPMENU,
META_FRAME_CONTROL_MINIMIZE,
META_FRAME_CONTROL_MAXIMIZE,
META_FRAME_CONTROL_UNMAXIMIZE,
diff --git a/theme-viewer/theme-viewer-window.c b/theme-viewer/theme-viewer-window.c
index de371912..0e196b51 100644
--- a/theme-viewer/theme-viewer-window.c
+++ b/theme-viewer/theme-viewer-window.c
@@ -391,7 +391,7 @@ update_frame_flags (ThemeViewerWindow *window)
GtkToggleButton *button;
flags = META_FRAME_ALLOWS_DELETE | META_FRAME_ALLOWS_MENU |
- META_FRAME_ALLOWS_APPMENU | META_FRAME_ALLOWS_MINIMIZE |
+ META_FRAME_ALLOWS_MINIMIZE |
META_FRAME_ALLOWS_MAXIMIZE | META_FRAME_ALLOWS_VERTICAL_RESIZE |
META_FRAME_ALLOWS_HORIZONTAL_RESIZE | META_FRAME_ALLOWS_SHADE |
META_FRAME_ALLOWS_MOVE;
View Lorry Controller Status