[epiphany/wip/bookmarks: 68/76] Remove obsolete bookmarks actions and action groups
- From: Iulian Radu <iulianradu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/bookmarks: 68/76] Remove obsolete bookmarks actions and action groups
- Date: Wed, 28 Sep 2016 13:22:31 +0000 (UTC)
commit d9baf85d5c9d721d33a5230ca37393208a2f76ba
Author: Iulian Radu <iulian radu67 gmail com>
Date: Tue Sep 27 19:08:44 2016 +0300
Remove obsolete bookmarks actions and action groups
src/bookmarks/Makefile.am | 16 +-
src/bookmarks/ephy-bookmark-action-group.c | 167 -----------
src/bookmarks/ephy-bookmark-action-group.h | 30 --
src/bookmarks/ephy-bookmark-action.c | 440 ----------------------------
src/bookmarks/ephy-bookmark-action.h | 71 -----
src/bookmarks/ephy-bookmarks-ui.c | 30 --
src/bookmarks/ephy-link-action.c | 172 -----------
src/bookmarks/ephy-link-action.h | 77 -----
src/bookmarks/ephy-open-tabs-action.c | 132 ---------
src/bookmarks/ephy-open-tabs-action.h | 29 --
src/bookmarks/ephy-topic-action-group.c | 122 --------
src/bookmarks/ephy-topic-action-group.h | 31 --
src/bookmarks/ephy-topic-action.c | 327 ---------------------
src/bookmarks/ephy-topic-action.h | 67 -----
src/bookmarks/ephy-window-action.c | 106 -------
src/bookmarks/ephy-window-action.h | 53 ----
src/ephy-window.c | 1 -
17 files changed, 1 insertions(+), 1870 deletions(-)
---
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 0b1f539..8a1ea3f 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -6,22 +6,8 @@ TYPES_H_FILES = \
libephybookmarks_la_SOURCES = \
ephy-bookmarks.c \
ephy-bookmarks.h \
- ephy-bookmark-action.c \
- ephy-bookmark-action.h \
ephy-bookmarks-ui.c \
- ephy-bookmarks-ui.h \
- ephy-link-action.c \
- ephy-link-action.h \
- ephy-topic-action.c \
- ephy-topic-action.h \
- ephy-open-tabs-action.c \
- ephy-open-tabs-action.h \
- ephy-topic-action-group.c \
- ephy-topic-action-group.h \
- ephy-bookmark-action-group.c \
- ephy-bookmark-action-group.h \
- ephy-window-action.c \
- ephy-window-action.h
+ ephy-bookmarks-ui.h
nodist_libephybookmarks_la_SOURCES = \
$(BUILT_SOURCES)
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index e53e702..1c9412e 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -20,8 +20,6 @@
#include "config.h"
#include "ephy-bookmarks-ui.h"
-#include "ephy-bookmark-action-group.h"
-#include "ephy-bookmark-action.h"
#include "ephy-bookmarks.h"
#include "ephy-debug.h"
#include "ephy-dnd.h"
@@ -31,13 +29,10 @@
#include "ephy-header-bar.h"
#include "ephy-link.h"
#include "ephy-node-common.h"
-#include "ephy-open-tabs-action.h"
#include "ephy-prefs.h"
#include "ephy-settings.h"
#include "ephy-shell.h"
#include "ephy-string.h"
-#include "ephy-topic-action-group.h"
-#include "ephy-topic-action.h"
#include <string.h>
#include <glib/gi18n.h>
@@ -58,41 +53,16 @@ void
ephy_bookmarks_ui_attach_window (EphyWindow *window)
{
EphyBookmarks *eb;
- EphyNode *bookmarks;
- EphyNode *topics;
BookmarksWindowData *data;
GtkUIManager *manager;
GtkActionGroup *actions;
eb = ephy_shell_get_bookmarks (ephy_shell_get_default ());
- bookmarks = ephy_bookmarks_get_bookmarks (eb);
- topics = ephy_bookmarks_get_keywords (eb);
data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
g_return_if_fail (data == NULL);
- manager = gtk_ui_manager_new ();
-
data = g_new0 (BookmarksWindowData, 1);
g_object_set_data_full (G_OBJECT (window), BM_WINDOW_DATA_KEY, data, g_free);
-
- /* Create the self-maintaining action groups for bookmarks and topics */
- actions = ephy_bookmark_group_new (bookmarks);
- gtk_ui_manager_insert_action_group (manager, actions, -1);
- g_signal_connect_object (actions, "open-link",
- G_CALLBACK (ephy_link_open), G_OBJECT (window),
- G_CONNECT_SWAPPED | G_CONNECT_AFTER);
- g_object_unref (actions);
-
- actions = ephy_topic_action_group_new (topics, manager);
- gtk_ui_manager_insert_action_group (manager, actions, -1);
- g_object_unref (actions);
-
- actions = ephy_open_tabs_group_new (topics);
- gtk_ui_manager_insert_action_group (manager, actions, -1);
- g_signal_connect_object (actions, "open-link",
- G_CALLBACK (ephy_link_open), G_OBJECT (window),
- G_CONNECT_SWAPPED | G_CONNECT_AFTER);
- g_object_unref (actions);
}
void
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 3e6e09a..3bc46a2 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -37,7 +37,6 @@
#include "ephy-header-bar.h"
#include "ephy-initial-state.h"
#include "ephy-link.h"
-#include "ephy-link-action.h"
#include "ephy-location-entry.h"
#include "ephy-notebook.h"
#include "ephy-prefs.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]