Commit 6f9294ee authored by Elliot Lee's avatar Elliot Lee
Browse files

Add components/help/converters/* makefiles. Check for NULL directory



* configure.in: Add components/help/converters/* makefiles.
* libnautilus/nautilus-directory.c: Check for NULL directory
  result before doing stuff with it.
* src/ntl-index-panel.c: Ditto.
* src/ntl-prefs.c: Add help browser nav tree to list of possibilities.
* src/ntl-window-msgs.c: Handle non-VFS-handleable URIs correctly WRT 'up' button.
parent 8c176f1a
2000-01-27 Elliot Lee <sopwith@redhat.com>
* configure.in: Add components/help/converters/* makefiles.
* libnautilus/nautilus-directory.c: Check for NULL directory
result before doing stuff with it.
* src/ntl-index-panel.c: Ditto.
* src/ntl-prefs.c: Add help browser nav tree to list of possibilities.
* src/ntl-window-msgs.c: Handle non-VFS-handleable URIs correctly WRT 'up' button.
2000-01-27 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c:
......
SUBDIRS=history help html
SUBDIRS=history help html websearch
......@@ -26,6 +26,8 @@
#include "config.h"
#include <libnautilus/libnautilus.h>
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <limits.h>
#include <ctype.h>
......
......@@ -75,6 +75,9 @@ LIBWWW_CFLAGS=`$LIBWWW_CONFIG --cflags`
AC_SUBST(LIBWWW_LIBS)
AC_SUBST(LIBWWW_CFLAGS)
AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz
AC_SUBST(Z_LIBS)], AC_MSG_ERROR([*** zlib is required]))
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
......@@ -88,6 +91,9 @@ src/file-manager/Makefile
components/Makefile
components/history/Makefile
components/help/Makefile
components/help/converters/Makefile
components/help/converters/gnome-info2html2/Makefile
components/help/converters/gnome-man2html2/Makefile
components/html/Makefile
components/websearch/Makefile
])
......@@ -196,6 +196,9 @@ nautilus_directory_get (const char *uri)
} else {
/* Create a new directory object instead. */
directory = NAUTILUS_DIRECTORY (nautilus_directory_new (uri));
if(!directory)
return NULL;
g_assert (strcmp (directory->details->uri_text, uri) == 0);
/* Put it in the hash table. */
......
......@@ -196,6 +196,9 @@ nautilus_directory_get (const char *uri)
} else {
/* Create a new directory object instead. */
directory = NAUTILUS_DIRECTORY (nautilus_directory_new (uri));
if(!directory)
return NULL;
g_assert (strcmp (directory->details->uri_text, uri) == 0);
/* Put it in the hash table. */
......
......@@ -196,6 +196,9 @@ nautilus_directory_get (const char *uri)
} else {
/* Create a new directory object instead. */
directory = NAUTILUS_DIRECTORY (nautilus_directory_new (uri));
if(!directory)
return NULL;
g_assert (strcmp (directory->details->uri_text, uri) == 0);
/* Put it in the hash table. */
......
......@@ -360,6 +360,8 @@ nautilus_index_panel_set_up_info (NautilusIndexPanel *index_panel, const gchar*
if (index_panel->details->directory != NULL)
gtk_object_unref (GTK_OBJECT (index_panel->details->directory));
index_panel->details->directory = directory;
if(!directory)
return;
/* Connect the background changed signal to code that writes the color. */
background = nautilus_get_widget_background (GTK_WIDGET (index_panel));
......
......@@ -360,6 +360,8 @@ nautilus_index_panel_set_up_info (NautilusIndexPanel *index_panel, const gchar*
if (index_panel->details->directory != NULL)
gtk_object_unref (GTK_OBJECT (index_panel->details->directory));
index_panel->details->directory = directory;
if(!directory)
return;
/* Connect the background changed signal to code that writes the color. */
background = nautilus_get_widget_background (GTK_WIDGET (index_panel));
......
......@@ -216,9 +216,16 @@ nautilus_window_update_internals(NautilusWindow *window, NautilusNavigationInfo
}
new_uri = gnome_vfs_uri_new (loci->navinfo.requested_uri);
nautilus_window_allow_up(window,
gnome_vfs_uri_has_parent(new_uri));
gnome_vfs_uri_unref(new_uri);
if(!new_uri)
new_uri = gnome_vfs_uri_new (loci->navinfo.actual_uri);
if(new_uri)
{
nautilus_window_allow_up(window,
gnome_vfs_uri_has_parent(new_uri));
gnome_vfs_uri_unref(new_uri);
}
else
nautilus_window_allow_up(window, FALSE);
newni = Nautilus_NavigationInfo__alloc();
Nautilus_NavigationInfo__copy(newni, &loci->navinfo);
......
......@@ -360,6 +360,8 @@ nautilus_index_panel_set_up_info (NautilusIndexPanel *index_panel, const gchar*
if (index_panel->details->directory != NULL)
gtk_object_unref (GTK_OBJECT (index_panel->details->directory));
index_panel->details->directory = directory;
if(!directory)
return;
/* Connect the background changed signal to code that writes the color. */
background = nautilus_get_widget_background (GTK_WIDGET (index_panel));
......
......@@ -73,6 +73,7 @@ nautilus_prefs_load(void)
int i;
gnome_config_get_vector("/nautilus/prefs/global_meta_views=ntl_history_view ntl_websearch_view", &npieces, &pieces);
for(i = 0; i < npieces; i++)
nautilus_prefs.global_meta_views = g_slist_prepend(nautilus_prefs.global_meta_views, pieces[i]);
g_free(pieces);
......@@ -248,6 +249,7 @@ meta_prefs_create(GtkWidget *container)
meta_prefs_add_entry(mpi, "ntl_history_view", "History");
meta_prefs_add_entry(mpi, "ntl_websearch_view", "Web Search");
meta_prefs_add_entry(mpi, "hyperbola_navigation_tree", "Help tree");
for(items = NULL, cur = mpi->entry_list; cur; cur = cur->next)
{
......
......@@ -216,9 +216,16 @@ nautilus_window_update_internals(NautilusWindow *window, NautilusNavigationInfo
}
new_uri = gnome_vfs_uri_new (loci->navinfo.requested_uri);
nautilus_window_allow_up(window,
gnome_vfs_uri_has_parent(new_uri));
gnome_vfs_uri_unref(new_uri);
if(!new_uri)
new_uri = gnome_vfs_uri_new (loci->navinfo.actual_uri);
if(new_uri)
{
nautilus_window_allow_up(window,
gnome_vfs_uri_has_parent(new_uri));
gnome_vfs_uri_unref(new_uri);
}
else
nautilus_window_allow_up(window, FALSE);
newni = Nautilus_NavigationInfo__alloc();
Nautilus_NavigationInfo__copy(newni, &loci->navinfo);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment