[devhelp] DhSettings: rename get_instance() -> get_singleton()

[Sébastien Wilmet <swilmet src gnome org>]

commit 5ca84d3e2091e73427d94dcb519091360985822c
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Apr 28 15:21:24 2017 +0200

    DhSettings: rename get_instance() -> get_singleton()
    
    It's actually clearer, now that it's a real singleton.

 src/dh-assistant.c    |    4 ++--
 src/dh-book-manager.c |    6 +++---
 src/dh-preferences.c  |    2 +-
 src/dh-settings.c     |    2 +-
 src/dh-settings.h     |    2 +-
 src/dh-window.c       |   10 +++++-----
 6 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/dh-assistant.c b/src/dh-assistant.c
index 197cbd5..51d9239 100644
--- a/src/dh-assistant.c
+++ b/src/dh-assistant.c
@@ -61,7 +61,7 @@ dh_assistant_configure_event (GtkWidget         *widget,
 {
         DhSettings *settings;
 
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
 
         dh_util_window_settings_save (GTK_WINDOW (widget),
                                       dh_settings_peek_assistant_settings (settings),
@@ -96,7 +96,7 @@ dh_assistant_init (DhAssistant *assistant)
                           G_CALLBACK (assistant_view_open_uri_cb),
                           assistant);
 
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
 
         dh_util_window_settings_restore (GTK_WINDOW (assistant),
                                          dh_settings_peek_assistant_settings (settings),
diff --git a/src/dh-book-manager.c b/src/dh-book-manager.c
index c74f600..c686bb2 100644
--- a/src/dh-book-manager.c
+++ b/src/dh-book-manager.c
@@ -248,7 +248,7 @@ dh_book_manager_init (DhBookManager *book_manager)
 
         book_manager_load_books_disabled (book_manager);
 
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         g_settings_bind (dh_settings_peek_contents_settings (settings),
                          "group-books-by-language",
                          book_manager,
@@ -304,7 +304,7 @@ book_manager_load_books_disabled (DhBookManager *book_manager)
         gchar **books_disabled_strv;
         gchar **i;
 
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         books_disabled_strv = g_settings_get_strv (
                 dh_settings_peek_contents_settings (settings),
                 "books-disabled");
@@ -338,7 +338,7 @@ book_manager_store_books_disabled (DhBookManager *book_manager)
         variant = g_variant_builder_end (builder);
         g_variant_builder_unref (builder);
 
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         g_settings_set_value (dh_settings_peek_contents_settings (settings),
                               "books-disabled",
                               variant);
diff --git a/src/dh-preferences.c b/src/dh-preferences.c
index 92781f1..a0757a0 100644
--- a/src/dh-preferences.c
+++ b/src/dh-preferences.c
@@ -639,7 +639,7 @@ dh_preferences_init (DhPreferences *prefs)
                                                        prefs);
 
         /* setup GSettings bindings */
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         settings_fonts = dh_settings_peek_fonts_settings (settings);
         settings_contents = dh_settings_peek_contents_settings (settings);
         g_settings_bind (settings_fonts, "use-system-fonts",
diff --git a/src/dh-settings.c b/src/dh-settings.c
index 3f6240a..7bb7f35 100644
--- a/src/dh-settings.c
+++ b/src/dh-settings.c
@@ -130,7 +130,7 @@ dh_settings_init (DhSettings *self)
 }
 
 DhSettings *
-dh_settings_get_instance (void)
+dh_settings_get_singleton (void)
 {
         if (singleton == NULL)
                 singleton = g_object_new (DH_TYPE_SETTINGS, NULL);
diff --git a/src/dh-settings.h b/src/dh-settings.h
index 1a9aad5..fd1081f 100644
--- a/src/dh-settings.h
+++ b/src/dh-settings.h
@@ -51,7 +51,7 @@ struct _DhSettingsClass {
 
 GType           dh_settings_get_type                    (void) G_GNUC_CONST;
 
-DhSettings *    dh_settings_get_instance                (void);
+DhSettings *    dh_settings_get_singleton               (void);
 
 void            dh_settings_free_singleton              (void);
 
diff --git a/src/dh-window.c b/src/dh-window.c
index 311cfa7..39ee405 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -567,7 +567,7 @@ update_fonts_on_dpi_change (DhWindow *window)
 
         priv = dh_window_get_instance_private (window);
 
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         dh_settings_get_selected_fonts (settings, &font_fixed, &font_variable);
 
         if (font_fixed != NULL && font_variable != NULL) {
@@ -641,7 +641,7 @@ dh_window_configure_event (GtkWidget         *window,
 {
         DhSettings *settings;
 
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         dh_util_window_settings_save (GTK_WINDOW (window),
                                       dh_settings_peek_window_settings (settings),
                                       TRUE);
@@ -671,7 +671,7 @@ dh_window_init (DhWindow *window)
         }
 
         /* handle settings */
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         g_signal_connect_object (settings,
                                  "fonts-changed",
                                  G_CALLBACK (settings_fonts_changed_cb),
@@ -1333,7 +1333,7 @@ window_open_new_tab (DhWindow    *window,
         gtk_widget_show (view);
 
         /* get the current fonts and set them on the new view */
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         dh_settings_get_selected_fonts (settings, &font_fixed, &font_variable);
         dh_util_view_set_font (WEBKIT_WEB_VIEW (view), font_fixed, font_variable);
         g_free (font_fixed);
@@ -1583,7 +1583,7 @@ dh_window_new (DhApp *application)
 
         window_populate (window);
 
-        settings = dh_settings_get_instance ();
+        settings = dh_settings_get_singleton ();
         dh_util_window_settings_restore (GTK_WINDOW (window),
                                          dh_settings_peek_window_settings (settings),
                                          TRUE);