[epiphany/wip/bookmarks: 308/315] Remove obsolete EphyBookmarksEditor



commit 3cceafaef75debffc9d84d61288391b7b998203b
Author: Iulian Radu <iulian radu67 gmail com>
Date:   Tue Sep 27 18:56:30 2016 +0300

    Remove obsolete EphyBookmarksEditor

 src/bookmarks/Makefile.am                  |    2 -
 src/bookmarks/ephy-bookmarks-editor.c      | 1719 ----------------------------
 src/bookmarks/ephy-bookmarks-editor.h      |   37 -
 src/ephy-shell.c                           |   31 -
 src/resources/epiphany-application-menu.ui |    5 -
 src/window-commands.c                      |   12 -
 src/window-commands.h                      |    3 -
 7 files changed, 0 insertions(+), 1809 deletions(-)
---
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index a3c12b2..a9b26e7 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -8,8 +8,6 @@ libephybookmarks_la_SOURCES =           \
        ephy-bookmarks.h                \
        ephy-bookmark-action.c          \
        ephy-bookmark-action.h          \
-       ephy-bookmarks-editor.c         \
-       ephy-bookmarks-editor.h         \
        ephy-bookmarks-export.c         \
        ephy-bookmarks-export.h         \
        ephy-bookmarks-import.c         \
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 667e659..95fe677 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "ephy-shell.h"
 
-#include "ephy-bookmarks-editor.h"
 #include "ephy-bookmarks-import.h"
 #include "ephy-debug.h"
 #include "ephy-downloads-manager.h"
@@ -57,7 +56,6 @@ struct _EphyShell {
   EphyBookmarks *bookmarks;
   EphyBookmarksManager *bookmarks_manager;
   GNetworkMonitor *network_monitor;
-  GtkWidget *bme;
   GtkWidget *history_window;
   GObject *prefs_dialog;
   EphyShellStartupContext *local_startup_context;
@@ -166,14 +164,6 @@ reopen_closed_tab (GSimpleAction *action,
 }
 
 static void
-show_bookmarks (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  window_cmd_show_bookmarks (NULL, NULL, NULL);
-}
-
-static void
 show_history (GSimpleAction *action,
               GVariant      *parameter,
               gpointer       user_data)
@@ -244,7 +234,6 @@ quit_application (GSimpleAction *action,
 static GActionEntry app_entries[] = {
   { "new-window", new_window, NULL, NULL, NULL },
   { "new-incognito", new_incognito_window, NULL, NULL, NULL },
-  { "bookmarks", show_bookmarks, NULL, NULL, NULL },
   { "history", show_history, NULL, NULL, NULL },
   { "preferences", show_preferences, NULL, NULL, NULL },
   { "shortcuts", show_shortcuts, NULL, NULL, NULL },
@@ -592,7 +581,6 @@ ephy_shell_dispose (GObject *object)
 
   g_clear_object (&shell->session);
   g_clear_object (&shell->lockdown);
-  g_clear_pointer (&shell->bme, gtk_widget_destroy);
   g_clear_pointer (&shell->history_window, gtk_widget_destroy);
   g_clear_object (&shell->prefs_dialog);
   g_clear_object (&shell->bookmarks);
@@ -791,25 +779,6 @@ ephy_shell_get_net_monitor (EphyShell *shell)
 }
 
 /**
- * ephy_shell_get_bookmarks_editor:
- *
- * Return value: (transfer none):
- **/
-GtkWidget *
-ephy_shell_get_bookmarks_editor (EphyShell *shell)
-{
-  EphyBookmarks *bookmarks;
-
-  if (shell->bme == NULL) {
-    bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-    g_assert (bookmarks != NULL);
-    shell->bme = ephy_bookmarks_editor_new (bookmarks);
-  }
-
-  return shell->bme;
-}
-
-/**
  * ephy_shell_get_history_window:
  *
  * Return value: (transfer none):
diff --git a/src/resources/epiphany-application-menu.ui b/src/resources/epiphany-application-menu.ui
index 5c06f94..35a2730 100644
--- a/src/resources/epiphany-application-menu.ui
+++ b/src/resources/epiphany-application-menu.ui
@@ -20,11 +20,6 @@
     </section>
     <section>
       <item>
-        <attribute name="label" translatable="yes">_Bookmarks</attribute>
-        <attribute name="action">app.bookmarks</attribute>
-        <attribute name="accel">&lt;Primary&gt;b</attribute>
-      </item>
-      <item>
         <attribute name="label" translatable="yes">_History</attribute>
         <attribute name="action">app.history</attribute>
         <attribute name="accel">&lt;Primary&gt;h</attribute>
diff --git a/src/window-commands.c b/src/window-commands.c
index 9d92e6e..ccd4c58 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -24,7 +24,6 @@
 #include "window-commands.h"
 
 #include "ephy-add-bookmark-popover.h"
-#include "ephy-bookmarks-editor.h"
 #include "ephy-bookmarks-ui.h"
 #include "ephy-debug.h"
 #include "ephy-embed-container.h"
@@ -88,17 +87,6 @@ window_cmd_new_incognito_window (GSimpleAction *action,
 }
 
 void
-window_cmd_show_bookmarks (GSimpleAction *action,
-                           GVariant      *parameter,
-                           gpointer       user_data)
-{
-  GtkWidget *bwindow;
-
-  bwindow = ephy_shell_get_bookmarks_editor (ephy_shell_get_default ());
-  gtk_window_present (GTK_WINDOW (bwindow));
-}
-
-void
 window_cmd_show_history (GSimpleAction *action,
                          GVariant      *parameter,
                          gpointer       user_data)
diff --git a/src/window-commands.h b/src/window-commands.h
index bbd8f29..0ad03a7 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -30,9 +30,6 @@ void window_cmd_new_window                      (GSimpleAction *action,
 void window_cmd_new_incognito_window            (GSimpleAction *action,
                                                  GVariant      *parameter,
                                                  gpointer       user_data);
-void window_cmd_show_bookmarks                  (GSimpleAction *action,
-                                                 GVariant      *parameter,
-                                                 gpointer       user_data);
 void window_cmd_show_history                    (GSimpleAction *action,
                                                  GVariant      *parameter,
                                                  gpointer       user_data);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]