diff options
44 files changed, 172 insertions, 50 deletions
@@ -1,3 +1,91 @@ +2001-02-27 Darin Adler <darin@eazel.com> + + reviewed by: John Sullivan <sullivan@eazel.com> + + Fixed bug 6725 (Crash on Refresh if viewed file/folder is deleted + outside of Nautilus): + + * src/nautilus-window-manage-views.c: (free_location_change): + Reorder so we cancel the callbacks before more I/O has the chance + to happen. + * libnautilus-extensions/nautilus-directory-async.c: + (nautilus_directory_async_state_changed): Don't do any I/O for a + NautilusDirectory object once it's destroyed. Unfortunately, it's + still possible for destroying one NautilusDirectory object to + cause I/O to happen on another, so this doesn't fix the bug (which + is why we also need the change above). + + Fixed bug 7080 (Nautilus build failure on Red Hat 7.) + + * libnautilus-extensions/nautilus-medusa-support.c: Fixed the bad + #endif with non-comment text after it. + + Worked on bug 6928 (create fallback mechanism so eazel-logos + version of each graphic is found if present). We still need a + separate fallback mechanism for the theme XML file, since the + throbber has a different number of frames. + + * libnautilus-extensions/nautilus-file-utilities.c: + (nautilus_get_pixmap_directory): Simplify. + (nautilus_pixmap_file): Look in eazel-logos directory first, so we + will pick up logo graphics if there, and non-logo graphics otherwise. + * test/test-nautilus-image-simple.c: (main): Remove a reference to + a logo graphic. + + * eazel-logos/.cvsignore: + * eazel-logos/About_Image.png: + * eazel-logos/about_background.png: + * eazel-logos/druid_header.png: + * eazel-logos/eazel-logo-right-side-logo.png: + * eazel-logos/throbber/.cvsignore: + * eazel-logos/throbber/001.png: + * eazel-logos/throbber/002.png: + * eazel-logos/throbber/003.png: + * eazel-logos/throbber/004.png: + * eazel-logos/throbber/005.png: + * eazel-logos/throbber/006.png: + * eazel-logos/throbber/007.png: + * eazel-logos/throbber/008.png: + * eazel-logos/throbber/009.png: + * eazel-logos/throbber/010.png: + * eazel-logos/throbber/011.png: + * eazel-logos/throbber/012.png: + * eazel-logos/throbber/013.png: + * eazel-logos/throbber/014.png: + * eazel-logos/throbber/015.png: + * eazel-logos/throbber/rest.png: + * eazel-logos/default.xml: + Added a new directory with copies of all graphics with the Eazel + logo in them. Next we have to make this directory actually build + and install these logos. Then Non-Eazel-logo'd graphics suitable + for GPL will replace the original copies and these will keep the + Eazel logo versions. The directory also contains the XML file for + the default theme, since we need to change the throbber frames for + the logo vs. non-logo version of the throbber. + + * components/services/nautilus-dependent-shared/icons/Makefile.am: + * components/services/nautilus-dependent-shared/icons/eazel-cloud-logo.png: + * components/services/nautilus-dependent-shared/icons/eazel-services-logo.png: + * components/services/nautilus-dependent-shared/icons/service-summary-logo-top.png: + * components/services/nautilus-dependent-shared/icons/startup-logo.png: + * icons/Makefile.am: + * icons/eazel-logo.gif: + * icons/nautilus-logo.png: + Removed unused graphics with the Eazel logo in them. There are a + lot more unused graphics and someone should go through and remove + them. I'm thinking of writing a script to do it. + + Other changes. + + * components/services/install/nautilus-view/.cvsignore: + * components/services/vault/.cvsignore: + * components/services/vault/command-line/.cvsignore: + * data/top/.cvsignore: + Re-removed .cvsignore files for empty directories. + + * THANKS: Corrected one email address. + * check-THANKS.pl: Updated for the latest ChangeLog typos. + 2001-02-27 John Sullivan <sullivan@eazel.com> reviewed by: Darin Adler <darin@eazel.com> @@ -309,7 +397,6 @@ * icons/crux_eggplant/i-directory.xml: Lots of folder stuff... - 2001-02-26 J Shane Culpepper <pepper@eazel.com> reviewed by: John Sullivan <sullivan@eazel.com> @@ -8034,7 +8121,7 @@ Thu Feb 22 04:13:13 2001 George Lebl <jirka@5z.com> * libnautilus-extensions/nautilus-program-chooser.c: (repopulate_program_list): Select first item in list after sorting. -2001-02-04 Ian McKellar,,, <ian@eazel.com> +2001-02-04 Ian McKellar <ian@eazel.com> reviewed by: Maciej Stachowiak <mjs@eazel.com> @@ -10,7 +10,7 @@ Cody Russell <car0969@gamma2.uta.edu> - bug fixes Dan Mueth <dan@eazel.com> - documentation, help system design Don Melton <don@eazel.com> - Management, moral support, design help Eric Fischer <eric@eazel.com> - bug fixes -Fatih Demir <kabalak@gmx.net> - bug fixes +Fatih Demir <kabalak@kabalak.net> - bug fixes Gregory S. Hayes <ghayes@syncomm.org> - bug fixes Havoc Pennington <hp@redhat.com> - various contributions JP Rosevear <jpr@arcavia.com> - bug fixes diff --git a/check-THANKS.pl b/check-THANKS.pl index 874cad6a8..500048536 100755 --- a/check-THANKS.pl +++ b/check-THANKS.pl @@ -42,6 +42,7 @@ my %name_map = ("Darin as Andy" => "Darin Adler", "Pavel" => "Pavel Císler", "Eskil Olsen" => "Eskil Heyn Olsen", "Szabolcs BAN" => "Szabolcs Ban", + "arik devens" => "Arik Devens", "Robin Slomkowski" => "Robin * Slomkowski"); # Map from alternate email addresses of some users to canonical versions @@ -62,6 +63,9 @@ my %email_map = ('at@ue-spacy.com' => 'tagoh@gnome.gr.jp', 'carlos@gnome-db.org' => 'carlos@hispalinux.es', 'mawa@iname.com' => 'mawarkus@gnome.org', 'linuxfan@ionet.net' => 'josh@eazel.com', + 'rslomkow@rslomkow.org' => 'rslomkow@eazel.com', + 'kabalak@gtranslator.org' => 'kabalak@kabalak.net', + 'kabalak@gmx.net' => 'kabalak@kabalak.net', 'arik@gnome.org' => 'arik@eazel.com'); diff --git a/components/services/install/nautilus-view/.cvsignore b/components/services/install/nautilus-view/.cvsignore deleted file mode 100644 index 0e0c3aea3..000000000 --- a/components/services/install/nautilus-view/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -nautilus-service-install-view -.libs -Nautilus_View_install.oaf -.deps -Makefile -Makefile.in diff --git a/components/services/nautilus-dependent-shared/icons/Makefile.am b/components/services/nautilus-dependent-shared/icons/Makefile.am index 09c4b726f..d987c7c6b 100644 --- a/components/services/nautilus-dependent-shared/icons/Makefile.am +++ b/components/services/nautilus-dependent-shared/icons/Makefile.am @@ -4,23 +4,19 @@ icondir = $(datadir)/pixmaps/nautilus icon_DATA =\ config-gather.png \ - eazel-cloud-logo.png \ eazel-logo-left-side-repeat.png \ eazel-logo-right-side-logo.png \ eazel-services-header-middle-fill.png \ eazel-services-logo-tile.png \ - eazel-services-logo.png \ inventory-service-icon.png \ register.png \ service-summary-large-grey-section.png \ service-summary-large-teal-section.png \ service-summary-logo-bottom.png \ - service-summary-logo-top.png \ service-summary-short-grey-section.png \ service-watch.png \ services-warning.png \ softcat-service-icon.png \ - startup-logo.png \ summary-service-normal-fill.png \ summary-service-normal-left-bumper.png \ summary-service-normal-right-bumper.png \ diff --git a/components/services/nautilus-dependent-shared/icons/eazel-cloud-logo.png b/components/services/nautilus-dependent-shared/icons/eazel-cloud-logo.png Binary files differdeleted file mode 100644 index 573020ab6..000000000 --- a/components/services/nautilus-dependent-shared/icons/eazel-cloud-logo.png +++ /dev/null diff --git a/components/services/nautilus-dependent-shared/icons/eazel-services-logo.png b/components/services/nautilus-dependent-shared/icons/eazel-services-logo.png Binary files differdeleted file mode 100644 index f5b1a1efd..000000000 --- a/components/services/nautilus-dependent-shared/icons/eazel-services-logo.png +++ /dev/null diff --git a/components/services/nautilus-dependent-shared/icons/service-summary-logo-top.png b/components/services/nautilus-dependent-shared/icons/service-summary-logo-top.png Binary files differdeleted file mode 100644 index fa391a0cb..000000000 --- a/components/services/nautilus-dependent-shared/icons/service-summary-logo-top.png +++ /dev/null diff --git a/components/services/nautilus-dependent-shared/icons/startup-logo.png b/components/services/nautilus-dependent-shared/icons/startup-logo.png Binary files differdeleted file mode 100644 index ed55c4973..000000000 --- a/components/services/nautilus-dependent-shared/icons/startup-logo.png +++ /dev/null diff --git a/components/services/vault/command-line/.cvsignore b/components/services/vault/command-line/.cvsignore deleted file mode 100644 index 888eb80ed..000000000 --- a/components/services/vault/command-line/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -eazel-vault -.libs -.deps -Makefile -Makefile.in diff --git a/components/services/vault/.cvsignore b/eazel-logos/.cvsignore index 282522db0..282522db0 100644 --- a/components/services/vault/.cvsignore +++ b/eazel-logos/.cvsignore diff --git a/eazel-logos/About_Image.png b/eazel-logos/About_Image.png Binary files differnew file mode 100644 index 000000000..eb3a9ff9e --- /dev/null +++ b/eazel-logos/About_Image.png diff --git a/eazel-logos/about_background.png b/eazel-logos/about_background.png Binary files differnew file mode 100644 index 000000000..a96d69598 --- /dev/null +++ b/eazel-logos/about_background.png diff --git a/eazel-logos/default.xml b/eazel-logos/default.xml new file mode 100644 index 000000000..f424f46ab --- /dev/null +++ b/eazel-logos/default.xml @@ -0,0 +1,30 @@ +<?xml version="1.0"?> + +<theme _name="Default" _description="This is the default theme for Nautilus."> + + <sidebar sidebar_background_tile_image="./side_bar_image.png" + sidebar_background_color="rgb:4747/4A4A/7C7C-rgb:2222/2323/3A3A:h" + title_color="rgb:FFFF/FFFF/FFFF" + title_info_color="rgb:FFFF/FFFF/FFFF" + title_shadow_color="rgb:0000/0000/0000" + tab_piece_images="sidebar_tab_pieces" combine="true" + left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="rgb:FFFF/FFFF/FFFF" + tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" /> + + <desktop background_tile_image="patterns/brushed_metal.png" background_color="rgb:FFFF/FFFF/FFFF"/> + + <directory background_color="rgb:CFFF/D333/D999" + selection_box_color_rgba="0x727D974C" + selection_box_color="rgb:7222/7DDD/9777" /> + + <icon highlight_background_color="rgb:0000/0000/0000" + highlight_text_color="rgb:FFFF/FFFF/FFFF" + text_fill_color="rgb:FFFF/FFFF/FFFF"/> + + <thumbnails frame_offsets="3,3,6,6"/> + + <throbber frame_count="15" url="http://www.eazel.com" delay="75"/> + + <zoom_control number_v_offset="-6" number_h_offset="-2" digit_width="6"/> + +</theme> diff --git a/eazel-logos/druid_header.png b/eazel-logos/druid_header.png Binary files differnew file mode 100644 index 000000000..e34a2f14a --- /dev/null +++ b/eazel-logos/druid_header.png diff --git a/eazel-logos/eazel-logo-right-side-logo.png b/eazel-logos/eazel-logo-right-side-logo.png Binary files differnew file mode 100644 index 000000000..ff76d7d2f --- /dev/null +++ b/eazel-logos/eazel-logo-right-side-logo.png diff --git a/data/top/.cvsignore b/eazel-logos/throbber/.cvsignore index 282522db0..282522db0 100644 --- a/data/top/.cvsignore +++ b/eazel-logos/throbber/.cvsignore diff --git a/eazel-logos/throbber/001.png b/eazel-logos/throbber/001.png Binary files differnew file mode 100644 index 000000000..187bcd7c4 --- /dev/null +++ b/eazel-logos/throbber/001.png diff --git a/eazel-logos/throbber/002.png b/eazel-logos/throbber/002.png Binary files differnew file mode 100644 index 000000000..8acae28b4 --- /dev/null +++ b/eazel-logos/throbber/002.png diff --git a/eazel-logos/throbber/003.png b/eazel-logos/throbber/003.png Binary files differnew file mode 100644 index 000000000..00342738e --- /dev/null +++ b/eazel-logos/throbber/003.png diff --git a/eazel-logos/throbber/004.png b/eazel-logos/throbber/004.png Binary files differnew file mode 100644 index 000000000..49a9271ba --- /dev/null +++ b/eazel-logos/throbber/004.png diff --git a/eazel-logos/throbber/005.png b/eazel-logos/throbber/005.png Binary files differnew file mode 100644 index 000000000..a6c518661 --- /dev/null +++ b/eazel-logos/throbber/005.png diff --git a/eazel-logos/throbber/006.png b/eazel-logos/throbber/006.png Binary files differnew file mode 100644 index 000000000..b45bfcd76 --- /dev/null +++ b/eazel-logos/throbber/006.png diff --git a/eazel-logos/throbber/007.png b/eazel-logos/throbber/007.png Binary files differnew file mode 100644 index 000000000..58004a43a --- /dev/null +++ b/eazel-logos/throbber/007.png diff --git a/eazel-logos/throbber/008.png b/eazel-logos/throbber/008.png Binary files differnew file mode 100644 index 000000000..1702ced20 --- /dev/null +++ b/eazel-logos/throbber/008.png diff --git a/eazel-logos/throbber/009.png b/eazel-logos/throbber/009.png Binary files differnew file mode 100644 index 000000000..a2830eaad --- /dev/null +++ b/eazel-logos/throbber/009.png diff --git a/eazel-logos/throbber/010.png b/eazel-logos/throbber/010.png Binary files differnew file mode 100644 index 000000000..483d3c6ac --- /dev/null +++ b/eazel-logos/throbber/010.png diff --git a/eazel-logos/throbber/011.png b/eazel-logos/throbber/011.png Binary files differnew file mode 100644 index 000000000..00fe8457e --- /dev/null +++ b/eazel-logos/throbber/011.png diff --git a/eazel-logos/throbber/012.png b/eazel-logos/throbber/012.png Binary files differnew file mode 100644 index 000000000..2daaa4680 --- /dev/null +++ b/eazel-logos/throbber/012.png diff --git a/eazel-logos/throbber/013.png b/eazel-logos/throbber/013.png Binary files differnew file mode 100644 index 000000000..cf9745eb3 --- /dev/null +++ b/eazel-logos/throbber/013.png diff --git a/eazel-logos/throbber/014.png b/eazel-logos/throbber/014.png Binary files differnew file mode 100644 index 000000000..54954fa52 --- /dev/null +++ b/eazel-logos/throbber/014.png diff --git a/eazel-logos/throbber/015.png b/eazel-logos/throbber/015.png Binary files differnew file mode 100644 index 000000000..e5aabdadc --- /dev/null +++ b/eazel-logos/throbber/015.png diff --git a/eazel-logos/throbber/rest.png b/eazel-logos/throbber/rest.png Binary files differnew file mode 100644 index 000000000..785bf3f4a --- /dev/null +++ b/eazel-logos/throbber/rest.png diff --git a/icons/Makefile.am b/icons/Makefile.am index 130e16370..6338f3334 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -31,7 +31,6 @@ icon_DATA =\ druid_header.png \ druid_header_stretch.png \ druid_sidebar.png \ - eazel-logo.gif \ emblem-OK.svg \ emblem-broken-link.png \ emblem-certified.svg \ @@ -221,7 +220,6 @@ icon_DATA =\ loading-aa.png \ manual.png \ multi-ok.png \ - nautilus-logo.png \ nautilus-mini-logo.png \ netscape.png \ not.png \ diff --git a/icons/eazel-logo.gif b/icons/eazel-logo.gif Binary files differdeleted file mode 100644 index b9c13966d..000000000 --- a/icons/eazel-logo.gif +++ /dev/null diff --git a/icons/nautilus-logo.png b/icons/nautilus-logo.png Binary files differdeleted file mode 100644 index 3af114566..000000000 --- a/icons/nautilus-logo.png +++ /dev/null diff --git a/libnautilus-extensions/nautilus-directory-async.c b/libnautilus-extensions/nautilus-directory-async.c index 3d82265c7..0b90aae1d 100644 --- a/libnautilus-extensions/nautilus-directory-async.c +++ b/libnautilus-extensions/nautilus-directory-async.c @@ -3267,6 +3267,9 @@ nautilus_directory_async_state_changed (NautilusDirectory *directory) * is not longer needed once the callbacks are satisfied. */ + if (GTK_OBJECT_DESTROYED (directory)) { + return; + } if (directory->details->in_async_service_loop) { directory->details->state_changed = TRUE; return; diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c index 6ea15c18a..52caa9b1b 100644 --- a/libnautilus-extensions/nautilus-file-utilities.c +++ b/libnautilus-extensions/nautilus-file-utilities.c @@ -1034,11 +1034,7 @@ nautilus_get_user_main_directory (void) char * nautilus_get_pixmap_directory (void) { - char *pixmap_directory; - - pixmap_directory = g_strdup_printf ("%s/%s", DATADIR, "pixmaps/nautilus"); - - return pixmap_directory; + return g_strdup (DATADIR "/pixmaps/nautilus"); } /* convenience routine to use gnome-vfs to test if a string is a remote uri */ @@ -1064,13 +1060,21 @@ nautilus_pixmap_file (const char *partial_path) { char *path; + /* Look for a non-GPL Eazel logo version. */ + path = nautilus_make_path (DATADIR "/pixmaps/nautilus/eazel-logos", partial_path); + if (g_file_exists (path)) { + return path; + } + g_free (path); + + /* Look for a GPL version. */ path = nautilus_make_path (DATADIR "/pixmaps/nautilus", partial_path); if (g_file_exists (path)) { return path; - } else { - g_free (path); - return NULL; } + g_free (path); + + return NULL; } GnomeVFSResult diff --git a/libnautilus-extensions/nautilus-medusa-support.c b/libnautilus-extensions/nautilus-medusa-support.c index 4e85f09c7..6e591b1fc 100644 --- a/libnautilus-extensions/nautilus-medusa-support.c +++ b/libnautilus-extensions/nautilus-medusa-support.c @@ -32,7 +32,7 @@ #ifdef HAVE_MEDUSA #include <libmedusa/medusa-system-state.h> -#endif HAVE_MEDUSA +#endif gboolean nautilus_medusa_services_have_been_enabled_by_user (void) diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 3d82265c7..0b90aae1d 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -3267,6 +3267,9 @@ nautilus_directory_async_state_changed (NautilusDirectory *directory) * is not longer needed once the callbacks are satisfied. */ + if (GTK_OBJECT_DESTROYED (directory)) { + return; + } if (directory->details->in_async_service_loop) { directory->details->state_changed = TRUE; return; diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index 6ea15c18a..52caa9b1b 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -1034,11 +1034,7 @@ nautilus_get_user_main_directory (void) char * nautilus_get_pixmap_directory (void) { - char *pixmap_directory; - - pixmap_directory = g_strdup_printf ("%s/%s", DATADIR, "pixmaps/nautilus"); - - return pixmap_directory; + return g_strdup (DATADIR "/pixmaps/nautilus"); } /* convenience routine to use gnome-vfs to test if a string is a remote uri */ @@ -1064,13 +1060,21 @@ nautilus_pixmap_file (const char *partial_path) { char *path; + /* Look for a non-GPL Eazel logo version. */ + path = nautilus_make_path (DATADIR "/pixmaps/nautilus/eazel-logos", partial_path); + if (g_file_exists (path)) { + return path; + } + g_free (path); + + /* Look for a GPL version. */ path = nautilus_make_path (DATADIR "/pixmaps/nautilus", partial_path); if (g_file_exists (path)) { return path; - } else { - g_free (path); - return NULL; } + g_free (path); + + return NULL; } GnomeVFSResult diff --git a/libnautilus-private/nautilus-medusa-support.c b/libnautilus-private/nautilus-medusa-support.c index 4e85f09c7..6e591b1fc 100644 --- a/libnautilus-private/nautilus-medusa-support.c +++ b/libnautilus-private/nautilus-medusa-support.c @@ -32,7 +32,7 @@ #ifdef HAVE_MEDUSA #include <libmedusa/medusa-system-state.h> -#endif HAVE_MEDUSA +#endif gboolean nautilus_medusa_services_have_been_enabled_by_user (void) diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 1d8998c5c..bc56896ab 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -1043,18 +1043,16 @@ free_location_change (NautilusWindow *window) g_free (window->details->pending_location); window->details->pending_location = NULL; - if (window->details->pending_location_as_directory != NULL) { - nautilus_directory_file_monitor_remove (window->details->pending_location_as_directory, - window); - nautilus_directory_unref (window->details->pending_location_as_directory); - window->details->pending_location_as_directory = NULL; - } - + /* Important to do this first, because destroying the + * pending_location_as_directory can cause additional I/O to + * complete, which might cause the initial view callback to be + * called. + */ if (window->details->determine_view_handle != NULL) { nautilus_determine_initial_view_cancel (window->details->determine_view_handle); window->details->determine_view_handle = NULL; } - + if (window->new_content_view != NULL) { if (window->new_content_view != window->content_view) { disconnect_view (window, window->new_content_view); @@ -1063,6 +1061,13 @@ free_location_change (NautilusWindow *window) gtk_object_unref (GTK_OBJECT (window->new_content_view)); window->new_content_view = NULL; } + + if (window->details->pending_location_as_directory != NULL) { + nautilus_directory_file_monitor_remove (window->details->pending_location_as_directory, + window); + nautilus_directory_unref (window->details->pending_location_as_directory); + window->details->pending_location_as_directory = NULL; + } } static void diff --git a/test/test-nautilus-image-simple.c b/test/test-nautilus-image-simple.c index 0b169633f..0e0c5c053 100644 --- a/test/test-nautilus-image-simple.c +++ b/test/test-nautilus-image-simple.c @@ -132,11 +132,10 @@ main (int argc, char* argv[]) 100, "/usr/share/pixmaps/gnome-globe.png", "/gnome/share/nautilus/patterns/pale_coins.png"); - //window = image_window_new ("Nautilus Image", 100, "eazel-logo-right-side-logo.png"); - //window = image_window_new ("Nautilus Image", 100, "foo.png"); + /* window = image_window_new ("Nautilus Image", 100, "foo.png"); */ -// debug_widget_set_background_image (window->window, "pale_coins.png"); -// debug_widget_set_background_image (window->image, "pale_coins.png"); + /* debug_widget_set_background_image (window->window, "pale_coins.png"); */ + /* debug_widget_set_background_image (window->image, "pale_coins.png"); */ gtk_widget_show (window->window); |
