[devhelp] BookManager: remove even more code
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devhelp] BookManager: remove even more code
- Date: Mon, 30 Apr 2018 18:12:05 +0000 (UTC)
commit 102a476acddf20ac3ed00de94ee1af9cd6011df5
Author: Sébastien Wilmet <swilmet gnome org>
Date: Mon Apr 30 16:00:05 2018 +0200
BookManager: remove even more code
gnome-builder doesn't use DhBookManager, only Anjuta still uses it. Keep
the minimum API to not break Anjuta (it's not a problem if the
DhBookManager is empty, the default DhProfile will be used).
devhelp/dh-book-manager.c | 125 -----------------------------------
devhelp/dh-book-manager.h | 7 --
devhelp/dh-init.c | 2 -
docs/reference/devhelp-sections.txt | 2 -
4 files changed, 0 insertions(+), 136 deletions(-)
---
diff --git a/devhelp/dh-book-manager.c b/devhelp/dh-book-manager.c
index b6b4eff..a499960 100644
--- a/devhelp/dh-book-manager.c
+++ b/devhelp/dh-book-manager.c
@@ -24,7 +24,6 @@
*/
#include "dh-book-manager.h"
-#include "dh-book.h"
/**
* SECTION:dh-book-manager
@@ -40,95 +39,11 @@
* </warning>
*/
-enum {
- SIGNAL_BOOK_CREATED,
- SIGNAL_BOOK_DELETED,
- SIGNAL_BOOK_ENABLED,
- SIGNAL_BOOK_DISABLED,
- N_SIGNALS
-};
-
-static guint signals[N_SIGNALS] = { 0 };
-
-static DhBookManager *singleton = NULL;
-
G_DEFINE_TYPE (DhBookManager, dh_book_manager, G_TYPE_OBJECT);
static void
-dh_book_manager_finalize (GObject *object)
-{
- if (singleton == DH_BOOK_MANAGER (object))
- singleton = NULL;
-
- G_OBJECT_CLASS (dh_book_manager_parent_class)->finalize (object);
-}
-
-static void
dh_book_manager_class_init (DhBookManagerClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->finalize = dh_book_manager_finalize;
-
- /**
- * DhBookManager::book-created:
- * @book_manager: the #DhBookManager.
- * @book: the created #DhBook.
- */
- signals[SIGNAL_BOOK_CREATED] =
- g_signal_new ("book-created",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL, NULL,
- G_TYPE_NONE,
- 1,
- DH_TYPE_BOOK);
-
- /**
- * DhBookManager::book-deleted:
- * @book_manager: the #DhBookManager.
- * @book: the deleted #DhBook.
- */
- signals[SIGNAL_BOOK_DELETED] =
- g_signal_new ("book-deleted",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL, NULL,
- G_TYPE_NONE,
- 1,
- DH_TYPE_BOOK);
-
- /**
- * DhBookManager::book-enabled:
- * @book_manager: the #DhBookManager.
- * @book: the enabled #DhBook.
- */
- signals[SIGNAL_BOOK_ENABLED] =
- g_signal_new ("book-enabled",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL, NULL,
- G_TYPE_NONE,
- 1,
- DH_TYPE_BOOK);
-
- /**
- * DhBookManager::book-disabled:
- * @book_manager: the #DhBookManager.
- * @book: the disabled #DhBook.
- */
- signals[SIGNAL_BOOK_DISABLED] =
- g_signal_new ("book-disabled",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL, NULL,
- G_TYPE_NONE,
- 1,
- DH_TYPE_BOOK);
}
static void
@@ -149,33 +64,6 @@ dh_book_manager_new (void)
}
/**
- * dh_book_manager_get_singleton:
- *
- * Returns: (transfer none): the #DhBookManager singleton instance.
- * Since: 3.26
- */
-DhBookManager *
-dh_book_manager_get_singleton (void)
-{
- if (singleton == NULL)
- singleton = g_object_new (DH_TYPE_BOOK_MANAGER, NULL);
-
- return singleton;
-}
-
-void
-_dh_book_manager_unref_singleton (void)
-{
- if (singleton != NULL)
- g_object_unref (singleton);
-
- /* singleton is not set to NULL here, it is set to NULL in
- * dh_book_manager_finalize() (i.e. when we are sure that the ref count
- * reaches 0).
- */
-}
-
-/**
* dh_book_manager_populate:
* @book_manager: a #DhBookManager.
*
@@ -185,16 +73,3 @@ void
dh_book_manager_populate (DhBookManager *book_manager)
{
}
-
-/**
- * dh_book_manager_get_books:
- * @book_manager: a #DhBookManager.
- *
- * Returns: (element-type DhBook) (transfer none): the list of all #DhBook's
- * found.
- */
-GList *
-dh_book_manager_get_books (DhBookManager *book_manager)
-{
- return NULL;
-}
diff --git a/devhelp/dh-book-manager.h b/devhelp/dh-book-manager.h
index 22588f8..8251e58 100644
--- a/devhelp/dh-book-manager.h
+++ b/devhelp/dh-book-manager.h
@@ -49,19 +49,12 @@ struct _DhBookManagerClass {
GType dh_book_manager_get_type (void) G_GNUC_CONST;
-DhBookManager * dh_book_manager_get_singleton (void);
-
-GList * dh_book_manager_get_books (DhBookManager *book_manager);
-
G_DEPRECATED
DhBookManager * dh_book_manager_new (void);
G_DEPRECATED
void dh_book_manager_populate (DhBookManager *book_manager);
-G_GNUC_INTERNAL
-void _dh_book_manager_unref_singleton (void);
-
G_END_DECLS
#endif /* DH_BOOK_MANAGER_H */
diff --git a/devhelp/dh-init.c b/devhelp/dh-init.c
index f70f9a4..35e7b1c 100644
--- a/devhelp/dh-init.c
+++ b/devhelp/dh-init.c
@@ -23,7 +23,6 @@
#include "dh-init.h"
#include <glib/gi18n-lib.h>
#include "dh-book-list.h"
-#include "dh-book-manager.h"
#include "dh-profile.h"
#include "dh-settings.h"
@@ -84,7 +83,6 @@ dh_finalize (void)
*/
if (!done) {
_dh_book_list_unref_default ();
- _dh_book_manager_unref_singleton ();
_dh_profile_unref_default ();
_dh_settings_unref_default ();
done = TRUE;
diff --git a/docs/reference/devhelp-sections.txt b/docs/reference/devhelp-sections.txt
index e7ef396..98b46b7 100644
--- a/docs/reference/devhelp-sections.txt
+++ b/docs/reference/devhelp-sections.txt
@@ -111,9 +111,7 @@ dh_book_list_directory_get_type
<FILE>dh-book-manager</FILE>
DhBookManager
dh_book_manager_new
-dh_book_manager_get_singleton
dh_book_manager_populate
-dh_book_manager_get_books
<SUBSECTION Standard>
DhBookManagerClass
DH_BOOK_MANAGER
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]