mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-25 02:36:07 +00:00
reviewed by: Pavel Cisler <pavel@eazel.com>
(only the first 2 changes, others unreviewed) * libnautilus-extensions/nautilus-trash-directory.c: (trash_destroy): Fix problem that might be what's killing the Tinderbox. We need to disconnect the signal handlers we add to the trash monitor. * src/file-manager/fm-directory-view.c: (load_location_callback): Always reload when navigating. This smooths over many anomalies, and hopefully will fix the nasty problems described in bug 4873 (files created in home directory (outside Nautilus) don't show up when I navigate there) and bug 4963 (starting the search service while running nautilus doesn't let you run searches). * configure.in: Fix gnome-http check that was previously just checking whether gnome-config was there or not! * src/nautilus-application.c: (nautilus_application_startup): Replace incorrect references to nautilus.oafinfo to instead mention Nautilus_Shell.oaf. * test/.cvsignore: Add a generated file.
This commit is contained in:
Darin Adler
parent
3b91745a51
commit
5fe1725cd6
27
ChangeLog
27
ChangeLog
|
|
@ -1,3 +1,29 @@
|
|||
2001-01-18 Darin Adler <darin@eazel.com>
|
||||
|
||||
reviewed by: Pavel Cisler <pavel@eazel.com>
|
||||
(only the first 2 changes, others unreviewed)
|
||||
|
||||
* libnautilus-extensions/nautilus-trash-directory.c:
|
||||
(trash_destroy): Fix problem that might be what's killing the
|
||||
Tinderbox. We need to disconnect the signal handlers we add to the
|
||||
trash monitor.
|
||||
|
||||
* src/file-manager/fm-directory-view.c: (load_location_callback):
|
||||
Always reload when navigating. This smooths over many anomalies,
|
||||
and hopefully will fix the nasty problems described in bug 4873
|
||||
(files created in home directory (outside Nautilus) don't show up
|
||||
when I navigate there) and bug 4963 (starting the search service
|
||||
while running nautilus doesn't let you run searches).
|
||||
|
||||
* configure.in: Fix gnome-http check that was previously just
|
||||
checking whether gnome-config was there or not!
|
||||
|
||||
* src/nautilus-application.c: (nautilus_application_startup):
|
||||
Replace incorrect references to nautilus.oafinfo to instead
|
||||
mention Nautilus_Shell.oaf.
|
||||
|
||||
* test/.cvsignore: Add a generated file.
|
||||
|
||||
2001-01-18 Robey Pointer <robey@eazel.com>
|
||||
|
||||
* icons/Makefile.am:
|
||||
|
|
@ -291,7 +317,6 @@
|
|||
* icons/eazel/sidebar_tab_pieces/left_bumper-prelight.png:
|
||||
* icons/eazel/sidebar_tab_pieces/left_bumper.png:
|
||||
|
||||
|
||||
2001-01-18 Andy Hertzfeld <andy@eazel.com>
|
||||
|
||||
backed out the Bonobo component throbber temporarily due
|
||||
|
|
|
|||
35
configure.in
35
configure.in
|
|
@ -477,15 +477,12 @@ LIBS=$GNOMEUI_LIBS
|
|||
AC_CHECK_FUNCS(gnome_canvas_set_dither)
|
||||
LIBS="$_libs"
|
||||
|
||||
dnl
|
||||
dnl We need the right version of bonobo because
|
||||
dnl the IDLs have changed.
|
||||
dnl
|
||||
AC_MSG_CHECKING(for Bonobo >= 0.27)
|
||||
dnl Bonobo
|
||||
AC_MSG_CHECKING(for Bonobo >= 0.32)
|
||||
if gnome-config --libs bonobox > /dev/null 2>&1; then
|
||||
vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \
|
||||
awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
|
||||
if test "$vers" -ge 27; then
|
||||
if test "$vers" -ge 32; then
|
||||
bonobo_ok=true
|
||||
else
|
||||
bonobo_ok=false
|
||||
|
|
@ -496,13 +493,11 @@ fi
|
|||
if $bonobo_ok; then
|
||||
AC_MSG_RESULT($vers found)
|
||||
else
|
||||
AC_MSG_ERROR(Bonobo 0.27 or newer is required to compile Nautilus)
|
||||
AC_MSG_ERROR(Bonobo 0.32 or newer is required to compile Nautilus)
|
||||
fi
|
||||
|
||||
AC_SUBST(GNOMECANVASPIXBUF_LIBS)
|
||||
AC_SUBST(GNOMECANVASPIXBUF_INCLUDEDIR)
|
||||
AC_SUBST(GNORBA_CFLAGS)
|
||||
AC_SUBST(GNORBA_LIBS)
|
||||
AC_SUBST(BONOBO_CFLAGS)
|
||||
AC_SUBST(BONOBO_LIBS)
|
||||
AC_SUBST(BONOBOX_CFLAGS)
|
||||
|
|
@ -546,19 +541,25 @@ AC_SUBST(XML_CFLAGS)
|
|||
dnl ====================================
|
||||
dnl = begin gnome-http checks
|
||||
dnl ====================================
|
||||
AC_PATH_PROG(GHTTP_CONFIG,gnome-config,no)
|
||||
if test x$GHTTP_CONFIG = xno; then
|
||||
AC_MSG_ERROR(Could not find ghttp libraries.)
|
||||
AC_MSG_CHECKING(for gnome-http)
|
||||
if gnome-config --libs ghttp > /dev/null 2>&1; then
|
||||
ghttp_ok=true
|
||||
else
|
||||
ghttp_ok=false
|
||||
fi
|
||||
if $ghttp_ok; then
|
||||
GHTTP_LIBS=`gnome-config --libs ghttp`
|
||||
GHTTP_CFLAGS=`gnome-config --cflags ghttp`
|
||||
AC_SUBST(GHTTP_LIBS)
|
||||
AC_SUBST(GHTTP_CFLAGS)
|
||||
AC_MSG_RESULT(found)
|
||||
else
|
||||
AC_MSG_ERROR(gnome-http is required to compile Nautilus)
|
||||
fi
|
||||
GHTTP_LIBS=`$GHTTP_CONFIG --libs ghttp`
|
||||
GHTTP_CFLAGS=`$GHTTP_CONFIG --cflags ghttp`
|
||||
AC_SUBST(GHTTP_LIBS)
|
||||
AC_SUBST(GHTTP_CFLAGS)
|
||||
dnl ====================================
|
||||
dnl = End ghttp checks
|
||||
dnl ====================================
|
||||
|
||||
|
||||
dnl ====================================
|
||||
dnl = begin applet checks
|
||||
dnl ====================================
|
||||
|
|
|
|||
|
|
@ -281,6 +281,9 @@ trash_destroy (GtkObject *object)
|
|||
|
||||
trash = NAUTILUS_TRASH_DIRECTORY (object);
|
||||
|
||||
gtk_signal_disconnect_by_data
|
||||
(GTK_OBJECT (nautilus_volume_monitor_get ()), trash);
|
||||
|
||||
nautilus_g_hash_table_safe_for_each
|
||||
(trash->details->volumes,
|
||||
remove_trash_volume_cover,
|
||||
|
|
|
|||
|
|
@ -281,6 +281,9 @@ trash_destroy (GtkObject *object)
|
|||
|
||||
trash = NAUTILUS_TRASH_DIRECTORY (object);
|
||||
|
||||
gtk_signal_disconnect_by_data
|
||||
(GTK_OBJECT (nautilus_volume_monitor_get ()), trash);
|
||||
|
||||
nautilus_g_hash_table_safe_for_each
|
||||
(trash->details->volumes,
|
||||
remove_trash_volume_cover,
|
||||
|
|
|
|||
|
|
@ -1143,8 +1143,6 @@ fm_directory_view_destroy (GtkObject *object)
|
|||
NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* fm_directory_view_display_selection_info:
|
||||
*
|
||||
|
|
@ -1316,22 +1314,15 @@ fm_directory_view_send_selection_change (FMDirectoryView *view)
|
|||
nautilus_g_list_free_deep (uris);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void
|
||||
load_location_callback (NautilusView *nautilus_view,
|
||||
const char *location,
|
||||
FMDirectoryView *directory_view)
|
||||
{
|
||||
NautilusDirectory *directory;
|
||||
gboolean force_reload;
|
||||
|
||||
directory = nautilus_directory_get (location);
|
||||
/* An additional load of the same directory is how the
|
||||
* framework tells us to reload.
|
||||
*/
|
||||
force_reload = directory == directory_view->details->model;
|
||||
load_directory (directory_view, directory, force_reload);
|
||||
load_directory (directory_view, directory, TRUE);
|
||||
nautilus_directory_unref (directory);
|
||||
}
|
||||
|
||||
|
|
@ -1887,8 +1878,6 @@ display_pending_timeout_callback (gpointer data)
|
|||
return displayed_some;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void
|
||||
schedule_idle_display_of_pending_files (FMDirectoryView *view)
|
||||
{
|
||||
|
|
@ -2042,8 +2031,6 @@ fm_directory_view_queue_file_change (FMDirectoryView *view, NautilusFile *file)
|
|||
g_list_free (singleton_list);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* fm_directory_view_clear:
|
||||
*
|
||||
|
|
|
|||
|
|
@ -384,11 +384,11 @@ nautilus_application_startup (NautilusApplication *application,
|
|||
break;
|
||||
case OAF_REG_NOT_LISTED:
|
||||
/* Can't register myself due to trouble locating the
|
||||
* nautilus.oafinfo file. This has happened when you
|
||||
* Nautilus_Shell.oaf file. This has happened when you
|
||||
* launch Nautilus with an LD_LIBRARY_PATH that
|
||||
* doesn't include the directory containg the oaf
|
||||
* library. It could also happen if the
|
||||
* nautilus.oafinfo file was not present for some
|
||||
* Nautilus_Shell.oaf file was not present for some
|
||||
* reason. Sometimes killing oafd and gconfd fixes
|
||||
* this problem but we don't exactly understand why,
|
||||
* since neither of the above causes explain it.
|
||||
|
|
@ -400,11 +400,11 @@ nautilus_application_startup (NautilusApplication *application,
|
|||
detailed_message = _("Nautilus can't be used now. "
|
||||
"Rebooting the computer or installing "
|
||||
"Nautilus again may fix the problem.\n\n"
|
||||
"OAF couldn't locate the nautilus.oafinfo file. "
|
||||
"OAF couldn't locate the Nautilus_Shell.oaf file. "
|
||||
"One cause of this seems to be an LD_LIBRARY_PATH "
|
||||
"that does not include the oaf library's directory. "
|
||||
"Another possible cause would be bad install "
|
||||
"with a missing nautilus.oafinfo file.\n\n"
|
||||
"with a missing Nautilus_Shell.oaf file.\n\n"
|
||||
"Sometimes killing oafd and gconfd fixes "
|
||||
"the problem, but we don't know why.\n\n"
|
||||
"We need a much less confusing message here for Nautilus 1.0.");
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.deps
|
||||
.libs
|
||||
*.la
|
||||
*.lo
|
||||
.deps
|
||||
.libs
|
||||
Makefile
|
||||
Makefile.in
|
||||
test-nautilus-async-activation
|
||||
|
|
@ -17,8 +17,8 @@ test-nautilus-image-tile
|
|||
test-nautilus-label
|
||||
test-nautilus-label-background
|
||||
test-nautilus-label-flavorful
|
||||
test-nautilus-label-scrolled
|
||||
test-nautilus-label-offset
|
||||
test-nautilus-label-scrolled
|
||||
test-nautilus-label-simple
|
||||
test-nautilus-label-wrapped
|
||||
test-nautilus-mime-actions
|
||||
|
|
@ -26,7 +26,8 @@ test-nautilus-mime-actions-set
|
|||
test-nautilus-password-dialog
|
||||
test-nautilus-pixbuf-tile
|
||||
test-nautilus-preferences
|
||||
test-nautilus-preferences-change
|
||||
test-nautilus-preferences-display
|
||||
test-nautilus-smooth-graphics
|
||||
test-nautilus-widgets
|
||||
test-nautilus-preferences-display
|
||||
test-nautilus-preferences-change
|
||||
test-nautilus-wrapped-label
|
||||
|
|
|
|||
Loading…
Reference in a new issue