diff options
| author | Xan Lopez <xan@igalia.com> | 2012-01-17 06:34:29 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-01-17 06:34:29 +0800 |
| commit | 159f011f63d01135e8ad8b2e34afbf8fd677b45d (patch) | |
| tree | 6f876996ed4b1580b545da99c45c801abecf69c4 | |
| parent | 3e258526ca38fc6dd1c8a8c96f4925531f5031c8 (diff) | |
| download | gsoc2013-epiphany-159f011f63d01135e8ad8b2e34afbf8fd677b45d.tar gsoc2013-epiphany-159f011f63d01135e8ad8b2e34afbf8fd677b45d.tar.gz gsoc2013-epiphany-159f011f63d01135e8ad8b2e34afbf8fd677b45d.tar.bz2 gsoc2013-epiphany-159f011f63d01135e8ad8b2e34afbf8fd677b45d.tar.lz gsoc2013-epiphany-159f011f63d01135e8ad8b2e34afbf8fd677b45d.tar.xz gsoc2013-epiphany-159f011f63d01135e8ad8b2e34afbf8fd677b45d.tar.zst gsoc2013-epiphany-159f011f63d01135e8ad8b2e34afbf8fd677b45d.zip | |
Move the nautilus floating bar to lib/widgets
And fix a couple of warnings.
| -rw-r--r-- | embed/ephy-embed.c | 4 | ||||
| -rw-r--r-- | lib/widgets/Makefile.am | 8 | ||||
| -rw-r--r-- | lib/widgets/nautilus-floating-bar.c (renamed from src/nautilus-floating-bar.c) | 0 | ||||
| -rw-r--r-- | lib/widgets/nautilus-floating-bar.h (renamed from src/nautilus-floating-bar.h) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index c4e9ac5cb..f44424973 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 7e0cdd353..f581674f8 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 index e37a81a27..e37a81a27 100644 --- a/src/nautilus-floating-bar.c +++ b/lib/widgets/nautilus-floating-bar.c diff --git a/src/nautilus-floating-bar.h b/lib/widgets/nautilus-floating-bar.h index 03ea0f9e1..03ea0f9e1 100644 --- a/src/nautilus-floating-bar.h +++ b/lib/widgets/nautilus-floating-bar.h diff --git a/src/Makefile.am b/src/Makefile.am index b6ca3457d..24d47ae7d 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 \ |