From 0d27c9600fe53d97ac8a16d332aa31c70ee32d71 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Fri, 24 Sep 2010 14:28:12 -0400
Subject: [PATCH] tiling: rename side-by-side tiling to edge tiling

Currently, the new tiling feature, supports side-by-side, horizontal
tiling when dragging windows to one of the vertical edges of a monitor.

Other types of tiling (on other monitor edges) are potentially useful,
though.

This commit renames the preference from side_by_side_tiling to
edge_tiling.

https://bugzilla.gnome.org/show_bug.cgi?id=630548
---
 src/core/prefs.c    | 16 ++++++++--------
 src/core/window.c   |  2 +-
 src/include/prefs.h |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/core/prefs.c b/src/core/prefs.c
index acd0f48ff..d4c732015 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -104,7 +104,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 side_by_side_tiling = FALSE;
+static gboolean edge_tiling = FALSE;
 static gboolean force_fullscreen = TRUE;
 
 static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH;
@@ -423,9 +423,9 @@ static MetaBoolPreference preferences_bool[] =
       &resize_with_right_button,
       FALSE,
     },
-    { "/apps/metacity/general/side_by_side_tiling",
-      META_PREF_SIDE_BY_SIDE_TILING,
-      &side_by_side_tiling,
+    { "/apps/metacity/general/edge_tiling",
+      META_PREF_EDGE_TILING,
+      &edge_tiling,
       FALSE,
     },
     { "/apps/mutter/general/live_hidden_windows",
@@ -2010,8 +2010,8 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_RESIZE_WITH_RIGHT_BUTTON:
       return "RESIZE_WITH_RIGHT_BUTTON";
 
-    case META_PREF_SIDE_BY_SIDE_TILING:
-      return "SIDE_BY_SIDE_TILING";
+    case META_PREF_EDGE_TILING:
+      return "EDGE_TILING";
 
     case META_PREF_FORCE_FULLSCREEN:
       return "FORCE_FULLSCREEN";
@@ -2926,9 +2926,9 @@ meta_prefs_get_gnome_animations ()
 }
 
 gboolean
-meta_prefs_get_side_by_side_tiling ()
+meta_prefs_get_edge_tiling ()
 {
-  return side_by_side_tiling;
+  return edge_tiling;
 }
 
 MetaKeyBindingAction
diff --git a/src/core/window.c b/src/core/window.c
index 47d05ba86..8b73dfa27 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -7799,7 +7799,7 @@ update_move (MetaWindow  *window,
   shake_threshold = meta_ui_get_drag_threshold (window->screen->ui) *
     DRAG_THRESHOLD_TO_SHAKE_THRESHOLD_FACTOR;
 
-  if (meta_prefs_get_side_by_side_tiling () &&
+  if (meta_prefs_get_edge_tiling () &&
       meta_window_can_tile (window))
     {
       const MetaMonitorInfo *monitor;
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 30addb0ec..9d66812f4 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -60,7 +60,7 @@ typedef enum
   META_PREF_CURSOR_SIZE,
   META_PREF_COMPOSITING_MANAGER,
   META_PREF_RESIZE_WITH_RIGHT_BUTTON,
-  META_PREF_SIDE_BY_SIDE_TILING,
+  META_PREF_EDGE_TILING,
   META_PREF_FORCE_FULLSCREEN,
   META_PREF_CLUTTER_PLUGINS,
   META_PREF_LIVE_HIDDEN_WINDOWS,
@@ -99,7 +99,7 @@ gboolean                    meta_prefs_get_auto_raise         (void);
 int                         meta_prefs_get_auto_raise_delay   (void);
 gboolean                    meta_prefs_get_gnome_accessibility (void);
 gboolean                    meta_prefs_get_gnome_animations   (void);
-gboolean                    meta_prefs_get_side_by_side_tiling (void);
+gboolean                    meta_prefs_get_edge_tiling        (void);
 
 const char*                 meta_prefs_get_command            (int i);