Drop dead patches

5 files changed, 0 insertions, 446 deletions

diff --git a/default-theme.patch b/default-theme.patch
deleted file mode 100644
index e2a8e3a..0000000
--- a/default-theme.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up metacity-2.19.55/src/metacity.schemas.in.in.default-theme metacity-2.19.55/src/metacity.schemas.in.in
---- metacity-2.19.55/src/metacity.schemas.in.in.default-theme	2007-08-12 00:19:23.000000000 -0400
-+++ metacity-2.19.55/src/metacity.schemas.in.in	2007-08-12 00:19:35.000000000 -0400
-@@ -212,7 +212,7 @@
-       <applyto>/apps/metacity/general/theme</applyto>
-       <owner>metacity</owner>
-       <type>string</type>
--      <default>Clearlooks</default>
-+      <default>Nodoka</default>
-       <locale name="C">
-          <short>Current theme</short>
-          <long>
diff --git a/metacity-canberra.patch b/metacity-canberra.patch
deleted file mode 100644
index 53f1441..0000000
--- a/metacity-canberra.patch
+++ /dev/null
@@ -1,172 +0,0 @@
---- metacity-2.25.144/configure.in	2009-02-01 15:33:42.000000000 -0500
-+++ hacked/configure.in	2009-02-09 21:15:32.000000000 -0500
-@@ -107,7 +107,7 @@
- fi
- changequote([,])dnl
- 
--METACITY_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'
-+METACITY_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0 libcanberra-gtk'
- 
- AC_ARG_ENABLE(gconf,
-   AC_HELP_STRING([--disable-gconf],
---- metacity-2.25.144/src/core/bell.c	2009-02-01 15:33:15.000000000 -0500
-+++ hacked/src/core/bell.c	2009-02-09 23:50:43.000000000 -0500
-@@ -52,6 +52,7 @@
- #include "bell.h"
- #include "screen-private.h"
- #include "prefs.h"
-+#include <canberra-gtk.h>
- 
- /**
-  * Flashes one entire screen.  This is done by making a window the size of the
-@@ -223,7 +224,7 @@
-  */
- static void
- bell_flash_frame (MetaDisplay *display, 
--		       XkbAnyEvent *xkb_ev)
-+		  XkbAnyEvent *xkb_ev)
- {
-   XkbBellNotifyEvent *xkb_bell_event = (XkbBellNotifyEvent *) xkb_ev;
-   MetaWindow *window;
-@@ -280,6 +281,47 @@
-   /* flash something */
-   if (meta_prefs_get_visual_bell ()) 
-     bell_visual_notify (display, xkb_ev);
-+
-+  if (meta_prefs_bell_is_audible ()) 
-+    {
-+      ca_proplist *p;
-+      XkbBellNotifyEvent *xkb_bell_event = (XkbBellNotifyEvent*) xkb_ev;
-+      MetaWindow *window;
-+      int res;
-+
-+      ca_proplist_create (&p);
-+      ca_proplist_sets (p, CA_PROP_EVENT_ID, "bell-window-system");
-+      ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, _("Bell event"));
-+      ca_proplist_sets (p, CA_PROP_MEDIA_ROLE, "event");
-+      ca_proplist_sets (p, CA_PROP_CANBERRA_ENABLE, "1");
-+
-+      window = meta_display_lookup_x_window (display, xkb_bell_event->window);
-+      if (!window && (display->focus_window) && (display->focus_window->frame))
-+        window = display->focus_window;
-+
-+      if (window)
-+        { 
-+          ca_proplist_sets (p, CA_PROP_WINDOW_NAME, window->title);
-+          ca_proplist_setf (p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long)window->xwindow);
-+          ca_proplist_sets (p, CA_PROP_APPLICATION_NAME, window->res_name);
-+          ca_proplist_setf (p, CA_PROP_APPLICATION_PROCESS_ID, "%d", window->net_wm_pid);
-+        }
-+
-+      /* First, we try to play a real sound ... */
-+      res = ca_context_play_full (ca_gtk_context_get (), 1, p, NULL, NULL);
-+
-+      ca_proplist_destroy (p);
-+
-+      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 */
- 
-@@ -321,8 +363,7 @@
-       XkbChangeEnabledControls (display->xdisplay,
- 				XkbUseCoreKbd,
- 				XkbAudibleBellMask,
--				meta_prefs_bell_is_audible () 
--				? XkbAudibleBellMask : 0);
-+                                0);
-       if (visual_bell_auto_reset) {
- 	XkbSetAutoResetControls (display->xdisplay,
- 				 XkbAudibleBellMask,
---- metacity-2.25.144/src/core/workspace.c	2009-02-01 15:33:15.000000000 -0500
-+++ hacked/src/core/workspace.c	2009-02-09 21:15:32.000000000 -0500
-@@ -29,6 +29,7 @@
- #include "prefs.h"
- #include <X11/Xatom.h>
- #include <string.h>
-+#include <canberra-gtk.h>
- 
- void meta_workspace_queue_calc_showing   (MetaWorkspace *workspace);
- static void set_active_space_hint        (MetaScreen *screen);
-@@ -306,6 +307,63 @@
-     }
- }
- 
-+static void workspace_switch_sound(MetaWorkspace *from,
-+                                   MetaWorkspace *to) {
-+
-+  MetaWorkspaceLayout layout;
-+  int i, nw, x, y, fi, ti;
-+  const char *e;
-+
-+  nw = meta_screen_get_n_workspaces(from->screen);
-+  fi = meta_workspace_index(from);
-+  ti = meta_workspace_index(to);
-+
-+  meta_screen_calc_workspace_layout(from->screen,
-+                                    nw,
-+                                    fi,
-+                                    &layout);
-+
-+  for (i = 0; i < nw; i++)
-+    if (layout.grid[i] == ti)
-+      break;
-+
-+  if (i >= nw) {
-+    meta_bug("Failed to find destination workspace in layout\n");
-+    goto finish;
-+  }
-+
-+  y = i / layout.cols;
-+  x = i % layout.cols;
-+
-+  /* We priorize horizontal over vertical movements here. The
-+     rationale for this is that horizontal movements are probably more
-+     interesting for sound effects because speakers are usually
-+     positioned on a horizontal and not a vertical axis. i.e. your
-+     spatial "Woosh!" effects will easily be able to encode horizontal
-+     movement but not such much vertical movement. */
-+
-+  if (x < layout.current_col)
-+    e = "desktop-switch-left";
-+  else if (x > layout.current_col)
-+    e = "desktop-switch-right";
-+  else if (y < layout.current_row)
-+    e = "desktop-switch-up";
-+  else if (y > layout.current_row)
-+    e = "desktop-switch-down";
-+  else {
-+    meta_bug("Uh, origin and destination workspace at same logic position!\n");
-+    goto finish;
-+  }
-+
-+  ca_context_play(ca_gtk_context_get(), 1,
-+                  CA_PROP_EVENT_ID, e,
-+                  CA_PROP_EVENT_DESCRIPTION, "Desktop switched",
-+                  NULL);
-+
-+ finish:
-+  meta_screen_free_workspace_layout (&layout);
-+}
-+
- void
- meta_workspace_activate_with_focus (MetaWorkspace *workspace,
-                                     MetaWindow    *focus_this,
-@@ -320,6 +378,9 @@
-   if (workspace->screen->active_workspace == workspace)
-     return;
- 
-+  if (workspace->screen->active_workspace)
-+    workspace_switch_sound(workspace->screen->active_workspace, workspace);
-+
-   /* Note that old can be NULL; e.g. when starting up */
-   old = workspace->screen->active_workspace;
-   
diff --git a/metacity-dont-force-bell.patch b/metacity-dont-force-bell.patch
deleted file mode 100644
index f538caf..0000000
--- a/metacity-dont-force-bell.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up metacity-2.25.144/src/core/bell.c.no-more-brokkoli metacity-2.25.144/src/core/bell.c
---- metacity-2.25.144/src/core/bell.c.no-more-brokkoli	2009-02-21 12:04:32.447950258 -0500
-+++ metacity-2.25.144/src/core/bell.c	2009-02-21 12:04:41.191943469 -0500
-@@ -293,7 +293,6 @@ meta_bell_notify (MetaDisplay *display, 
-       ca_proplist_sets (p, CA_PROP_EVENT_ID, "bell-window-system");
-       ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, _("Bell event"));
-       ca_proplist_sets (p, CA_PROP_MEDIA_ROLE, "event");
--      ca_proplist_sets (p, CA_PROP_CANBERRA_ENABLE, "1");
- 
-       window = meta_display_lookup_x_window (display, xkb_bell_event->window);
-       if (!window && (display->focus_window) && (display->focus_window->frame))
diff --git a/metacity-option-to-force-fullscreen.patch b/metacity-option-to-force-fullscreen.patch
deleted file mode 100644
index f09adaf..0000000
--- a/metacity-option-to-force-fullscreen.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From b625ec30d99b2dcf86d8fa78b09f6d04dce3a6e0 Mon Sep 17 00:00:00 2001
-From: Tomeu Vizoso <tomeu@sugarlabs.org>
-Date: Fri, 19 Jun 2009 15:30:37 +0000
-Subject: Add a switch to disable autofullscreen'ing maximized windows without decorations
-
----
-diff --git a/src/core/constraints.c b/src/core/constraints.c
-index 800b293..a060d20 100644
---- a/src/core/constraints.c
-+++ b/src/core/constraints.c
-@@ -27,6 +27,7 @@
- #include "constraints.h"
- #include "workspace.h"
- #include "place.h"
-+#include "prefs.h"
- 
- #include <stdlib.h>
- #include <math.h>
-@@ -424,7 +425,8 @@ setup_constraint_info (ConstraintInfo      *info,
-   /* Workaround braindead legacy apps that don't know how to
-    * fullscreen themselves properly.
-    */
--  if (meta_rectangle_equal (new, &xinerama_info->rect) &&
-+  if (meta_prefs_get_force_fullscreen() &&
-+      meta_rectangle_equal (new, &xinerama_info->rect) &&
-       window->has_fullscreen_func &&
-       !window->fullscreen)
-     {
-diff --git a/src/core/main.c b/src/core/main.c
-index 6c36f10..a36a396 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -233,6 +233,7 @@ typedef struct
-   gboolean sync;
-   gboolean composite;
-   gboolean no_composite;
-+  gboolean no_force_fullscreen;
- } MetaArguments;
- 
- #ifdef HAVE_COMPOSITE_EXTENSIONS
-@@ -314,6 +315,12 @@ meta_parse_options (int *argc, char ***argv,
-       N_("Turn compositing off"),
-       NULL
-     },
-+    {
-+      "no-force-fullscreen", 0, COMPOSITE_OPTS_FLAGS, G_OPTION_ARG_NONE,
-+      &my_args.no_force_fullscreen,
-+      N_("Don't make fullscreen windows that are maximized and have no decorations"),
-+      NULL
-+    },
-     {NULL}
-   };
-   GOptionContext *ctx;
-@@ -584,6 +591,9 @@ main (int argc, char **argv)
-   if (meta_args.composite || meta_args.no_composite)
-     meta_prefs_set_compositing_manager (meta_args.composite);
- 
-+  if (meta_args.no_force_fullscreen)
-+    meta_prefs_set_force_fullscreen (FALSE);
-+
-   if (!meta_display_open ())
-     meta_exit (META_EXIT_ERROR);
-   
-diff --git a/src/core/prefs.c b/src/core/prefs.c
-index 1f4fe41..6e41b3c 100644
---- a/src/core/prefs.c
-+++ b/src/core/prefs.c
-@@ -95,6 +95,7 @@ static char *cursor_theme = NULL;
- static int   cursor_size = 24;
- static gboolean compositing_manager = FALSE;
- static gboolean resize_with_right_button = FALSE;
-+static gboolean force_fullscreen = TRUE;
- 
- static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH;
- static MetaButtonLayout button_layout;
-@@ -1751,6 +1752,9 @@ meta_preference_to_string (MetaPreference pref)
- 
-     case META_PREF_RESIZE_WITH_RIGHT_BUTTON:
-       return "RESIZE_WITH_RIGHT_BUTTON";
-+
-+    case META_PREF_FORCE_FULLSCREEN:
-+      return "FORCE_FULLSCREEN";
-     }
- 
-   return "(unknown)";
-@@ -2737,6 +2741,12 @@ meta_prefs_get_mouse_button_menu (void)
-   return resize_with_right_button ? 2: 3;
- }
- 
-+gboolean
-+meta_prefs_get_force_fullscreen (void)
-+{
-+  return force_fullscreen;
-+}
-+
- void
- meta_prefs_set_compositing_manager (gboolean whether)
- {
-@@ -2797,3 +2807,10 @@ init_button_layout(void)
- };
- 
- #endif
-+
-+void
-+meta_prefs_set_force_fullscreen (gboolean whether)
-+{
-+  force_fullscreen = whether;
-+}
-+
-diff --git a/src/include/prefs.h b/src/include/prefs.h
-index 2f1ce8e..a4193ff 100644
---- a/src/include/prefs.h
-+++ b/src/include/prefs.h
-@@ -59,7 +59,8 @@ typedef enum
-   META_PREF_CURSOR_THEME,
-   META_PREF_CURSOR_SIZE,
-   META_PREF_COMPOSITING_MANAGER,
--  META_PREF_RESIZE_WITH_RIGHT_BUTTON
-+  META_PREF_RESIZE_WITH_RIGHT_BUTTON,
-+  META_PREF_FORCE_FULLSCREEN
- } MetaPreference;
- 
- typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
-@@ -114,6 +115,7 @@ void        meta_prefs_change_workspace_name (int         i,
- const char* meta_prefs_get_cursor_theme      (void);
- int         meta_prefs_get_cursor_size       (void);
- gboolean    meta_prefs_get_compositing_manager (void);
-+gboolean    meta_prefs_get_force_fullscreen  (void);
- 
- /**
-  * Sets whether the compositor is turned on.
-@@ -122,6 +124,8 @@ gboolean    meta_prefs_get_compositing_manager (void);
-  */
- void meta_prefs_set_compositing_manager (gboolean whether);
- 
-+void meta_prefs_set_force_fullscreen (gboolean whether);
-+
- /* XXX FIXME This should be x-macroed, but isn't yet because it would be
-  * difficult (or perhaps impossible) to add the suffixes using the current
-  * system.  It needs some more thought, perhaps after the current system
---
-cgit v0.8.2
diff --git a/metacity-struts.patch b/metacity-struts.patch
deleted file mode 100644
index 1ec08cb..0000000
--- a/metacity-struts.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- trunk/src/core/window-props.c	2009/03/11 14:21:33	4190
-+++ trunk/src/core/window-props.c	2009/03/12 01:09:41	4191
-@@ -73,12 +73,6 @@
-   ReloadValueFunc   reload_func;
- } MetaWindowPropHooks;
- 
--static void init_prop_value            (MetaDisplay   *display,
--                                        Atom           property,
--                                        MetaPropValue *value);
--static void reload_prop_value          (MetaWindow    *window,
--                                        MetaPropValue *value,
--                                        gboolean       initial);
- static MetaWindowPropHooks* find_hooks (MetaDisplay *display,
-                                         Atom         property);
- 
-@@ -128,23 +122,34 @@
-   g_return_if_fail (n_properties > 0);
-   
-   values = g_new0 (MetaPropValue, n_properties);
--  
--  i = 0;
--  while (i < n_properties)
-+
-+  for (i=0; i<n_properties; i++)
-     {
--      init_prop_value (window->display, properties[i], &values[i]);
--      ++i;
-+      MetaWindowPropHooks *hooks = find_hooks (window->display,
-+                                               properties[i]);
-+    
-+      if (!hooks || hooks->type == META_PROP_VALUE_INVALID)
-+        {
-+          values[i].type = META_PROP_VALUE_INVALID;
-+          values[i].atom = None;
-+        }
-+      else
-+        {
-+          values[i].type = hooks->type;
-+          values[i].atom = properties[i];
-+        }
-     }
-   
-   meta_prop_get_values (window->display, xwindow,
-                         values, n_properties);
- 
--  i = 0;
--  while (i < n_properties)
-+  for (i=0; i<n_properties; i++)
-     {
--      reload_prop_value (window, &values[i], initial);
--      
--      ++i;
-+      MetaWindowPropHooks *hooks = find_hooks (window->display,
-+                                               properties[i]);
-+
-+      if (hooks && hooks->reload_func != NULL)
-+        (* hooks->reload_func) (window, &values[i], initial);
-     }
- 
-   meta_prop_free_values (values, n_properties);
-@@ -152,37 +157,6 @@
-   g_free (values);
- }
- 
--/* Fill in the MetaPropValue used to get the value of "property" */
--static void
--init_prop_value (MetaDisplay   *display,
--                 Atom           property,
--                 MetaPropValue *value)
--{
--  MetaWindowPropHooks *hooks = find_hooks (display, property);
--    
--  if (!hooks || hooks->type == META_PROP_VALUE_INVALID)
--    {
--      value->type = META_PROP_VALUE_INVALID;
--      value->atom = None;
--    }
--  else
--    {
--      value->type = hooks->type;
--      value->atom = property;
--    }
--}
--
--static void
--reload_prop_value (MetaWindow    *window,
--                   MetaPropValue *value,
--                   gboolean       initial)
--{
--  MetaWindowPropHooks *hooks = find_hooks (window->display, value->atom);
--
--  if (hooks && hooks->reload_func != NULL)
--    (* hooks->reload_func) (window, value, initial);
--}
--
- static void
- reload_wm_client_machine (MetaWindow    *window,
-                           MetaPropValue *value,
-@@ -1566,6 +1540,9 @@
-   display->prop_hooks_table = NULL;
- }
- 
-+/**
-+ * Finds the hooks for a particular property.
-+ */
- static MetaWindowPropHooks*
- find_hooks (MetaDisplay *display,
-             Atom         property)
-