Rename GeditViewHolder -> GeditViewCentering

GeditViewCentering is about... centering the GeditView!

9 files changed, 165 insertions, 163 deletions

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 4b7d82e49..9efe63f99 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -64,8 +64,8 @@ IGNORE_HFILES =					\
 	gedit-small-button.h			\
 	gedit-status-menu-button.h		\
 	gedit-tab-label.h			\
+	gedit-view-centering.h			\
 	gedit-view-frame.h			\
-	gedit-view-holder.h			\
 	gedit-window-private.h
 
 # Images to copy into HTML directory.
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 8ed167b46..a502e8ccd 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -131,8 +131,8 @@ gedit_NOINST_H_FILES =					\
 	gedit/gedit-status-menu-button.h		\
 	gedit/gedit-tab-label.h				\
 	gedit/gedit-tab-private.h			\
+	gedit/gedit-view-centering.h			\
 	gedit/gedit-view-frame.h			\
-	gedit/gedit-view-holder.h			\
 	gedit/gedit-window-private.h
 
 gedit_INST_H_FILES =				\
@@ -210,8 +210,8 @@ gedit_libgedit_c_files =				\
 	gedit/gedit-utils.c 				\
 	gedit/gedit-view-activatable.c			\
 	gedit/gedit-view.c 				\
+	gedit/gedit-view-centering.c			\
 	gedit/gedit-view-frame.c			\
-	gedit/gedit-view-holder.c			\
 	gedit/gedit-window-activatable.c		\
 	gedit/gedit-window.c
 
diff --git a/gedit/gedit-view-holder.c b/gedit/gedit-view-centering.c
index 92fba32e0..f5fa7e1e7 100644
--- a/gedit/gedit-view-holder.c
+++ b/gedit/gedit-view-centering.c
@@ -1,5 +1,5 @@
 /*
- * gedit-view-holder.c
+ * gedit-view-centering.c
  * This file is part of gedit
  *
  * Copyright (C) 2014 - Sébastien Lafargue
@@ -21,14 +21,14 @@
  * Based on Christian Hergert's prototype.
  */
 
-#include "gedit-view-holder.h"
+#include "gedit-view-centering.h"
 
 #include <gtksourceview/gtksource.h>
 
 #include "gedit-view.h"
 #include "gedit-debug.h"
 
-struct _GeditViewHolderPrivate
+struct _GeditViewCenteringPrivate
 {
 	GtkWidget *box;
 	GtkWidget *scrolled_window;
@@ -47,7 +47,7 @@ struct _GeditViewHolderPrivate
 	guint view_margin_background_set : 1;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GeditViewHolder, gedit_view_holder, GTK_TYPE_BIN)
+G_DEFINE_TYPE_WITH_PRIVATE (GeditViewCentering, gedit_view_centering, GTK_TYPE_BIN)
 
 #define STYLE_TEXT			"text"
 #define STYLE_RIGHT_MARGIN		"right-margin"
@@ -57,9 +57,9 @@ G_DEFINE_TYPE_WITH_PRIVATE (GeditViewHolder, gedit_view_holder, GTK_TYPE_BIN)
 
 static gboolean
 get_style (GtkSourceStyleScheme *scheme,
-           const gchar          *style_id,
-           const gchar          *attribute,
-           GdkRGBA              *color)
+	   const gchar          *style_id,
+	   const gchar          *attribute,
+	   GdkRGBA              *color)
 {
 	GtkSourceStyle *style;
 	gchar *style_string;
@@ -83,10 +83,10 @@ get_style (GtkSourceStyleScheme *scheme,
 }
 
 static void
-get_spacer_colors (GeditViewHolder      *container,
-                   GtkSourceStyleScheme *scheme)
+get_spacer_colors (GeditViewCentering   *container,
+		   GtkSourceStyleScheme *scheme)
 {
-	GeditViewHolderPrivate *priv = container->priv;
+	GeditViewCenteringPrivate *priv = container->priv;
 
 	if (scheme)
 	{
@@ -106,21 +106,21 @@ get_spacer_colors (GeditViewHolder      *container,
 	}
 }
 
-/* FIXME: when GeditViewHolder will be transfered to GtkSourceViewHolder,
+/* FIXME: when GeditViewCentering will be transfered to GtkSourceView,
  * this method will be replaced by a call to a new method called
  * gtk_source_view_get_right_margin_pixel_position ()
  */
 static guint
-_gedit_view_holder_get_right_margin_pixel_position (GeditViewHolder *container)
+_gedit_view_centering_get_right_margin_pixel_position (GeditViewCentering *container)
 {
-	GeditViewHolderPrivate *priv;
+	GeditViewCenteringPrivate *priv;
 	gchar *str;
 	PangoFontDescription *font_desc;
 	PangoLayout *layout;
 	guint right_margin_position;
 	gint width = 0;
 
-	g_return_val_if_fail (GEDIT_IS_VIEW_HOLDER (container), 0);
+	g_return_val_if_fail (GEDIT_IS_VIEW_CENTERING (container), 0);
 
 	priv = container->priv;
 
@@ -144,11 +144,11 @@ _gedit_view_holder_get_right_margin_pixel_position (GeditViewHolder *container)
 }
 
 static void
-on_view_right_margin_visibility_changed (GeditView       *view,
-                                         GParamSpec      *pspec,
-                                         GeditViewHolder *container)
+on_view_right_margin_visibility_changed (GeditView          *view,
+					 GParamSpec         *pspec,
+					 GeditViewCentering *container)
 {
-	GeditViewHolderPrivate *priv = container->priv;
+	GeditViewCenteringPrivate *priv = container->priv;
 	gboolean visibility;
 
 	visibility = gtk_source_view_get_show_right_margin (GTK_SOURCE_VIEW (priv->sourceview));
@@ -157,14 +157,14 @@ on_view_right_margin_visibility_changed (GeditView       *view,
 }
 
 static void
-on_view_right_margin_position_changed (GeditView       *view,
-                                       GParamSpec      *pspec,
-                                       GeditViewHolder *container)
+on_view_right_margin_position_changed (GeditView          *view,
+				       GParamSpec         *pspec,
+				       GeditViewCentering *container)
 {
-	GeditViewHolderPrivate *priv = container->priv;
+	GeditViewCenteringPrivate *priv = container->priv;
 	gboolean visibility;
 
-	priv->view_text_width = _gedit_view_holder_get_right_margin_pixel_position (container);
+	priv->view_text_width = _gedit_view_centering_get_right_margin_pixel_position (container);
 
 	visibility = gtk_source_view_get_show_right_margin (GTK_SOURCE_VIEW (priv->sourceview));
 
@@ -175,10 +175,10 @@ on_view_right_margin_position_changed (GeditView       *view,
 }
 
 static void
-on_view_context_changed (GtkStyleContext *stylecontext,
-                         GeditViewHolder *container)
+on_view_context_changed (GtkStyleContext    *stylecontext,
+			 GeditViewCentering *container)
 {
-	GeditViewHolderPrivate *priv = container->priv;
+	GeditViewCenteringPrivate *priv = container->priv;
 	GtkTextBuffer *buffer;
 	GtkSourceStyleScheme *scheme;
 	gboolean visibility;
@@ -187,7 +187,7 @@ on_view_context_changed (GtkStyleContext *stylecontext,
 	scheme = gtk_source_buffer_get_style_scheme (GTK_SOURCE_BUFFER (buffer));
 	get_spacer_colors (container, scheme);
 
-	priv->view_text_width = _gedit_view_holder_get_right_margin_pixel_position (container);
+	priv->view_text_width = _gedit_view_centering_get_right_margin_pixel_position (container);
 
 	visibility = gtk_source_view_get_show_right_margin (GTK_SOURCE_VIEW (priv->sourceview));
 
@@ -198,11 +198,11 @@ on_view_context_changed (GtkStyleContext *stylecontext,
 }
 
 static gboolean
-on_spacer_draw (GeditViewHolder *container,
-                cairo_t         *cr,
-                GtkDrawingArea  *spacer)
+on_spacer_draw (GeditViewCentering *container,
+		cairo_t            *cr,
+		GtkDrawingArea     *spacer)
 {
-	GeditViewHolderPrivate *priv = container->priv;
+	GeditViewCenteringPrivate *priv = container->priv;
 	GtkStyleContext *context;
 	guint width, height;
 
@@ -248,14 +248,14 @@ on_spacer_draw (GeditViewHolder *container,
 }
 
 static void
-gedit_view_holder_remove (GtkContainer *container,
-                          GtkWidget    *child)
+gedit_view_centering_remove (GtkContainer *container,
+			     GtkWidget    *child)
 {
-	GeditViewHolderPrivate *priv;
+	GeditViewCenteringPrivate *priv;
 
-	g_assert (GEDIT_IS_VIEW_HOLDER (container));
+	g_assert (GEDIT_IS_VIEW_CENTERING (container));
 
-	priv = GEDIT_VIEW_HOLDER (container)->priv;
+	priv = GEDIT_VIEW_CENTERING (container)->priv;
 
 	if (priv->sourceview == child)
 	{
@@ -266,27 +266,27 @@ gedit_view_holder_remove (GtkContainer *container,
 	}
 	else
 	{
-		GTK_CONTAINER_CLASS (gedit_view_holder_parent_class)->remove (container, child);
+		GTK_CONTAINER_CLASS (gedit_view_centering_parent_class)->remove (container, child);
 	}
 }
 
 static void
-gedit_view_holder_add (GtkContainer *container,
-                       GtkWidget    *child)
+gedit_view_centering_add (GtkContainer *container,
+			  GtkWidget    *child)
 {
-	GeditViewHolderPrivate *priv;
+	GeditViewCenteringPrivate *priv;
 	GtkTextBuffer *buffer;
 	GtkSourceStyleScheme *scheme;
 
-	g_assert (GEDIT_IS_VIEW_HOLDER (container));
+	g_assert (GEDIT_IS_VIEW_CENTERING (container));
 
-	priv = GEDIT_VIEW_HOLDER (container)->priv;
+	priv = GEDIT_VIEW_CENTERING (container)->priv;
 
 	if (GEDIT_IS_VIEW (child))
 	{
 		if (priv->sourceview)
 		{
-			gedit_view_holder_remove (container, priv->sourceview);
+			gedit_view_centering_remove (container, priv->sourceview);
 		}
 
 		priv->sourceview = child;
@@ -297,7 +297,7 @@ gedit_view_holder_add (GtkContainer *container,
 
 		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->sourceview));
 		scheme = gtk_source_buffer_get_style_scheme (GTK_SOURCE_BUFFER (buffer));
-		get_spacer_colors (GEDIT_VIEW_HOLDER (container), scheme);
+		get_spacer_colors (GEDIT_VIEW_CENTERING (container), scheme);
 
 		g_signal_connect (priv->sourceview,
 		                  "notify::right-margin-position",
@@ -318,14 +318,14 @@ gedit_view_holder_add (GtkContainer *container,
 	}
 	else
 	{
-		GTK_CONTAINER_CLASS (gedit_view_holder_parent_class)->add (container, child);
+		GTK_CONTAINER_CLASS (gedit_view_centering_parent_class)->add (container, child);
 	}
 }
 
 static gboolean
-on_spacer_scroll_event (GtkWidget       *widget,
-                        GdkEvent        *event,
-                        GeditViewHolder *container)
+on_spacer_scroll_event (GtkWidget          *widget,
+			GdkEvent           *event,
+			GeditViewCentering *container)
 {
 	GdkEventScroll *new_scroll_event;
 
@@ -347,10 +347,10 @@ on_spacer_scroll_event (GtkWidget       *widget,
 }
 
 static void
-gedit_view_holder_size_allocate (GtkWidget     *widget,
-                                 GtkAllocation *alloc)
+gedit_view_centering_size_allocate (GtkWidget     *widget,
+				    GtkAllocation *alloc)
 {
-	GeditViewHolderPrivate *priv;
+	GeditViewCenteringPrivate *priv;
 	GtkTextView *view;
 	gint container_width;
 	gint gutter_width;
@@ -359,9 +359,9 @@ gedit_view_holder_size_allocate (GtkWidget     *widget,
 	gint current_spacer_width;
 	GdkWindow *gutter_window;
 
-	g_assert (GEDIT_IS_VIEW_HOLDER (widget));
+	g_assert (GEDIT_IS_VIEW_CENTERING (widget));
 
-	priv = GEDIT_VIEW_HOLDER (widget)->priv;
+	priv = GEDIT_VIEW_CENTERING (widget)->priv;
 
 	view = GTK_TEXT_VIEW (priv->sourceview);
 
@@ -383,44 +383,44 @@ gedit_view_holder_size_allocate (GtkWidget     *widget,
 		}
 	}
 
-	GTK_WIDGET_CLASS (gedit_view_holder_parent_class)->size_allocate (widget, alloc);
+	GTK_WIDGET_CLASS (gedit_view_centering_parent_class)->size_allocate (widget, alloc);
 }
 
 static void
-gedit_view_holder_finalize (GObject *object)
+gedit_view_centering_finalize (GObject *object)
 {
-	GeditViewHolder *container = GEDIT_VIEW_HOLDER (object);
-	GeditViewHolderPrivate *priv = container->priv;
+	GeditViewCentering *container = GEDIT_VIEW_CENTERING (object);
+	GeditViewCenteringPrivate *priv = container->priv;
 
 	if (priv->sourceview)
 	{
-		gedit_view_holder_remove (GTK_CONTAINER (container), priv->sourceview);
+		gedit_view_centering_remove (GTK_CONTAINER (container), priv->sourceview);
 	}
 
-	G_OBJECT_CLASS (gedit_view_holder_parent_class)->finalize (object);
+	G_OBJECT_CLASS (gedit_view_centering_parent_class)->finalize (object);
 }
 
 static void
-gedit_view_holder_class_init (GeditViewHolderClass *klass)
+gedit_view_centering_class_init (GeditViewCenteringClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
 
-	gobject_class->finalize = gedit_view_holder_finalize;
+	gobject_class->finalize = gedit_view_centering_finalize;
 
-	widget_class->size_allocate = gedit_view_holder_size_allocate;
+	widget_class->size_allocate = gedit_view_centering_size_allocate;
 
-	container_class->add = gedit_view_holder_add;
-	container_class->remove = gedit_view_holder_remove;
+	container_class->add = gedit_view_centering_add;
+	container_class->remove = gedit_view_centering_remove;
 }
 
 static void
-gedit_view_holder_init (GeditViewHolder *container)
+gedit_view_centering_init (GeditViewCentering *container)
 {
-	GeditViewHolderPrivate *priv;
+	GeditViewCenteringPrivate *priv;
 
-	container->priv = gedit_view_holder_get_instance_private (container);
+	container->priv = gedit_view_centering_get_instance_private (container);
 	priv = container->priv;
 	priv->view_text_width = 0;
 
@@ -446,18 +446,18 @@ gedit_view_holder_init (GeditViewHolder *container)
 }
 
 /**
- * gedit_view_holder_set_centering:
- * @container: a #GeditViewHolder.
+ * gedit_view_centering_set_centering:
+ * @container: a #GeditViewCentering.
  * @centering : whether to center the sourceview child or not.
  *
  * if @centering is %TRUE, the sourceview child is centered
- * horizontally on the #GeditViewHolder container.
+ * horizontally on the #GeditViewCentering container.
  **/
 void
-gedit_view_holder_set_centering (GeditViewHolder *container,
-                                 gboolean         centering)
+gedit_view_centering_set_centering (GeditViewCentering *container,
+				    gboolean            centering)
 {
-	g_return_if_fail (GEDIT_IS_VIEW_HOLDER (container));
+	g_return_if_fail (GEDIT_IS_VIEW_CENTERING (container));
 
 	container->priv->centering = centering != FALSE;
 
@@ -465,26 +465,26 @@ gedit_view_holder_set_centering (GeditViewHolder *container,
 }
 
 /**
- * gedit_view_holder_get_centering:
- * @container: a #GeditViewHolder.
+ * gedit_view_centering_get_centering:
+ * @container: a #GeditViewCentering.
  *
  * Return whether the #GtkSourceView child is centered or not.
  *
  * Return value: %TRUE if the #GtkSourceView child is centered
- * horizontally on the #GeditViewHolder container.
+ * horizontally on the #GeditViewCentering container.
  **/
 gboolean
-gedit_view_holder_get_centering (GeditViewHolder *container)
+gedit_view_centering_get_centering (GeditViewCentering *container)
 {
-	g_return_val_if_fail (GEDIT_IS_VIEW_HOLDER (container), FALSE);
+	g_return_val_if_fail (GEDIT_IS_VIEW_CENTERING (container), FALSE);
 
 	return container->priv->centering;
 }
 
-GeditViewHolder *
-gedit_view_holder_new (void)
+GeditViewCentering *
+gedit_view_centering_new (void)
 {
-	return g_object_new (GEDIT_TYPE_VIEW_HOLDER,
+	return g_object_new (GEDIT_TYPE_VIEW_CENTERING,
 	                     NULL);
 }
 
diff --git a/gedit/gedit-view-centering.h b/gedit/gedit-view-centering.h
new file mode 100644
index 000000000..a2dc64605
--- /dev/null
+++ b/gedit/gedit-view-centering.h
@@ -0,0 +1,67 @@
+/*
+ * gedit-view-centering.h
+ * This file is part of gedit
+ *
+ * Copyright (C) 2014 - Sébastien Lafargue
+ * Copyright (C) 2015 - Sébastien Wilmet
+ *
+ * Gedit is free software; you can redistribute this file and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Gedit is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __GEDIT_VIEW_CENTERING_H__
+#define __GEDIT_VIEW_CENTERING_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GEDIT_TYPE_VIEW_CENTERING		(gedit_view_centering_get_type())
+#define GEDIT_VIEW_CENTERING(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_VIEW_CENTERING, GeditViewCentering))
+#define GEDIT_VIEW_CENTERING_CONST(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_VIEW_CENTERING, GeditViewCentering const))
+#define GEDIT_VIEW_CENTERING_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GEDIT_TYPE_VIEW_CENTERING, GeditViewCenteringClass))
+#define GEDIT_IS_VIEW_CENTERING(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEDIT_TYPE_VIEW_CENTERING))
+#define GEDIT_IS_VIEW_CENTERING_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_VIEW_CENTERING))
+#define GEDIT_VIEW_CENTERING_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GEDIT_TYPE_VIEW_CENTERING, GeditViewCenteringClass))
+
+typedef struct _GeditViewCentering		GeditViewCentering;
+typedef struct _GeditViewCenteringClass		GeditViewCenteringClass;
+typedef struct _GeditViewCenteringPrivate	GeditViewCenteringPrivate;
+
+struct _GeditViewCentering
+{
+	GtkBin parent;
+
+	GeditViewCenteringPrivate *priv;
+};
+
+struct _GeditViewCenteringClass
+{
+	GtkBinClass parent_class;
+};
+
+GType			gedit_view_centering_get_type			(void) G_GNUC_CONST;
+
+GeditViewCentering *	gedit_view_centering_new			(void);
+
+void			gedit_view_centering_set_centering		(GeditViewCentering *container,
+									 gboolean            centering);
+
+gboolean		gedit_view_centering_get_centering		(GeditViewCentering *container);
+
+G_END_DECLS
+
+#endif /* __GEDIT_VIEW_CENTERING_H__ */
+
+/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index e349ef1c6..cd158ab62 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 
-#include "gedit-view-holder.h"
+#include "gedit-view-centering.h"
 #include "gedit-debug.h"
 #include "gedit-utils.h"
 #include "gedit-settings.h"
@@ -57,7 +57,7 @@ struct _GeditViewFrame
 	GSettings *editor_settings;
 
 	GeditView *view;
-	GeditViewHolder *view_holder;
+	GeditViewCentering *view_centering;
 	GtkFrame *map_frame;
 
 	SearchMode search_mode;
@@ -1417,7 +1417,7 @@ gedit_view_frame_class_init (GeditViewFrameClass *klass)
 	gtk_widget_class_set_template_from_resource (widget_class,
 	                                             "/org/gnome/gedit/ui/gedit-view-frame.ui");
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, view);
-	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, view_holder);
+	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, view_centering);
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, map_frame);
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, revealer);
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, search_entry);
@@ -1552,12 +1552,12 @@ gedit_view_frame_new (void)
 	return g_object_new (GEDIT_TYPE_VIEW_FRAME, NULL);
 }
 
-GeditViewHolder *
-gedit_view_frame_get_view_holder (GeditViewFrame *frame)
+GeditViewCentering *
+gedit_view_frame_get_view_centering (GeditViewFrame *frame)
 {
 	g_return_val_if_fail (GEDIT_IS_VIEW_FRAME (frame), NULL);
 
-	return frame->view_holder;
+	return frame->view_centering;
 }
 
 GeditView *
diff --git a/gedit/gedit-view-frame.h b/gedit/gedit-view-frame.h
index 874ebf85a..be977bb51 100644
--- a/gedit/gedit-view-frame.h
+++ b/gedit/gedit-view-frame.h
@@ -24,7 +24,7 @@
 #include <gtk/gtk.h>
 #include "gedit-document.h"
 #include "gedit-view.h"
-#include "gedit-view-holder.h"
+#include "gedit-view-centering.h"
 
 G_BEGIN_DECLS
 
@@ -33,7 +33,8 @@ G_DECLARE_FINAL_TYPE (GeditViewFrame, gedit_view_frame, GEDIT, VIEW_FRAME, GtkOv
 
 GeditViewFrame	*gedit_view_frame_new			(void);
 
-GeditViewHolder	*gedit_view_frame_get_view_holder	(GeditViewFrame *frame);
+GeditViewCentering
+		*gedit_view_frame_get_view_centering	(GeditViewFrame *frame);
 
 GeditView	*gedit_view_frame_get_view		(GeditViewFrame *frame);
 
diff --git a/gedit/gedit-view-holder.h b/gedit/gedit-view-holder.h
deleted file mode 100644
index 274608712..000000000
--- a/gedit/gedit-view-holder.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * gedit-view-holder.h
- * This file is part of gedit
- *
- * Copyright (C) 2014 - Sébastien Lafargue
- *
- * Gedit is free software; you can redistribute this file and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Gedit is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __GEDIT_VIEW_HOLDER_H__
-#define __GEDIT_VIEW_HOLDER_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GEDIT_TYPE_VIEW_HOLDER			(gedit_view_holder_get_type())
-#define GEDIT_VIEW_HOLDER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_VIEW_HOLDER, GeditViewHolder))
-#define GEDIT_VIEW_HOLDER_CONST(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_VIEW_HOLDER, GeditViewHolder const))
-#define GEDIT_VIEW_HOLDER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GEDIT_TYPE_VIEW_HOLDER, GeditViewHolderClass))
-#define GEDIT_IS_VIEW_HOLDER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEDIT_TYPE_VIEW_HOLDER))
-#define GEDIT_IS_VIEW_HOLDER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_VIEW_HOLDER))
-#define GEDIT_VIEW_HOLDER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GEDIT_TYPE_VIEW_HOLDER, GeditViewHolderClass))
-
-typedef struct _GeditViewHolder			GeditViewHolder;
-typedef struct _GeditViewHolderClass		GeditViewHolderClass;
-typedef struct _GeditViewHolderPrivate		GeditViewHolderPrivate;
-
-struct _GeditViewHolder
-{
-	GtkBin parent;
-
-	GeditViewHolderPrivate *priv;
-};
-
-struct _GeditViewHolderClass
-{
-	GtkBinClass parent_class;
-};
-
-GType			 gedit_view_holder_get_type				(void) G_GNUC_CONST;
-
-GeditViewHolder		*gedit_view_holder_new					(void);
-
-void			 gedit_view_holder_set_centering			(GeditViewHolder *container,
-			                                                         gboolean         centering);
-
-gboolean		 gedit_view_holder_get_centering			(GeditViewHolder *container);
-
-G_END_DECLS
-
-#endif /* __GEDIT_VIEW_HOLDER_H__ */
-
-/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 14f4b7006..78c7059df 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -42,7 +42,7 @@
 #include "gedit-tab.h"
 #include "gedit-tab-private.h"
 #include "gedit-view-frame.h"
-#include "gedit-view-holder.h"
+#include "gedit-view-centering.h"
 #include "gedit-utils.h"
 #include "gedit-commands.h"
 #include "gedit-commands-private.h"
@@ -265,14 +265,14 @@ update_view_centering (GeditTab *tab,
 		       gpointer  user_data)
 {
 	GeditViewFrame *view_frame;
-	GeditViewHolder *view_holder;
+	GeditViewCentering *view_centering;
 	gboolean is_fullscreen;
 
 	view_frame = _gedit_tab_get_view_frame (tab);
-	view_holder = gedit_view_frame_get_view_holder (view_frame);
+	view_centering = gedit_view_frame_get_view_centering (view_frame);
 
 	is_fullscreen = GPOINTER_TO_BOOLEAN (user_data);
-	gedit_view_holder_set_centering (view_holder, is_fullscreen);
+	gedit_view_centering_set_centering (view_centering, is_fullscreen);
 }
 
 static void
diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
index ec9f38bd1..932c96fc9 100644
--- a/gedit/resources/ui/gedit-view-frame.ui
+++ b/gedit/resources/ui/gedit-view-frame.ui
@@ -10,7 +10,7 @@
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
         <child>
-          <object class="GeditViewHolder" id="view_holder">
+          <object class="GeditViewCentering" id="view_centering">
             <property name="visible">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>