[epiphany] Move the nautilus floating bar to lib/widgets



commit 159f011f63d01135e8ad8b2e34afbf8fd677b45d
Author: Xan Lopez <xan igalia com>
Date:   Mon Jan 16 23:34:29 2012 +0100

    Move the nautilus floating bar to lib/widgets
    
    And fix a couple of warnings.

 embed/ephy-embed.c                           |    4 +---
 lib/widgets/Makefile.am                      |    8 +++++---
 {src => lib/widgets}/nautilus-floating-bar.c |    0
 {src => lib/widgets}/nautilus-floating-bar.h |    0
 src/Makefile.am                              |    2 --
 5 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index c4e9ac5..f444249 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -41,6 +41,7 @@
 #include "ephy-stock-icons.h"
 #include "ephy-string.h"
 #include "ephy-web-view.h"
+#include "nautilus-floating-bar.h"
 
 #include <errno.h>
 #include <glib/gi18n.h>
@@ -433,7 +434,6 @@ void
 _ephy_embed_set_statusbar_label (EphyEmbed *embed, const char *label)
 {
   EphyEmbedPrivate *priv = embed->priv;
-  GtkWidget *parent;
 
   nautilus_floating_bar_set_label (NAUTILUS_FLOATING_BAR (priv->floating_bar), label);
 
@@ -561,8 +561,6 @@ ephy_embed_constructed (GObject *object)
   WebKitWebWindowFeatures *window_features;
   WebKitWebInspector *inspector;
   GtkWidget *overlay;
-  GtkWidget *frame;
-  GtkWidget *eventbox;
 
   /* Skeleton */
   web_view = WEBKIT_WEB_VIEW (ephy_web_view_new ());
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 7e0cdd3..f581674 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -15,10 +15,12 @@ libephywidgets_la_SOURCES = \
 	ephy-tree-model-node.h			\
 	ephy-tree-model-sort.c			\
 	ephy-tree-model-sort.h			\
-	totem-glow-button.c			\
-	totem-glow-button.h			\
 	ephy-zoom-action.h			\
-	ephy-zoom-action.c
+	ephy-zoom-action.c			\
+	nautilus-floating-bar.c			\
+	nautilus-floating-bar.h			\
+	totem-glow-button.c			\
+	totem-glow-button.h
 
 libephywidgets_la_CPPFLAGS = \
 	-I$(top_builddir)/lib		\
diff --git a/src/nautilus-floating-bar.c b/lib/widgets/nautilus-floating-bar.c
similarity index 100%
rename from src/nautilus-floating-bar.c
rename to lib/widgets/nautilus-floating-bar.c
diff --git a/src/nautilus-floating-bar.h b/lib/widgets/nautilus-floating-bar.h
similarity index 100%
rename from src/nautilus-floating-bar.h
rename to lib/widgets/nautilus-floating-bar.h
diff --git a/src/Makefile.am b/src/Makefile.am
index b6ca345..24d47ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,6 @@ NOINST_H_FILES = \
 	ephy-toolbar.h				\
 	ephy-window-action.h			\
 	languages.h				\
-	nautilus-floating-bar.h			\
 	pdm-dialog.h				\
 	popup-commands.h			\
 	prefs-dialog.h				\
@@ -74,7 +73,6 @@ libephymain_la_SOURCES = \
 	ephy-toolbar.c				\
 	ephy-window.c				\
 	ephy-window-action.c			\
-	nautilus-floating-bar.c			\
 	pdm-dialog.c				\
 	popup-commands.c			\
 	prefs-dialog.c				\



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