GNOME.org
 

[gnome-builder] prefs: rename IdePreferencesContainer to IdePreferencesBin

commit 6eec55cbcaa3ac22228e959629066bbe1c4b0cf0
Author: Christian Hergert <chergert redhat com>
Date:   Mon Nov 9 23:47:57 2015 -0800

    prefs: rename IdePreferencesContainer to IdePreferencesBin

 data/ui/ide-preferences-entry.ui                   |    2 +-
 data/ui/ide-preferences-font-button.ui             |    2 +-
 data/ui/ide-preferences-spin-button.ui             |    2 +-
 data/ui/ide-preferences-switch.ui                  |    2 +-
 libide/Makefile.am                                 |    6 +-
 ...ner-private.h => ide-preferences-bin-private.h} |   10 ++--
 ...eferences-container.c => ide-preferences-bin.c} |   70 ++++++++++----------
 ...eferences-container.h => ide-preferences-bin.h} |   16 ++--
 libide/preferences/ide-preferences-entry.c         |    2 +-
 libide/preferences/ide-preferences-entry.h         |    6 +-
 libide/preferences/ide-preferences-font-button.c   |    4 +-
 libide/preferences/ide-preferences-font-button.h   |    2 +-
 libide/preferences/ide-preferences-group.c         |    4 +-
 libide/preferences/ide-preferences-perspective.c   |    5 +-
 libide/preferences/ide-preferences-spin-button.c   |    6 +-
 libide/preferences/ide-preferences-spin-button.h   |    4 +-
 libide/preferences/ide-preferences-switch.c        |    6 +-
 libide/preferences/ide-preferences-switch.h        |    4 +-
 18 files changed, 76 insertions(+), 77 deletions(-)
---
diff --git a/data/ui/ide-preferences-entry.ui b/data/ui/ide-preferences-entry.ui
index 059e20c..36a2f01 100644
--- a/data/ui/ide-preferences-entry.ui
+++ b/data/ui/ide-preferences-entry.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.18 -->
-  <template class="IdePreferencesEntry" parent="IdePreferencesContainer">
+  <template class="IdePreferencesEntry" parent="IdePreferencesBin">
     <child>
       <object class="GtkBox">
         <property name="spacing">12</property>
diff --git a/data/ui/ide-preferences-font-button.ui b/data/ui/ide-preferences-font-button.ui
index 50ff3c4..823e8e8 100644
--- a/data/ui/ide-preferences-font-button.ui
+++ b/data/ui/ide-preferences-font-button.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.18 -->
-  <template class="IdePreferencesFontButton" parent="IdePreferencesContainer">
+  <template class="IdePreferencesFontButton" parent="IdePreferencesBin">
     <child>
       <object class="GtkBox" id="box">
         <property name="orientation">horizontal</property>
diff --git a/data/ui/ide-preferences-spin-button.ui b/data/ui/ide-preferences-spin-button.ui
index 1e4eb79..0b69920 100644
--- a/data/ui/ide-preferences-spin-button.ui
+++ b/data/ui/ide-preferences-spin-button.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.18 -->
-  <template class="IdePreferencesSpinButton" parent="IdePreferencesContainer">
+  <template class="IdePreferencesSpinButton" parent="IdePreferencesBin">
     <property name="vexpand">false</property>
     <child>
       <object class="GtkBox">
diff --git a/data/ui/ide-preferences-switch.ui b/data/ui/ide-preferences-switch.ui
index 10996ef..c68eb3c 100644
--- a/data/ui/ide-preferences-switch.ui
+++ b/data/ui/ide-preferences-switch.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.18 -->
-  <template class="IdePreferencesSwitch" parent="IdePreferencesContainer">
+  <template class="IdePreferencesSwitch" parent="IdePreferencesBin">
     <property name="vexpand">false</property>
     <child>
       <object class="GtkBox">
diff --git a/libide/Makefile.am b/libide/Makefile.am
index e1d7d50..56bd626 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -272,9 +272,9 @@ libide_1_0_la_SOURCES = \
        modelines/modeline-parser.h \
        preferences/ide-preferences-builtin.c \
        preferences/ide-preferences-builtin.h \
-       preferences/ide-preferences-container.c \
-       preferences/ide-preferences-container.h \
-       preferences/ide-preferences-container-private.h \
+       preferences/ide-preferences-bin.c \
+       preferences/ide-preferences-bin.h \
+       preferences/ide-preferences-bin-private.h \
        preferences/ide-preferences-entry.c \
        preferences/ide-preferences-entry.h \
        preferences/ide-preferences-font-button.c \
diff --git a/libide/preferences/ide-preferences-container-private.h 
b/libide/preferences/ide-preferences-bin-private.h
similarity index 77%
rename from libide/preferences/ide-preferences-container-private.h
rename to libide/preferences/ide-preferences-bin-private.h
index ef60b31..a5a79d8 100644
--- a/libide/preferences/ide-preferences-container-private.h
+++ b/libide/preferences/ide-preferences-bin-private.h
@@ -1,4 +1,4 @@
-/* ide-preferences-container-private.h
+/* ide-preferences-bin-private.h
  *
  * Copyright (C) 2015 Christian Hergert <chergert redhat com>
  *
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IDE_PREFERENCES_CONTAINER_PRIVATE_H
-#define IDE_PREFERENCES_CONTAINER_PRIVATE_H
+#ifndef IDE_PREFERENCES_BIN_PRIVATE_H
+#define IDE_PREFERENCES_BIN_PRIVATE_H
 
 #include "ide-preferences-container.h"
 
 G_BEGIN_DECLS
 
-void _ide_preferences_container_set_map (IdePreferencesContainer *self,
+void _ide_preferences_container_set_map (IdePreferencesBin *self,
                                          GHashTable              *map);
 
 G_END_DECLS
 
-#endif /* IDE_PREFERENCES_CONTAINER_PRIVATE_H */
+#endif /* IDE_PREFERENCES_BIN_PRIVATE_H */
diff --git a/libide/preferences/ide-preferences-container.c b/libide/preferences/ide-preferences-bin.c
similarity index 73%
rename from libide/preferences/ide-preferences-container.c
rename to libide/preferences/ide-preferences-bin.c
index 67d5a88..900d2e3 100644
--- a/libide/preferences/ide-preferences-container.c
+++ b/libide/preferences/ide-preferences-bin.c
@@ -1,4 +1,4 @@
-/* ide-preferences-container.c
+/* ide-preferences-bin.c
  *
  * Copyright (C) 2015 Christian Hergert <chergert redhat com>
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ide-preferences-container.h"
+#include "ide-preferences-bin.h"
 
 typedef struct
 {
@@ -29,9 +29,9 @@ typedef struct
   gchar      *path;
   GSettings  *settings;
   GHashTable *map;
-} IdePreferencesContainerPrivate;
+} IdePreferencesBinPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (IdePreferencesContainer, ide_preferences_container, GTK_TYPE_BIN)
+G_DEFINE_TYPE_WITH_PRIVATE (IdePreferencesBin, ide_preferences_bin, GTK_TYPE_BIN)
 
 enum {
   PROP_0,
@@ -46,10 +46,10 @@ static GParamSpec *properties [LAST_PROP];
 static GHashTable *settings_cache;
 
 static void
-ide_preferences_container_finalize (GObject *object)
+ide_preferences_bin_finalize (GObject *object)
 {
-  IdePreferencesContainer *self = (IdePreferencesContainer *)object;
-  IdePreferencesContainerPrivate *priv = ide_preferences_container_get_instance_private (self);
+  IdePreferencesBin *self = (IdePreferencesBin *)object;
+  IdePreferencesBinPrivate *priv = ide_preferences_bin_get_instance_private (self);
 
   g_clear_pointer (&priv->schema_id, g_free);
   g_clear_pointer (&priv->path, g_free);
@@ -57,17 +57,17 @@ ide_preferences_container_finalize (GObject *object)
   g_clear_pointer (&priv->map, g_hash_table_unref);
   g_clear_object (&priv->settings);
 
-  G_OBJECT_CLASS (ide_preferences_container_parent_class)->finalize (object);
+  G_OBJECT_CLASS (ide_preferences_bin_parent_class)->finalize (object);
 }
 
 static void
-ide_preferences_container_get_property (GObject    *object,
+ide_preferences_bin_get_property (GObject    *object,
                                         guint       prop_id,
                                         GValue     *value,
                                         GParamSpec *pspec)
 {
-  IdePreferencesContainer *self = IDE_PREFERENCES_CONTAINER (object);
-  IdePreferencesContainerPrivate *priv = ide_preferences_container_get_instance_private (self);
+  IdePreferencesBin *self = IDE_PREFERENCES_BIN (object);
+  IdePreferencesBinPrivate *priv = ide_preferences_bin_get_instance_private (self);
 
   switch (prop_id)
     {
@@ -93,13 +93,13 @@ ide_preferences_container_get_property (GObject    *object,
 }
 
 static void
-ide_preferences_container_set_property (GObject      *object,
+ide_preferences_bin_set_property (GObject      *object,
                                         guint         prop_id,
                                         const GValue *value,
                                         GParamSpec   *pspec)
 {
-  IdePreferencesContainer *self = IDE_PREFERENCES_CONTAINER (object);
-  IdePreferencesContainerPrivate *priv = ide_preferences_container_get_instance_private (self);
+  IdePreferencesBin *self = IDE_PREFERENCES_BIN (object);
+  IdePreferencesBinPrivate *priv = ide_preferences_bin_get_instance_private (self);
 
   switch (prop_id)
     {
@@ -125,13 +125,13 @@ ide_preferences_container_set_property (GObject      *object,
 }
 
 static void
-ide_preferences_container_class_init (IdePreferencesContainerClass *klass)
+ide_preferences_bin_class_init (IdePreferencesBinClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = ide_preferences_container_finalize;
-  object_class->get_property = ide_preferences_container_get_property;
-  object_class->set_property = ide_preferences_container_set_property;
+  object_class->finalize = ide_preferences_bin_finalize;
+  object_class->get_property = ide_preferences_bin_get_property;
+  object_class->set_property = ide_preferences_bin_set_property;
 
   properties [PROP_KEYWORDS] =
     g_param_spec_string ("keywords",
@@ -169,21 +169,21 @@ ide_preferences_container_class_init (IdePreferencesContainerClass *klass)
 }
 
 static void
-ide_preferences_container_init (IdePreferencesContainer *self)
+ide_preferences_bin_init (IdePreferencesBin *self)
 {
 }
 
 static gchar *
-ide_preferences_container_expand (IdePreferencesContainer *self,
+ide_preferences_bin_expand (IdePreferencesBin *self,
                                   const gchar             *spec)
 {
-  IdePreferencesContainerPrivate *priv = ide_preferences_container_get_instance_private (self);
+  IdePreferencesBinPrivate *priv = ide_preferences_bin_get_instance_private (self);
   GHashTableIter iter;
   const gchar *key;
   const gchar *value;
   gchar *expanded;
 
-  g_assert (IDE_IS_PREFERENCES_CONTAINER (self));
+  g_assert (IDE_IS_PREFERENCES_BIN (self));
 
   if (spec == NULL)
     return NULL;
@@ -211,7 +211,7 @@ ide_preferences_container_expand (IdePreferencesContainer *self,
 }
 
 static void
-ide_preferences_container_evict_settings (gpointer  data,
+ide_preferences_bin_evict_settings (gpointer  data,
                                           GObject  *where_object_was)
 {
   g_assert (data != NULL);
@@ -221,7 +221,7 @@ ide_preferences_container_evict_settings (gpointer  data,
 }
 
 static void
-ide_preferences_container_cache_settings (const gchar *hash_key,
+ide_preferences_bin_cache_settings (const gchar *hash_key,
                                           GSettings   *settings)
 {
   gchar *key;
@@ -231,20 +231,20 @@ ide_preferences_container_cache_settings (const gchar *hash_key,
 
   key = g_strdup (hash_key);
   g_hash_table_insert (settings_cache, key, settings);
-  g_object_weak_ref (G_OBJECT (settings), ide_preferences_container_evict_settings, key);
+  g_object_weak_ref (G_OBJECT (settings), ide_preferences_bin_evict_settings, key);
 }
 
 /**
- * ide_preferences_container_get_settings:
+ * ide_preferences_bin_get_settings:
  *
  * Returns: (nullable) (transfer full): A #GSettings
  */
 GSettings *
-ide_preferences_container_get_settings (IdePreferencesContainer *self)
+ide_preferences_bin_get_settings (IdePreferencesBin *self)
 {
-  IdePreferencesContainerPrivate *priv = ide_preferences_container_get_instance_private (self);
+  IdePreferencesBinPrivate *priv = ide_preferences_bin_get_instance_private (self);
 
-  g_return_val_if_fail (IDE_IS_PREFERENCES_CONTAINER (self), NULL);
+  g_return_val_if_fail (IDE_IS_PREFERENCES_BIN (self), NULL);
 
   if (priv->settings == NULL)
     {
@@ -255,8 +255,8 @@ ide_preferences_container_get_settings (IdePreferencesContainer *self)
       if (priv->schema_id == NULL)
         return NULL;
 
-      resolved_schema_id = ide_preferences_container_expand (self, priv->schema_id);
-      resolved_path = ide_preferences_container_expand (self, priv->path);
+      resolved_schema_id = ide_preferences_bin_expand (self, priv->schema_id);
+      resolved_path = ide_preferences_bin_expand (self, priv->path);
       hash_key = g_strdup_printf ("%s|%s",
                                   resolved_schema_id ?: "",
                                   resolved_path ?: "");
@@ -275,7 +275,7 @@ ide_preferences_container_get_settings (IdePreferencesContainer *self)
                 priv->settings = g_settings_new_with_path (resolved_schema_id, resolved_path);
               else
                 priv->settings = g_settings_new (resolved_schema_id);
-              ide_preferences_container_cache_settings (hash_key, priv->settings);
+              ide_preferences_bin_cache_settings (hash_key, priv->settings);
             }
 
           g_clear_pointer (&schema, g_settings_schema_unref);
@@ -294,12 +294,12 @@ ide_preferences_container_get_settings (IdePreferencesContainer *self)
 }
 
 void
-_ide_preferences_container_set_map (IdePreferencesContainer *self,
+_ide_preferences_bin_set_map (IdePreferencesBin *self,
                                     GHashTable              *map)
 {
-  IdePreferencesContainerPrivate *priv = ide_preferences_container_get_instance_private (self);
+  IdePreferencesBinPrivate *priv = ide_preferences_bin_get_instance_private (self);
 
-  g_return_if_fail (IDE_IS_PREFERENCES_CONTAINER (self));
+  g_return_if_fail (IDE_IS_PREFERENCES_BIN (self));
 
   if (map != priv->map)
     {
diff --git a/libide/preferences/ide-preferences-container.h b/libide/preferences/ide-preferences-bin.h
similarity index 63%
rename from libide/preferences/ide-preferences-container.h
rename to libide/preferences/ide-preferences-bin.h
index 818d1f7..ceeeae6 100644
--- a/libide/preferences/ide-preferences-container.h
+++ b/libide/preferences/ide-preferences-bin.h
@@ -1,4 +1,4 @@
-/* ide-preferences-container.h
+/* ide-preferences-bin.h
  *
  * Copyright (C) 2015 Christian Hergert <chergert redhat com>
  *
@@ -16,24 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IDE_PREFERENCES_CONTAINER_H
-#define IDE_PREFERENCES_CONTAINER_H
+#ifndef IDE_PREFERENCES_BIN_H
+#define IDE_PREFERENCES_BIN_H
 
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-#define IDE_TYPE_PREFERENCES_CONTAINER (ide_preferences_container_get_type())
+#define IDE_TYPE_PREFERENCES_BIN (ide_preferences_bin_get_type())
 
-G_DECLARE_DERIVABLE_TYPE (IdePreferencesContainer, ide_preferences_container, IDE, PREFERENCES_CONTAINER, 
GtkBin)
+G_DECLARE_DERIVABLE_TYPE (IdePreferencesBin, ide_preferences_bin, IDE, PREFERENCES_BIN, GtkBin)
 
-struct _IdePreferencesContainerClass
+struct _IdePreferencesBinClass
 {
   GtkBinClass parent_class;
 };
 
-GSettings *ide_preferences_container_get_settings (IdePreferencesContainer *self);
+GSettings *ide_preferences_bin_get_settings (IdePreferencesBin *self);
 
 G_END_DECLS
 
-#endif /* IDE_PREFERENCES_CONTAINER_H */
+#endif /* IDE_PREFERENCES_BIN_H */
diff --git a/libide/preferences/ide-preferences-entry.c b/libide/preferences/ide-preferences-entry.c
index 8d27699..6f4755b 100644
--- a/libide/preferences/ide-preferences-entry.c
+++ b/libide/preferences/ide-preferences-entry.c
@@ -39,7 +39,7 @@ enum {
   LAST_SIGNAL
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (IdePreferencesEntry, ide_preferences_entry, IDE_TYPE_PREFERENCES_CONTAINER)
+G_DEFINE_TYPE_WITH_PRIVATE (IdePreferencesEntry, ide_preferences_entry, IDE_TYPE_PREFERENCES_BIN)
 
 static GParamSpec *properties [LAST_PROP];
 static guint signals [LAST_SIGNAL];
diff --git a/libide/preferences/ide-preferences-entry.h b/libide/preferences/ide-preferences-entry.h
index 3dfff31..a11cbd8 100644
--- a/libide/preferences/ide-preferences-entry.h
+++ b/libide/preferences/ide-preferences-entry.h
@@ -21,17 +21,17 @@
 
 #include <gtk/gtk.h>
 
-#include "ide-preferences-container.h"
+#include "ide-preferences-bin.h"
 
 G_BEGIN_DECLS
 
 #define IDE_TYPE_PREFERENCES_ENTRY (ide_preferences_entry_get_type())
 
-G_DECLARE_DERIVABLE_TYPE (IdePreferencesEntry, ide_preferences_entry, IDE, PREFERENCES_ENTRY, 
IdePreferencesContainer)
+G_DECLARE_DERIVABLE_TYPE (IdePreferencesEntry, ide_preferences_entry, IDE, PREFERENCES_ENTRY, 
IdePreferencesBin)
 
 struct _IdePreferencesEntryClass
 {
-  IdePreferencesContainerClass parent_class;
+  IdePreferencesBinClass parent_class;
 };
 
 GtkWidget *ide_preferences_entry_get_title_widget (IdePreferencesEntry *self);
diff --git a/libide/preferences/ide-preferences-font-button.c 
b/libide/preferences/ide-preferences-font-button.c
index 7e9470d..70c02b1 100644
--- a/libide/preferences/ide-preferences-font-button.c
+++ b/libide/preferences/ide-preferences-font-button.c
@@ -33,7 +33,7 @@ struct _IdePreferencesFontButton
   GtkFontChooserWidget *chooser;
 };
 
-G_DEFINE_TYPE (IdePreferencesFontButton, ide_preferences_font_button, IDE_TYPE_PREFERENCES_CONTAINER)
+G_DEFINE_TYPE (IdePreferencesFontButton, ide_preferences_font_button, IDE_TYPE_PREFERENCES_BIN)
 
 enum {
   PROP_0,
@@ -110,7 +110,7 @@ ide_preferences_font_button_constructed (GObject *object)
 
   g_assert (IDE_IS_PREFERENCES_FONT_BUTTON (self));
 
-  self->settings = ide_preferences_container_get_settings (IDE_PREFERENCES_CONTAINER (self));
+  self->settings = ide_preferences_bin_get_settings (IDE_PREFERENCES_BIN (self));
 
   if (self->settings == NULL)
     {
diff --git a/libide/preferences/ide-preferences-font-button.h 
b/libide/preferences/ide-preferences-font-button.h
index 50a7acd..7c1648e 100644
--- a/libide/preferences/ide-preferences-font-button.h
+++ b/libide/preferences/ide-preferences-font-button.h
@@ -19,7 +19,7 @@
 #ifndef IDE_PREFERENCES_FONT_BUTTON_H
 #define IDE_PREFERENCES_FONT_BUTTON_H
 
-#include "ide-preferences-container.h"
+#include "ide-preferences-bin.h"
 
 G_BEGIN_DECLS
 
diff --git a/libide/preferences/ide-preferences-group.c b/libide/preferences/ide-preferences-group.c
index b628426..0243676 100644
--- a/libide/preferences/ide-preferences-group.c
+++ b/libide/preferences/ide-preferences-group.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ide-preferences-container.h"
+#include "ide-preferences-bin.h"
 #include "ide-preferences-group.h"
 
 struct _IdePreferencesGroup
@@ -177,7 +177,7 @@ ide_preferences_group_add (IdePreferencesGroup *self,
   gint position = -1;
 
   g_return_if_fail (IDE_IS_PREFERENCES_GROUP (self));
-  g_return_if_fail (IDE_IS_PREFERENCES_CONTAINER (widget));
+  g_return_if_fail (IDE_IS_PREFERENCES_BIN (widget));
 
   if (self->is_list)
     {
diff --git a/libide/preferences/ide-preferences-perspective.c 
b/libide/preferences/ide-preferences-perspective.c
index 199a039..850cf8d 100644
--- a/libide/preferences/ide-preferences-perspective.c
+++ b/libide/preferences/ide-preferences-perspective.c
@@ -25,7 +25,6 @@
 #include "ide-preferences.h"
 #include "ide-preferences-addin.h"
 #include "ide-preferences-builtin.h"
-#include "ide-preferences-container.h"
 #include "ide-preferences-font-button.h"
 #include "ide-preferences-group.h"
 #include "ide-preferences-page.h"
@@ -574,7 +573,7 @@ ide_preferences_perspective_add_custom (IdePreferences *preferences,
                                         gint            priority)
 {
   IdePreferencesPerspective *self = (IdePreferencesPerspective *)preferences;
-  IdePreferencesContainer *container;
+  IdePreferencesBin *container;
   IdePreferencesGroup *group;
   GtkWidget *page;
   guint widget_id;
@@ -601,7 +600,7 @@ ide_preferences_perspective_add_custom (IdePreferences *preferences,
       return 0;
     }
 
-  container = g_object_new (IDE_TYPE_PREFERENCES_CONTAINER,
+  container = g_object_new (IDE_TYPE_PREFERENCES_BIN,
                             "child", widget,
                             "keywords", keywords,
                             "priority", priority,
diff --git a/libide/preferences/ide-preferences-spin-button.c 
b/libide/preferences/ide-preferences-spin-button.c
index e67af50..af909a3 100644
--- a/libide/preferences/ide-preferences-spin-button.c
+++ b/libide/preferences/ide-preferences-spin-button.c
@@ -21,7 +21,7 @@
 
 struct _IdePreferencesSpinButton
 {
-  IdePreferencesContainer  parent_instance;
+  IdePreferencesBin  parent_instance;
 
   guint                    updating : 1;
 
@@ -35,7 +35,7 @@ struct _IdePreferencesSpinButton
   GtkLabel                *subtitle;
 };
 
-G_DEFINE_TYPE (IdePreferencesSpinButton, ide_preferences_spin_button, IDE_TYPE_PREFERENCES_CONTAINER)
+G_DEFINE_TYPE (IdePreferencesSpinButton, ide_preferences_spin_button, IDE_TYPE_PREFERENCES_BIN)
 
 enum {
   PROP_0,
@@ -179,7 +179,7 @@ ide_preferences_spin_button_constructed (GObject *object)
 
   g_assert (IDE_IS_PREFERENCES_SPIN_BUTTON (self));
 
-  self->settings = ide_preferences_container_get_settings (IDE_PREFERENCES_CONTAINER (self));
+  self->settings = ide_preferences_bin_get_settings (IDE_PREFERENCES_BIN (self));
 
   if (self->settings == NULL)
     {
diff --git a/libide/preferences/ide-preferences-spin-button.h 
b/libide/preferences/ide-preferences-spin-button.h
index c3b3cc8..60a6b18 100644
--- a/libide/preferences/ide-preferences-spin-button.h
+++ b/libide/preferences/ide-preferences-spin-button.h
@@ -21,13 +21,13 @@
 
 #include <gtk/gtk.h>
 
-#include "ide-preferences-container.h"
+#include "ide-preferences-bin.h"
 
 G_BEGIN_DECLS
 
 #define IDE_TYPE_PREFERENCES_SPIN_BUTTON (ide_preferences_spin_button_get_type())
 
-G_DECLARE_FINAL_TYPE (IdePreferencesSpinButton, ide_preferences_spin_button, IDE, PREFERENCES_SPIN_BUTTON, 
IdePreferencesContainer)
+G_DECLARE_FINAL_TYPE (IdePreferencesSpinButton, ide_preferences_spin_button, IDE, PREFERENCES_SPIN_BUTTON, 
IdePreferencesBin)
 
 G_END_DECLS
 
diff --git a/libide/preferences/ide-preferences-switch.c b/libide/preferences/ide-preferences-switch.c
index 7ddeaa6..df08a3e 100644
--- a/libide/preferences/ide-preferences-switch.c
+++ b/libide/preferences/ide-preferences-switch.c
@@ -21,7 +21,7 @@
 
 struct _IdePreferencesSwitch
 {
-  IdePreferencesContainer parent_instance;
+  IdePreferencesBin parent_instance;
 
   guint     is_radio : 1;
   guint     updating : 1;
@@ -36,7 +36,7 @@ struct _IdePreferencesSwitch
   GtkImage  *image;
 };
 
-G_DEFINE_TYPE (IdePreferencesSwitch, ide_preferences_switch, IDE_TYPE_PREFERENCES_CONTAINER)
+G_DEFINE_TYPE (IdePreferencesSwitch, ide_preferences_switch, IDE_TYPE_PREFERENCES_BIN)
 
 enum {
   PROP_0,
@@ -112,7 +112,7 @@ ide_preferences_switch_constructed (GObject *object)
 
   g_assert (IDE_IS_PREFERENCES_SWITCH (self));
 
-  self->settings = ide_preferences_container_get_settings (IDE_PREFERENCES_CONTAINER (self));
+  self->settings = ide_preferences_bin_get_settings (IDE_PREFERENCES_BIN (self));
 
   if (self->settings == NULL)
     {
diff --git a/libide/preferences/ide-preferences-switch.h b/libide/preferences/ide-preferences-switch.h
index f4b2cdd..abe611d 100644
--- a/libide/preferences/ide-preferences-switch.h
+++ b/libide/preferences/ide-preferences-switch.h
@@ -19,13 +19,13 @@
 #ifndef IDE_PREFERENCES_SWITCH_H
 #define IDE_PREFERENCES_SWITCH_H
 
-#include "ide-preferences-container.h"
+#include "ide-preferences-bin.h"
 
 G_BEGIN_DECLS
 
 #define IDE_TYPE_PREFERENCES_SWITCH (ide_preferences_switch_get_type())
 
-G_DECLARE_FINAL_TYPE (IdePreferencesSwitch, ide_preferences_switch, IDE, PREFERENCES_SWITCH, 
IdePreferencesContainer)
+G_DECLARE_FINAL_TYPE (IdePreferencesSwitch, ide_preferences_switch, IDE, PREFERENCES_SWITCH, 
IdePreferencesBin)
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]