GNOME.org
 

[epiphany] Remove last traces of the EggToolbar code

commit 3295288a7292a74d14c6a5a20e41e2afe010f34e
Author: Xan Lopez <xan igalia com>
Date:   Wed Dec 14 18:01:14 2011 +0100

    Remove last traces of the EggToolbar code

 lib/egg/Makefile.am               |    6 -
 lib/egg/egg-editable-toolbar.c    | 1932 -------------------------------------
 lib/egg/egg-editable-toolbar.h    |   95 --
 lib/egg/egg-toolbar-editor.c      |  677 -------------
 lib/egg/egg-toolbar-editor.h      |   63 --
 lib/egg/egg-toolbars-model.c      | 1001 -------------------
 lib/egg/egg-toolbars-model.h      |  190 ----
 lib/widgets/ephy-location-entry.c |   27 -
 po/POTFILES.in                    |    4 -
 src/Makefile.am                   |   31 +-
 src/bookmarks/ephy-bookmarks-ui.h |    3 +-
 src/ephy-shell.c                  |   60 --
 src/ephy-shell.h                  |    3 -
 src/ephy-toolbars-model.c         |  292 ------
 src/ephy-toolbars-model.h         |   65 --
 15 files changed, 4 insertions(+), 4445 deletions(-)
---
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index c49fb17..c3add09 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -5,9 +5,6 @@ EGGSOURCES = \
         eggdesktopfile.c \
         eggsmclient.c \
 	eggsmclient-xsmp.c \
-	egg-editable-toolbar.c \
-	egg-toolbars-model.c \
-	egg-toolbar-editor.c \
         $(NULL)
 
 EGGHEADERS = \
@@ -15,9 +12,6 @@ EGGHEADERS = \
         eggdesktopfile.h \
         eggsmclient.h \
         eggsmclient-private.h \
-	egg-editable-toolbar.h \
-	egg-toolbars-model.h \
-	egg-toolbar-editor.h \
         $(NULL)
 
 noinst_HEADERS = \
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 0e16d42..6300205 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -26,7 +26,6 @@
 #include "ephy-location-entry.h"
 #include "ephy-signal-accumulator.h"
 #include "ephy-dnd.h"
-#include "egg-editable-toolbar.h"
 #include "ephy-stock-icons.h"
 #include "ephy-debug.h"
 #include "ephy-gui.h"
@@ -512,33 +511,12 @@ action_activated_after_cb (GtkEntryCompletion *completion,
 }
 
 static gboolean
-toolbar_is_editable (GtkWidget *widget)
-{
-	GtkWidget *etoolbar;
-
-	etoolbar = gtk_widget_get_ancestor (widget, EGG_TYPE_EDITABLE_TOOLBAR);
-
-	if (etoolbar)
-	{
-		return egg_editable_toolbar_get_edit_mode
-			(EGG_EDITABLE_TOOLBAR (etoolbar));
-	}
-
-	return FALSE;
-}
-
-static gboolean
 entry_drag_motion_cb (GtkWidget        *widget,
 		      GdkDragContext   *context,
 		      gint              x,
 		      gint              y,
 		      guint             time)
 {
-	if (toolbar_is_editable (widget))
-	{
-		g_signal_stop_emission_by_name (widget, "drag_motion");
-	}
-
 	return FALSE;
 }
 
@@ -549,11 +527,6 @@ entry_drag_drop_cb (GtkWidget          *widget,
 		    gint                y,
 		    guint               time)
 {
-	if (toolbar_is_editable (widget))
-	{
-		g_signal_stop_emission_by_name (widget, "drag_drop");
-	}
-
 	return FALSE;
 }
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 606f38f..e361387 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,10 +20,7 @@ embed/ephy-history.c
 embed/ephy-request-about.c
 embed/ephy-web-view.c
 lib/egg/eggdesktopfile.c
-lib/egg/egg-editable-toolbar.c
 lib/egg/eggsmclient.c
-lib/egg/egg-toolbar-editor.c
-lib/egg/egg-toolbar-editor.c
 lib/ephy-file-chooser.c
 lib/ephy-file-helpers.c
 lib/ephy-gui.c
@@ -63,7 +60,6 @@ src/ephy-main.c
 src/ephy-notebook.c
 src/ephy-session.c
 src/ephy-shell.c
-src/ephy-toolbars-model.c
 src/ephy-window.c
 src/pdm-dialog.c
 src/popup-commands.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 84b7078..45b55d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,6 @@ NOINST_H_FILES = \
 	ephy-navigation-history-action.h	\
 	ephy-navigation-up-action.h		\
 	ephy-password-info.h			\
-	ephy-toolbars-model.h			\
 	languages.h				\
 	pdm-dialog.h				\
 	popup-commands.h			\
@@ -71,7 +70,6 @@ libephymain_la_SOURCES = \
 	ephy-password-info.c	        	\
 	ephy-session.c				\
 	ephy-shell.c				\
-	ephy-toolbars-model.c			\
 	ephy-window.c				\
 	pdm-dialog.c				\
 	popup-commands.c			\
@@ -274,26 +272,7 @@ EPHY_GIR_C_FILES = \
 	$(top_srcdir)/src/ephy-window.c \
 	$(NULL)
 
-EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
-	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
-	$(INTROSPECTION_SCANNER) -v --warn-all \
-		--identifier-prefix=Egg \
-		--symbol-prefix=egg \
-		--namespace=EphyEgg \
-		--nsversion=$(EPIPHANY_API_VERSION) \
-		--include=Gtk-3.0 \
-		--include=libxml2-2.0 \
-		--library=$(top_builddir)/lib/egg/libegg.la \
-		--pkg=gtk+-3.0 \
-		--pkg=libxml-2.0 \
-		--output=$@ \
-		$(top_srcdir)/lib/egg/egg-editable-toolbar.h \
-		$(top_srcdir)/lib/egg/egg-toolbars-model.h \
-		$(top_srcdir)/lib/egg/egg-editable-toolbar.c \
-		$(top_srcdir)/lib/egg/egg-toolbars-model.c \
-		$(top_builddir)/lib/egg/libegg.la
-
-Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
+Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
                                       $(EPHY_GIR_C_FILES) epiphany
 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
 	$(INTROSPECTION_SCANNER) -v --warn-all \
@@ -306,7 +285,6 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTR
 		--include=Gtk-3.0 \
 		--include=libxml2-2.0 \
 		--include=WebKit-3.0 \
-		--include-uninstalled=EphyEgg-$(EPIPHANY_API_VERSION).gir \
 		--program=./epiphany \
 		--output=$@ \
 		--pkg=epiphany-$(EPIPHANY_API_VERSION) \
@@ -320,17 +298,14 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTR
 		$(EPHY_GIR_C_FILES)
 
 girdir = $(datadir)/gir-1.0
-gir_DATA = Epiphany-$(EPIPHANY_API_VERSION).gir EphyEgg-$(EPIPHANY_API_VERSION).gir
+gir_DATA = Epiphany-$(EPIPHANY_API_VERSION).gir
 
 typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = Epiphany-$(EPIPHANY_API_VERSION).typelib EphyEgg-$(EPIPHANY_API_VERSION).typelib
+typelibs_DATA = Epiphany-$(EPIPHANY_API_VERSION).typelib
 
 Epiphany-$(EPIPHANY_API_VERSION).typelib: Epiphany-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_COMPILER)
 	$(AM_V_GEN) $(INTROSPECTION_COMPILER) Epiphany-$(EPIPHANY_API_VERSION).gir --includedir=$(top_builddir)/src --includedir=$(srcdir) -o Epiphany-$(EPIPHANY_API_VERSION).typelib
 
-EphyEgg-$(EPIPHANY_API_VERSION).typelib: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_COMPILER)
-	$(AM_V_GEN) $(INTROSPECTION_COMPILER) EphyEgg-$(EPIPHANY_API_VERSION).gir -o EphyEgg-$(EPIPHANY_API_VERSION).typelib
-
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
 endif # HAVE_INTROSPECTION
diff --git a/src/bookmarks/ephy-bookmarks-ui.h b/src/bookmarks/ephy-bookmarks-ui.h
index 2dfbebc..c44f2a2 100644
--- a/src/bookmarks/ephy-bookmarks-ui.h
+++ b/src/bookmarks/ephy-bookmarks-ui.h
@@ -24,9 +24,8 @@
 #ifndef EPHY_BOOKMARKS_UI_H
 #define EPHY_BOOKMARKS_UI_H
 
-#include "egg-toolbars-model.h"
-#include "ephy-node.h"
 #include "ephy-window.h"
+#include "ephy-node.h"
 
 #include <gtk/gtk.h>
 
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 217b79b..c5c71ab 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #include "ephy-shell.h"
 
-#include "egg-toolbars-model.h"
 #include "ephy-bookmarks-editor.h"
 #include "ephy-bookmarks-import.h"
 #include "ephy-debug.h"
@@ -40,7 +39,6 @@
 #include "ephy-profile-utils.h"
 #include "ephy-session.h"
 #include "ephy-settings.h"
-#include "ephy-toolbars-model.h"
 #include "ephy-type-builtins.h"
 #include "ephy-web-view.h"
 #include "ephy-window.h"
@@ -56,8 +54,6 @@ struct _EphyShellPrivate {
   EphySession *session;
   GObject *lockdown;
   EphyBookmarks *bookmarks;
-  EggToolbarsModel *toolbars_model;
-  EggToolbarsModel *fs_toolbars_model;
   EphyExtensionsManager *extensions_manager;
   GNetworkMonitor *network_monitor;
   GtkWidget *bme;
@@ -515,18 +511,6 @@ ephy_shell_dispose (GObject *object)
     priv->lockdown = NULL;
   }
 
-  if (priv->toolbars_model != NULL) {
-    LOG ("Unref toolbars model");
-    g_object_unref (priv->toolbars_model);
-    priv->toolbars_model = NULL;
-  }
-
-  if (priv->fs_toolbars_model != NULL) {
-    LOG ("Unref fullscreen toolbars model");
-    g_object_unref (priv->fs_toolbars_model);
-    priv->fs_toolbars_model = NULL;
-  }
-
   if (priv->bme != NULL) {
     LOG ("Unref Bookmarks Editor");
     gtk_widget_destroy (GTK_WIDGET (priv->bme));
@@ -829,50 +813,6 @@ ephy_shell_get_bookmarks (EphyShell *shell)
 }
 
 /**
- * ephy_shell_get_toolbars_model:
- *
- * Return value: (transfer none):
- **/
-GObject *
-ephy_shell_get_toolbars_model (EphyShell *shell, gboolean fullscreen)
-{
-  LOG ("ephy_shell_get_toolbars_model fs=%d", fullscreen);
-
-  if (fullscreen) {
-    if (shell->priv->fs_toolbars_model == NULL) {
-      EggTbModelFlags flags;
-      gboolean success;
-      const char *xml;
-
-      shell->priv->fs_toolbars_model = egg_toolbars_model_new ();
-      xml = ephy_file ("epiphany-fs-toolbar.xml");
-      g_return_val_if_fail (xml != NULL, NULL);
-
-      success = egg_toolbars_model_load_toolbars
-        (shell->priv->fs_toolbars_model, xml);
-      g_return_val_if_fail (success, NULL);
-
-      flags = egg_toolbars_model_get_flags
-        (shell->priv->fs_toolbars_model, 0);
-      egg_toolbars_model_set_flags
-        (shell->priv->fs_toolbars_model, 0,
-         flags | EGG_TB_MODEL_NOT_REMOVABLE);
-    }
-
-    return G_OBJECT (shell->priv->fs_toolbars_model);
-  } else {
-    if (shell->priv->toolbars_model == NULL) {
-      shell->priv->toolbars_model = ephy_toolbars_model_new ();
-
-      ephy_toolbars_model_load
-        (EPHY_TOOLBARS_MODEL (shell->priv->toolbars_model));
-    }
-
-    return G_OBJECT (shell->priv->toolbars_model);
-  }
-}
-
-/**
  * ephy_shell_get_extensions_manager:
  *
  * Return value: (transfer none):
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 55a9054..1780a2e 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -130,9 +130,6 @@ GObject        *ephy_shell_get_net_monitor              (EphyShell *shell);
 
 EphyBookmarks  *ephy_shell_get_bookmarks                (EphyShell *shell);
 
-GObject        *ephy_shell_get_toolbars_model           (EphyShell *shell,
-                                                         gboolean fullscreen);
-
 GObject        *ephy_shell_get_extensions_manager       (EphyShell *shell);
 
 GtkWidget      *ephy_shell_get_bookmarks_editor         (EphyShell *shell);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]