[gnome-notes/wip/igaldino/bijiben-rename] window-base: Remove duplicated function

[Isaque Galdino de Araujo <igaldino src gnome org>]

commit c1ecc633b350d5984170ff35b949c60c1792ffc5
Author: Isaque Galdino <igaldino gmail com>
Date:   Tue Aug 21 17:45:23 2018 -0300

    window-base: Remove duplicated function
    
    Redudant code in BjbWindowBase object to get application manager,
    bjb_window_base_get_manager, can be easily replaced by
    bjb_application_get_manager in BjbApplication object.
    
    Refers to issue #82

 src/bjb-editor-toolbar.c  |  5 +----
 src/bjb-main-toolbar.c    |  8 +++++---
 src/bjb-main-view.c       | 12 +++++++-----
 src/bjb-organize-dialog.c |  8 ++++----
 src/bjb-window-base.c     |  6 ------
 src/bjb-window-base.h     |  3 ---
 6 files changed, 17 insertions(+), 25 deletions(-)
---
diff --git a/src/bjb-editor-toolbar.c b/src/bjb-editor-toolbar.c
index ccb5124..8d94064 100644
--- a/src/bjb-editor-toolbar.c
+++ b/src/bjb-editor-toolbar.c
@@ -134,7 +134,6 @@ on_link_clicked (GtkButton        *button,
   BjbApplication          *app;
   BjbSettings             *settings;
   const gchar             *link;
-  GtkWidget               *window;
   BijiNoteObj             *result;
   GdkRGBA                  color;
   BijiManager             *manager;
@@ -145,9 +144,7 @@ on_link_clicked (GtkButton        *button,
   if (link == NULL)
     return;
 
-  window = bjb_note_view_get_base_window (self->view);
-  manager = bjb_window_base_get_manager(window);
-
+  manager = bjb_application_get_manager (app);
   settings = bjb_application_get_settings (app);
   result = biji_manager_note_new (manager,
                                     link,
diff --git a/src/bjb-main-toolbar.c b/src/bjb-main-toolbar.c
index a5a1586..b477955 100644
--- a/src/bjb-main-toolbar.c
+++ b/src/bjb-main-toolbar.c
@@ -174,6 +174,7 @@ on_help_cb (BjbMainToolbar *self)
 static void
 on_new_note_clicked (BjbMainToolbar *self)
 {
+  BjbApplication *app;
   BijiNoteObj *result;
   BijiManager *manager;
   BjbSettings  *settings;
@@ -181,8 +182,9 @@ on_new_note_clicked (BjbMainToolbar *self)
   g_assert (BJB_IS_MAIN_TOOLBAR (self));
 
   /* append note to notebook */
-  manager = bjb_window_base_get_manager (bjb_main_view_get_window (self->parent));
-  settings = bjb_application_get_settings (BJB_APPLICATION_DEFAULT);
+  app = BJB_APPLICATION_DEFAULT;
+  manager = bjb_application_get_manager (app);
+  settings = bjb_application_get_settings (app);
   result = biji_manager_note_new (manager,
                                     NULL,
                                     bjb_settings_get_default_location (settings));
@@ -406,7 +408,7 @@ on_back_button_clicked (BjbMainToolbar *self)
 static void
 on_empty_clicked_callback        (BjbMainToolbar *self)
 {
-  biji_manager_empty_bin (bjb_window_base_get_manager (GTK_WIDGET (self->window)));
+  biji_manager_empty_bin (bjb_application_get_manager (BJB_APPLICATION_DEFAULT));
 }
 
 
diff --git a/src/bjb-main-view.c b/src/bjb-main-view.c
index abf93ca..25aa029 100644
--- a/src/bjb-main-view.c
+++ b/src/bjb-main-view.c
@@ -272,7 +272,7 @@ bjb_main_view_get_selected_items (BjbMainView *self)
   {
     url = get_note_url_from_tree_path (l->data, self);
     item = biji_manager_get_item_at_path (
-              bjb_window_base_get_manager (self->window), url);
+              bjb_application_get_manager (BJB_APPLICATION_DEFAULT), url);
     if (BIJI_IS_ITEM (item))
       result = g_list_prepend (result, item);
 
@@ -358,7 +358,7 @@ on_item_activated (GdMainView        * gd,
   g_return_val_if_fail (item_path != NULL, FALSE); // #709197
 
   /* Switch to that item */
-  manager = bjb_window_base_get_manager (self->window);
+  manager = bjb_application_get_manager (BJB_APPLICATION_DEFAULT);
   to_open = biji_manager_get_item_at_path (manager, item_path);
   g_free (item_path);
 
@@ -390,14 +390,16 @@ on_drag_data_received (GtkWidget        *widget,
 
     if (text)
     {
+      BjbApplication *app;
       BijiManager *manager;
       BijiNoteObj *ret;
       BjbMainView *self = BJB_MAIN_VIEW (user_data);
       BjbSettings *settings;
 
       /* FIXME Text is guchar utf 8, conversion to perform */
-      manager =  bjb_window_base_get_manager (self->window);
-      settings = bjb_application_get_settings (BJB_APPLICATION_DEFAULT);
+      app = BJB_APPLICATION_DEFAULT;
+      manager = bjb_application_get_manager (app);
+      settings = bjb_application_get_settings (app);
       ret = biji_manager_note_new (manager,
                                      (gchar*) text,
                                      bjb_settings_get_default_location (settings));
@@ -464,7 +466,7 @@ _get_item_for_tree_path (GtkTreeModel *tree_model,
   if (uuid != NULL)
   {
     retval = biji_manager_get_item_at_path (
-               bjb_window_base_get_manager (self->window), uuid);
+               bjb_application_get_manager (BJB_APPLICATION_DEFAULT), uuid);
     g_free (uuid);
   }
 
diff --git a/src/bjb-organize-dialog.c b/src/bjb-organize-dialog.c
index 6c6ed57..d963742 100644
--- a/src/bjb-organize-dialog.c
+++ b/src/bjb-organize-dialog.c
@@ -19,7 +19,7 @@
 #include <glib/gi18n.h>
 
 #include "bjb-organize-dialog.h"
-#include "bjb-window-base.h"
+#include "bjb-application.h"
 
 /* Model for tree view */
 enum {
@@ -188,7 +188,7 @@ update_notebooks_model_async (BjbOrganizeDialog *self)
 {
   BijiManager *manager;
 
-  manager = bjb_window_base_get_manager (GTK_WIDGET (self->window));
+  manager = bjb_application_get_manager (BJB_APPLICATION_DEFAULT);
   gtk_list_store_clear (self->notebook_store);
   biji_get_all_notebooks_async (manager, bjb_organize_dialog_handle_tags, self);
 }
@@ -229,7 +229,7 @@ on_tag_toggled (GtkCellRendererToggle *cell,
   gtk_tree_model_get (model, &iter, COL_URN, &tag, -1);
 
   self->toggled_notebook = tag;
-  manager = bjb_window_base_get_manager (GTK_WIDGET (self->window));
+  manager = bjb_application_get_manager (BJB_APPLICATION_DEFAULT);
   notebook = biji_manager_get_item_at_path (manager, tag);
 
   if (BIJI_IS_NOTEBOOK (notebook))
@@ -274,7 +274,7 @@ on_new_notebook_created_cb (BijiItem *coll, gpointer user_data)
 static void
 add_new_tag (BjbOrganizeDialog *self)
 {
-  BijiManager *manager = bjb_window_base_get_manager (GTK_WIDGET (self->window));
+  BijiManager *manager = bjb_application_get_manager (BJB_APPLICATION_DEFAULT);
   const gchar *title = gtk_entry_get_text (GTK_ENTRY (self->entry));
 
   if (title && title[0])
diff --git a/src/bjb-window-base.c b/src/bjb-window-base.c
index 84872d9..a15e8b0 100644
--- a/src/bjb-window-base.c
+++ b/src/bjb-window-base.c
@@ -539,12 +539,6 @@ bjb_window_base_get_view_type (BjbWindowBase *self)
   return self->current_view;
 }
 
-BijiManager *
-bjb_window_base_get_manager(GtkWidget * win)
-{
-  return bjb_application_get_manager (BJB_APPLICATION_DEFAULT);
-}
-
 void
 bjb_window_base_set_entry(GtkWidget *win, gchar *search_entry)
 {
diff --git a/src/bjb-window-base.h b/src/bjb-window-base.h
index b991edc..d69aa90 100644
--- a/src/bjb-window-base.h
+++ b/src/bjb-window-base.h
@@ -36,9 +36,6 @@ void                   bjb_window_base_switch_to_item     (BjbWindowBase *bwb, B
 BjbWindowViewType      bjb_window_base_get_view_type      (BjbWindowBase *win);
 
 
-BijiManager           *bjb_window_base_get_manager        (GtkWidget * win);
-
-
 void                   bjb_window_base_set_entry(GtkWidget *win, gchar *search_entry) ;