[epiphany] Remove ephy-initial-state and kill EphyNode
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Remove ephy-initial-state and kill EphyNode
- Date: Sat, 8 Oct 2016 23:27:06 +0000 (UTC)
commit c0d2df525d68cdb64d77917a01aef0076af8a0a1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat Oct 8 18:23:30 2016 -0500
Remove ephy-initial-state and kill EphyNode
lib/Makefile.am | 9 -
lib/ephy-dnd.c | 2 -
lib/ephy-initial-state.c | 478 ---------------
lib/ephy-initial-state.h | 50 --
lib/ephy-node-common.h | 53 --
lib/ephy-node-db.c | 529 ----------------
lib/ephy-node-db.h | 68 ---
lib/ephy-node.c | 1504 ----------------------------------------------
lib/ephy-node.h | 157 -----
src/ephy-main.c | 2 -
src/ephy-window.c | 26 -
11 files changed, 0 insertions(+), 2878 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 586f1d7..be86da4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,8 +3,6 @@ SUBDIRS = widgets egg history
pkglib_LTLIBRARIES = libephymisc.la
TYPES_H_FILES = \
- ephy-initial-state.h \
- ephy-node.h \
ephy-security-levels.h
libephymisc_la_SOURCES = \
@@ -24,15 +22,8 @@ libephymisc_la_SOURCES = \
ephy-gui.h \
ephy-hosts-manager.c \
ephy-hosts-manager.h \
- ephy-initial-state.c \
- ephy-initial-state.h \
ephy-langs.c \
ephy-langs.h \
- ephy-node.c \
- ephy-node.h \
- ephy-node-common.h \
- ephy-node-db.c \
- ephy-node-db.h \
ephy-prefs.h \
ephy-profile-utils.c \
ephy-profile-utils.h \
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index b822413..dcfca9f 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -21,8 +21,6 @@
#include "config.h"
#include "ephy-dnd.h"
-#include "ephy-node.h"
-
#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 7623a82..7079ade 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -24,7 +24,6 @@
#include "ephy-debug.h"
#include "ephy-file-helpers.h"
-#include "ephy-initial-state.h"
#include "ephy-private.h"
#include "ephy-profile-utils.h"
#include "ephy-session.h"
@@ -436,7 +435,6 @@ main (int argc,
if (notify_is_initted ())
notify_uninit ();
- ephy_initial_state_save ();
ephy_settings_shutdown ();
ephy_file_helpers_shutdown ();
xmlCleanupParser ();
diff --git a/src/ephy-window.c b/src/ephy-window.c
index bd285d7..f9714c3 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -36,7 +36,6 @@
#include "ephy-find-toolbar.h"
#include "ephy-gui.h"
#include "ephy-header-bar.h"
-#include "ephy-initial-state.h"
#include "ephy-link.h"
#include "ephy-location-entry.h"
#include "ephy-notebook.h"
@@ -150,7 +149,6 @@ struct _EphyWindow {
EphyLocationController *location_controller;
guint closing : 1;
- guint has_size : 1;
guint fullscreen_mode : 1;
guint is_popup : 1;
guint present_on_insert : 1;
@@ -3043,29 +3041,6 @@ ephy_window_constructed (GObject *object)
}
static void
-ephy_window_show (GtkWidget *widget)
-{
- EphyWindow *window = EPHY_WINDOW (widget);
-
- if (!window->has_size) {
- EphyEmbed *embed;
- int flags = 0;
-
- embed = window->active_embed;
- g_return_if_fail (EPHY_IS_EMBED (embed));
-
- if (!window->is_popup)
- flags = EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE;
-
- ephy_initial_state_add_window (widget, "main_window", 600, 500,
- TRUE, flags);
- window->has_size = TRUE;
- }
-
- GTK_WIDGET_CLASS (ephy_window_parent_class)->show (widget);
-}
-
-static void
ephy_window_class_init (EphyWindowClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -3077,7 +3052,6 @@ ephy_window_class_init (EphyWindowClass *klass)
object_class->get_property = ephy_window_get_property;
object_class->set_property = ephy_window_set_property;
- widget_class->show = ephy_window_show;
widget_class->key_press_event = ephy_window_key_press_event;
widget_class->window_state_event = ephy_window_state_event;
widget_class->delete_event = ephy_window_delete_event;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]