Index: src/common.h
===================================================================
RCS file: /cvs/gnome/metacity/src/common.h,v
retrieving revision 1.35
diff -p -u -r1.35 common.h
--- src/common.h	19 Nov 2005 14:58:50 -0000	1.35
+++ src/common.h	21 Jan 2006 17:11:26 -0000
@@ -155,6 +155,8 @@ typedef enum
 {
   META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_SHADE,
   META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_MAXIMIZE,
+  META_ACTION_DOUBLE_CLICK_TITLEBAR_MINIMIZE,
+  META_ACTION_DOUBLE_CLICK_TITLEBAR_NONE,
   META_ACTION_DOUBLE_CLICK_TITLEBAR_LAST
 } MetaActionDoubleClickTitlebar;
 
Index: src/frames.c
===================================================================
RCS file: /cvs/gnome/metacity/src/frames.c,v
retrieving revision 1.87
diff -p -u -r1.87 frames.c
--- src/frames.c	20 Jan 2006 22:03:55 -0000	1.87
+++ src/frames.c	21 Jan 2006 17:11:26 -0000
@@ -1290,6 +1290,16 @@ meta_frames_button_press_event (GtkWidge
           }
           break;
 
+        case META_ACTION_DOUBLE_CLICK_TITLEBAR_MINIMIZE:
+          {
+            meta_core_minimize (gdk_display, frame->xwindow);
+            break;
+          }
+
+        case META_ACTION_DOUBLE_CLICK_TITLEBAR_NONE:
+          /* Yaay, a sane user that doesn't use that other weird crap! */
+          break;
+
         case META_ACTION_DOUBLE_CLICK_TITLEBAR_LAST:
           break;
         }
Index: src/metacity.schemas.in
===================================================================
RCS file: /cvs/gnome/metacity/src/metacity.schemas.in,v
retrieving revision 1.46
diff -p -u -r1.46 metacity.schemas.in
--- src/metacity.schemas.in	20 Jan 2006 22:42:25 -0000	1.46
+++ src/metacity.schemas.in	21 Jan 2006 17:11:26 -0000
@@ -99,10 +99,11 @@
       <locale name="C">
          <short>Action on title bar double-click</short>
          <long>
-	  This option determines the effects of double-clicking on the
-	  title bar.  Current valid options are 'toggle_shade', which will
-	  shade/unshade the window, and 'toggle_maximize' which will
-	  maximize/unmaximize the window.
+           This option determines the effects of double-clicking on the
+           title bar.  Current valid options are 'toggle_shade', which will
+           shade/unshade the window, 'toggle_maximize' which will
+           maximize/unmaximize the window, 'minimize' which will minimize
+           the window, and 'none' which will not do anything.
          </long>
       </locale>
     </schema>
Index: src/prefs.c
===================================================================
RCS file: /cvs/gnome/metacity/src/prefs.c,v
retrieving revision 1.57
diff -p -u -r1.57 prefs.c
--- src/prefs.c	20 Jan 2006 22:42:25 -0000	1.57
+++ src/prefs.c	21 Jan 2006 17:11:26 -0000
@@ -1477,6 +1477,10 @@ action_double_click_titlebar_from_string
     return META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_SHADE;
   else if (strcmp (str, "toggle_maximize") == 0)
     return META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_MAXIMIZE;
+  else if (strcmp (str, "minimize") == 0)
+    return META_ACTION_DOUBLE_CLICK_TITLEBAR_MINIMIZE;
+  else if (strcmp (str, "none") == 0)
+    return META_ACTION_DOUBLE_CLICK_TITLEBAR_NONE;
   else
     return META_ACTION_DOUBLE_CLICK_TITLEBAR_LAST;
 }
