[epiphany] Move EphyLinkAction and EphyWindowAction to bookmarks directory



commit 7a4e2ca22dc22e0d419fc715fc6dd552267aa82c
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Jul 11 11:53:09 2016 -0500

    Move EphyLinkAction and EphyWindowAction to bookmarks directory
    
    It's not needed elsewhere anymore.

 src/Makefile.am                          |    4 ----
 src/bookmarks/Makefile.am                |    6 +++++-
 src/{ => bookmarks}/ephy-link-action.c   |    0
 src/{ => bookmarks}/ephy-link-action.h   |    0
 src/{ => bookmarks}/ephy-window-action.c |    0
 src/{ => bookmarks}/ephy-window-action.h |    0
 src/ephy-window.c                        |    8 --------
 7 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 7eaf0ea..a3c300a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,8 +40,6 @@ libephymain_la_SOURCES = \
        ephy-history-window.h                   \
        ephy-link.c                             \
        ephy-link.h                             \
-       ephy-link-action.c                      \
-       ephy-link-action.h                      \
        ephy-location-controller.c              \
        ephy-location-controller.h              \
        ephy-lockdown.c                         \
@@ -60,8 +58,6 @@ libephymain_la_SOURCES = \
        ephy-toolbar.h                          \
        ephy-window.c                           \
        ephy-window.h                           \
-       ephy-window-action.c                    \
-       ephy-window-action.h                    \
        languages.h                             \
        passwords-dialog.c                      \
        passwords-dialog.h                      \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index f0f41ba..af191a9 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -23,6 +23,8 @@ libephybookmarks_la_SOURCES =                 \
        ephy-bookmarks-menu.h           \
        ephy-bookmark-properties.c      \
        ephy-bookmark-properties.h      \
+       ephy-link-action.c              \
+       ephy-link-action.h              \
        ephy-topic-action.c             \
        ephy-topic-action.h             \
        ephy-open-tabs-action.c         \
@@ -36,7 +38,9 @@ libephybookmarks_la_SOURCES =                 \
        ephy-topics-palette.c           \
        ephy-topics-palette.h           \
        ephy-nodes-cover.c              \
-       ephy-nodes-cover.h
+       ephy-nodes-cover.h              \
+       ephy-window-action.c            \
+       ephy-window-action.h
 
 nodist_libephybookmarks_la_SOURCES =   \
        $(BUILT_SOURCES)
diff --git a/src/ephy-link-action.c b/src/bookmarks/ephy-link-action.c
similarity index 100%
rename from src/ephy-link-action.c
rename to src/bookmarks/ephy-link-action.c
diff --git a/src/ephy-link-action.h b/src/bookmarks/ephy-link-action.h
similarity index 100%
rename from src/ephy-link-action.h
rename to src/bookmarks/ephy-link-action.h
diff --git a/src/ephy-window-action.c b/src/bookmarks/ephy-window-action.c
similarity index 100%
rename from src/ephy-window-action.c
rename to src/bookmarks/ephy-window-action.c
diff --git a/src/ephy-window-action.h b/src/bookmarks/ephy-window-action.h
similarity index 100%
rename from src/ephy-window-action.h
rename to src/bookmarks/ephy-window-action.h
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 70abe92..5347993 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -948,18 +948,10 @@ const struct {
 static void
 setup_ui_manager (EphyWindow *window)
 {
-  GtkAction *action;
   GtkUIManager *manager;
 
   manager = gtk_ui_manager_new ();
 
-  action =
-    g_object_new (EPHY_TYPE_LINK_ACTION,
-                  "name", "FileHome",
-                  "label", _("Go to most visited"),
-                  NULL);
-  g_object_unref (action);
-
   window->manager = manager;
 }
 


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