--- libwindow-settings/metacity-window-manager.c	2007-02-19 11:02:34.000000000 +0000
+++ new/libwindow-settings/metacity-window-manager.c	2007-02-18 22:59:15.000000000 +0000
@@ -49,6 +49,7 @@
         TITLEBAR_SHADE,
         TITLEBAR_LOWER,
         TITLEBAR_MENU,
+        TITLEBAR_NONE,
         TITLEBAR_DEFAULT
 };
 
@@ -170,6 +171,8 @@
                 return "lower";
         case TITLEBAR_MENU:
                 return "menu";
+        case TITLEBAR_NONE:
+                return "none";
         }
         return NULL;
 }
@@ -187,6 +190,8 @@
                 return TITLEBAR_LOWER;
         if (!strcmp(string, "menu"))
                 return TITLEBAR_MENU;
+        if (!strcmp(string, "none"))
+                return TITLEBAR_NONE;
 
         return TITLEBAR_DEFAULT;
 }
@@ -416,7 +421,7 @@
 
         if (to_get & GNOME_WM_SETTING_DOUBLE_CLICK_ACTION) {
                 metacity_get_titlebar_action (meta_wm,
-                                              &settings->double_click_action,
+                                              (enum titlebar_actions*)(void*)&settings->double_click_action,
                                               METACITY_DOUBLE_CLICK_TITLEBAR_KEY,
                                               TITLEBAR_SHADE);
                 settings->flags |= GNOME_WM_SETTING_DOUBLE_CLICK_ACTION;
@@ -424,7 +429,7 @@
 
         if (to_get & GNOME_WM_SETTING_MIDDLE_CLICK_ACTION) {
                 metacity_get_titlebar_action (meta_wm,
-                                              &settings->middle_click_action,
+                                              (enum titlebar_actions*)(void*)&settings->middle_click_action,
                                               METACITY_MIDDLE_CLICK_TITLEBAR_KEY,
                                               TITLEBAR_LOWER);
                 settings->flags |= GNOME_WM_SETTING_MIDDLE_CLICK_ACTION;
@@ -432,7 +437,7 @@
 
         if (to_get & GNOME_WM_SETTING_RIGHT_CLICK_ACTION) {
                 metacity_get_titlebar_action (meta_wm,
-                                              &settings->right_click_action,
+                                              (enum titlebar_actions*)(void*)&settings->right_click_action,
                                               METACITY_RIGHT_CLICK_TITLEBAR_KEY,
                                               TITLEBAR_MENU);
                 settings->flags |= GNOME_WM_SETTING_RIGHT_CLICK_ACTION;
@@ -455,6 +460,7 @@
                 { TITLEBAR_SHADE, N_("Roll up") },
                 { TITLEBAR_LOWER, N_("Lower") },
                 { TITLEBAR_MENU, N_("Menu") },
+                { TITLEBAR_NONE, N_("None") },
         };
         static gboolean initialized = FALSE;        
 
