Sync up to upstream 2.25.144

Conflicts:

	configure.in
	src/core/main.c
	src/core/prefs.c
	src/core/window.c
	src/include/prefs.h

src/core/prefs.c

@@ -102,6 +102,7 @@ static gboolean gnome_animations = TRUE;
 static char *cursor_theme = NULL;
 static int   cursor_size = 24;
 static gboolean compositing_manager = FALSE;
+static gboolean resize_with_right_button = FALSE;
 
 static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH;
 static MetaButtonLayout button_layout;
@@ -421,6 +422,11 @@ static MetaBoolPreference preferences_bool[] =
       &compositing_manager,
       FALSE,
     },
+    { "/apps/metacity/general/resize_with_right_button",
+      META_PREF_RESIZE_WITH_RIGHT_BUTTON,
+      &resize_with_right_button,
+      FALSE,
+    },
 #ifdef WITH_CLUTTER
     { "/apps/metacity/general/clutter_disabled",
       META_PREF_CLUTTER_DISABLED,
@@ -1395,6 +1401,8 @@ theme_name_handler (MetaPreference pref,
                     const gchar *string_value,
                     gboolean *inform_listeners)
 {
+  g_free (current_theme);
+
   /* Fallback crackrock */
   if (string_value == NULL)
     current_theme = g_strdup ("Atlanta");
@@ -1808,6 +1816,9 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_COMPOSITING_MANAGER:
       return "COMPOSITING_MANAGER";
+
+    case META_PREF_RESIZE_WITH_RIGHT_BUTTON:
+      return "RESIZE_WITH_RIGHT_BUTTON";
 #ifdef WITH_CLUTTER
     case META_PREF_CLUTTER_DISABLED:
       return "CLUTTER_DISABLED";
@@ -2792,6 +2803,18 @@ meta_prefs_get_compositing_manager (void)
   return compositing_manager;
 }
 
+guint
+meta_prefs_get_mouse_button_resize (void)
+{
+  return resize_with_right_button ? 3: 2;
+}
+
+guint
+meta_prefs_get_mouse_button_menu (void)
+{
+  return resize_with_right_button ? 2: 3;
+}
+
 void
 meta_prefs_set_compositing_manager (gboolean whether)
 {