diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | lib/widgets/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ephy-notebook.c (renamed from lib/widgets/ephy-notebook.c) | 0 | ||||
| -rw-r--r-- | src/ephy-notebook.h (renamed from lib/widgets/ephy-notebook.h) | 0 | ||||
| -rwxr-xr-x | src/toolbar.c | 2 |
6 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,18 @@ +2003-04-28 Marco Pesenti Gritti <marco@it.gnome.org> + + * lib/widgets/Makefile.am: + * lib/widgets/ephy-notebook.c: + * lib/widgets/ephy-notebook.h: + * src/Makefile.am: + * src/ephy-notebook.c: (ephy_notebook_get_type), + * src/ephy-notebook.h: + + Move notebook in src/. An abstract notebook is an overkill. + + * src/toolbar.c: (ensure_bookmark_action): + + Fix compilation issue on 2.95 + 2003-04-28 David Bordoley <bordoley@msu.edu> * embed/ephy-embed-types.h: diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index d2d27ca03..a67862614 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -23,8 +23,6 @@ libephywidgets_la_SOURCES = \ ephy-location-entry.h \ ephy-node-view.c \ ephy-node-view.h \ - ephy-notebook.c \ - ephy-notebook.h \ ephy-spinner.c \ ephy-spinner.h \ ephy-tree-model-node.c \ diff --git a/src/Makefile.am b/src/Makefile.am index e8eb8a840..75b3e5edd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,6 +62,8 @@ epiphany_bin_SOURCES = \ ephy-main.c \ ephy-navigation-action.c \ ephy-navigation-action.h \ + ephy-notebook.c \ + ephy-notebook.h \ ephy-shell.c \ ephy-shell.h \ ephy-spinner-action.c \ diff --git a/lib/widgets/ephy-notebook.c b/src/ephy-notebook.c index 6ce34bb50..6ce34bb50 100644 --- a/lib/widgets/ephy-notebook.c +++ b/src/ephy-notebook.c diff --git a/lib/widgets/ephy-notebook.h b/src/ephy-notebook.h index e90aa56b9..e90aa56b9 100644 --- a/lib/widgets/ephy-notebook.h +++ b/src/ephy-notebook.h diff --git a/src/toolbar.c b/src/toolbar.c index 588eca2b0..abf2477ef 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -134,6 +134,8 @@ ensure_bookmark_action (Toolbar *t, EphyBookmarks *bookmarks, gulong id, const c G_CALLBACK (go_location_cb), t->priv->window); egg_action_group_add_action (t->priv->action_group, action); g_object_unref (action); + + return action; } static void |