diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | acconfig.h | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | data/GNOME_Epiphany_NautilusView.server.in | 6 | ||||
| -rw-r--r-- | src/ephy-nautilus-view.c | 2 | ||||
| -rw-r--r-- | src/ephy-shell.c | 6 |
6 files changed, 21 insertions, 6 deletions
@@ -1,3 +1,13 @@ +2003-02-09 Marco Pesenti Gritti <marco@it.gnome.org> + + * acconfig.h: + * configure.in: + * data/GNOME_Epiphany_NautilusView.server.in: + * src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init): + * src/ephy-shell.c: + + Make nautilus view actually work + 2003-02-08 Marco Pesenti Gritti <marco@it.gnome.org> * lib/widgets/ephy-location-entry.c: diff --git a/acconfig.h b/acconfig.h index ee45fadb9..f03948346 100644 --- a/acconfig.h +++ b/acconfig.h @@ -4,3 +4,4 @@ #undef GETTEXT_PACKAGE #undef HAVE_LC_MESSAGES #undef NAUTILUS_PREFIX +#undef ENABLE_NAUTILUS_VIEW diff --git a/configure.in b/configure.in index 2b565093b..ad38160ae 100644 --- a/configure.in +++ b/configure.in @@ -67,7 +67,7 @@ if test "x$enable_nautilus_view" = "xauto"; then fi fi if test "x$enable_nautilus_view" = "xyes"; then - dnl AC_DEFINE(ENABLE_NAUTILUS_VIEW) + AC_DEFINE(ENABLE_NAUTILUS_VIEW) nautilusview_pkgs=libnautilus fi AC_MSG_RESULT($enable_nautilus_view) diff --git a/data/GNOME_Epiphany_NautilusView.server.in b/data/GNOME_Epiphany_NautilusView.server.in index 8af14019b..43754b711 100644 --- a/data/GNOME_Epiphany_NautilusView.server.in +++ b/data/GNOME_Epiphany_NautilusView.server.in @@ -22,9 +22,9 @@ <item value="x-directory/webdav"/> <item value="x-directory/webdav-prefer-directory"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" _value="Web Page (Epiphany)"/> - <oaf_attribute name="nautilus:view_as_label" type="string" _value="View as Web Page (Epiphany)"/> - <oaf_attribute name="nautilus:viewer_label" type="string" _value="Web Page Viewer (Epiphany)"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Web Page"/> + <oaf_attribute name="nautilus:view_as_label" type="string" _value="View as Web Page"/> + <oaf_attribute name="nautilus:viewer_label" type="string" _value="Web Page Viewer"/> </oaf_server> </oaf_info> diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c index a1084ce94..0412712f2 100644 --- a/src/ephy-nautilus-view.c +++ b/src/ephy-nautilus-view.c @@ -175,7 +175,7 @@ ephy_nautilus_view_instance_init (EphyNautilusView *view) (EPHY_EMBED_SHELL (ephy_shell)); view->priv = p; - view->priv->embed = ephy_embed_new (G_OBJECT (ephy_shell)); + view->priv->embed = ephy_embed_new (G_OBJECT (single)); g_object_ref (G_OBJECT (ephy_shell)); diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 8d8e461e8..eae78784b 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -16,6 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "ephy-shell.h" #include "ephy-embed-shell.h" #include "eel-gconf-extensions.h" @@ -41,7 +45,7 @@ #include <bonobo/bonobo-generic-factory.h> #include "ephy-nautilus-view.h" -#define EPHY_NAUTILUS_VIEW_OAFIID "OAFIID:GNOME_Ephy_NautilusViewFactory" +#define EPHY_NAUTILUS_VIEW_OAFIID "OAFIID:GNOME_Epiphany_NautilusViewFactory" #endif |