diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-10-05 23:28:55 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-10-05 23:28:55 +0000 |
| commit | e5afc6511c701d715ad264de9f36fd2fe27a86e0 (patch) | |
| tree | b21f48f17fb56ff08d3fcf60114337dfe6e496a9 | |
| parent | e1ccd6d519e0525d73da358359f37bceb77b23ef (diff) | |
| download | nautilus-e5afc6511c701d715ad264de9f36fd2fe27a86e0.tar.gz | |
removed Remove the code to look for Eazel logos.
* eazel-logos: removed
* libnautilus-private/nautilus-file-utilities.c:
(nautilus_pixmap_file): Remove the code to look for Eazel logos.
* configure.in:
* Makefile.am:
* nautilus.spec.in:
Remove the code to include the Eazel logos in the tarball and
the package.
* HACKING: Remove the instructions on how to omit the Eazel logos.
32 files changed, 14 insertions, 196 deletions
@@ -1,3 +1,17 @@ +2001-10-05 Darin Adler <darin@bentspoon.com> + + * eazel-logos: removed + * libnautilus-private/nautilus-file-utilities.c: + (nautilus_pixmap_file): Remove the code to look for Eazel logos. + + * configure.in: + * Makefile.am: + * nautilus.spec.in: + Remove the code to include the Eazel logos in the tarball and + the package. + + * HACKING: Remove the instructions on how to omit the Eazel logos. + 2001-10-05 Benedikt Roth <Benedikt.Roth@gmx.net> * src/file-manager/fm-properties-window.c: (uri_is_local_image), @@ -28,14 +28,6 @@ Patches should be made with 'cvs diff -pu >patch' and should conform to Nautilus coding style as described in docs/style-guide.html Please read other relevant documents in the docs directory too. -Please note that, while Nautilus is GPL software, the Eazel trademarks -are not made available under the terms of the GPL. Specifically, you -need permission to distribute the Eazel logo with CVS versions or -modified versions of Nautilus. If you wish to distribute a -non-released or modified version of Nautilus, please make sure to -remove the eazel-logos directory from the source tree. No source code -changes are necessary. Details are in the eazel-logos/LICENSE file. - ========================= 2: Using the leak checker ========================= diff --git a/Makefile.am b/Makefile.am index be853d4ca..64ef613f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,54 +103,6 @@ nautilus-config: nautilus-config.in Makefile ################################################################## # -# eazel-logos/*, if it exists -# -################################################################## - -icondir = $(datadir)/pixmaps/nautilus/eazel-logos - -if HAVE_EAZEL_LOGOS -EAZEL_LOGOS_ICONS = \ - $(top_srcdir)/eazel-logos/LICENSE \ - $(top_srcdir)/eazel-logos/About_Image.png \ - $(top_srcdir)/eazel-logos/about_background.png \ - $(top_srcdir)/eazel-logos/default.xml \ - $(top_srcdir)/eazel-logos/druid_header.png \ - $(top_srcdir)/eazel-logos/eazel-logo-right-side-logo.png \ - $(NULL) -endif - -################################################################## -# -# eazel-logos/throbber/*, if it exists -# -################################################################## - -throbberdir = $(datadir)/pixmaps/nautilus/eazel-logos/throbber - -if HAVE_EAZEL_LOGOS -EAZEL_LOGOS_THROBBER = \ - $(top_srcdir)/eazel-logos/throbber/001.png \ - $(top_srcdir)/eazel-logos/throbber/002.png \ - $(top_srcdir)/eazel-logos/throbber/003.png \ - $(top_srcdir)/eazel-logos/throbber/004.png \ - $(top_srcdir)/eazel-logos/throbber/005.png \ - $(top_srcdir)/eazel-logos/throbber/006.png \ - $(top_srcdir)/eazel-logos/throbber/007.png \ - $(top_srcdir)/eazel-logos/throbber/008.png \ - $(top_srcdir)/eazel-logos/throbber/009.png \ - $(top_srcdir)/eazel-logos/throbber/010.png \ - $(top_srcdir)/eazel-logos/throbber/011.png \ - $(top_srcdir)/eazel-logos/throbber/012.png \ - $(top_srcdir)/eazel-logos/throbber/013.png \ - $(top_srcdir)/eazel-logos/throbber/014.png \ - $(top_srcdir)/eazel-logos/throbber/015.png \ - $(top_srcdir)/eazel-logos/throbber/rest.png \ - $(NULL) -endif - -################################################################## -# # dist-hook # ################################################################## @@ -158,23 +110,6 @@ endif dist-hook: nautilus.spec cp nautilus.spec $(distdir) -# This is ridiculous, but automake apparently won't allow conditionals -# in EXTRA_DIST. - - mkdir -p $(distdir)/eazel-logos - list='$(EAZEL_LOGOS_ICONS)'; \ - for i in $$list; \ - do \ - cp $$i $(distdir)/eazel-logos; \ - done - - mkdir -p $(distdir)/eazel-logos/throbber - list='$(EAZEL_LOGOS_THROBBER)'; \ - for i in $$list; \ - do \ - cp $$i $(distdir)/eazel-logos/throbber; \ - done - ################################################################## # # install-data-hook @@ -189,23 +124,3 @@ install-data-hook: nautilus-clean.sh $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ else :; fi; \ done - -# This is slightly less ridiculous. I'm doing it this way instead of with -# an automake DATA rule because it's easier to deal with the relative paths -# like this. - - $(mkinstalldirs) $(icondir) - @list='$(EAZEL_LOGOS_ICONS)'; \ - for i in $$list; \ - do \ - echo $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ - $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ - done - - $(mkinstalldirs) $(throbberdir) - @list='$(EAZEL_LOGOS_THROBBER)'; \ - for i in $$list; \ - do \ - echo $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ - $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ - done diff --git a/configure.in b/configure.in index 2cdc4fe70..feed83b80 100644 --- a/configure.in +++ b/configure.in @@ -567,29 +567,6 @@ dnl = begin applet checks dnl ==================================== dnl ==================================== -dnl = begin eazel-logos check -dnl ==================================== - -if test -d eazel-logos -then - HAVE_EAZEL_LOGOS=yes - EAZEL_LOGOS_PNG='%{_datadir}/pixmaps/nautilus/eazel-logos/*.png' - EAZEL_LOGOS_XML='%{_datadir}/pixmaps/nautilus/eazel-logos/*.xml' - EAZEL_LOGOS_LICENSE='%{_datadir}/pixmaps/nautilus/eazel-logos/LICENSE' - EAZEL_LOGOS_THROB='%{_datadir}/pixmaps/nautilus/eazel-logos/throbber/*.png' -fi - -AM_CONDITIONAL(HAVE_EAZEL_LOGOS, test "x$HAVE_EAZEL_LOGOS" = "xyes") -AC_SUBST(EAZEL_LOGOS_PNG) -AC_SUBST(EAZEL_LOGOS_XML) -AC_SUBST(EAZEL_LOGOS_LICENSE) -AC_SUBST(EAZEL_LOGOS_THROB) - -dnl ==================================== -dnl = end eazel-logos check -dnl ==================================== - -dnl ==================================== dnl = begin gdk-pixbuf checks dnl ==================================== AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED,, diff --git a/eazel-logos/.cvsignore b/eazel-logos/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/eazel-logos/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/eazel-logos/About_Image.png b/eazel-logos/About_Image.png Binary files differdeleted file mode 100644 index eb3a9ff9e..000000000 --- a/eazel-logos/About_Image.png +++ /dev/null diff --git a/eazel-logos/LICENSE b/eazel-logos/LICENSE deleted file mode 100644 index 45dd219d5..000000000 --- a/eazel-logos/LICENSE +++ /dev/null @@ -1,36 +0,0 @@ -Copyright 2001 Eazel, Inc., and others. All Rights Reserved. Eazel, -the Eazel Logo, and Nautilus are trademarks of Eazel, Inc. - -This directory (the "Logo Directory") contains files of the Eazel Logo -(the "Logo"). Eazel, Inc. has created and distributes certain -software under the GNU General Public License (GPL) (the "Eazel GPL -Software"). This Logo Directory is distinct from the Eazel GPL -Software and is not governed by the terms of the GPL. The files -contained in this directory may only be used in conjunction with an -official release of Eazel GPL Software that has not been modified from -the form it was made available by Eazel, Inc. and that was obtained -directly from Eazel, Inc. If you modify or redistribute Eazel GPL -software, you may not use, copy, or redistribute files contained in -this Logo Directory with the modified or redistributed software. - -Eazel, the Eazel logo, and Nautilus are trademarks of Eazel, Inc. (the -"Eazel Trademarks"). The Eazel Trademarks are not subject to the -provisions of the GPL. The Eazel Trademarks may only be included with -Eazel GPL Software that has not been modified from the form it was -made available by Eazel, Inc. and that was obtained directly from -Eazel, Inc. If you modify or redistribute Eazel GPL software, the -Eazel Trademarks must be removed from the modified or redistributed -software. - -NO WARRANTY. THIS PACKAGE IS PROVIDED "AS IS" AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL EAZEL, INC. BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS PACKAGE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - diff --git a/eazel-logos/Makefile.am b/eazel-logos/Makefile.am deleted file mode 100644 index e69de29bb..000000000 --- a/eazel-logos/Makefile.am +++ /dev/null diff --git a/eazel-logos/about_background.png b/eazel-logos/about_background.png Binary files differdeleted file mode 100644 index a96d69598..000000000 --- a/eazel-logos/about_background.png +++ /dev/null diff --git a/eazel-logos/default.xml b/eazel-logos/default.xml deleted file mode 100644 index 76725acd8..000000000 --- a/eazel-logos/default.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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" - 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 differdeleted file mode 100644 index e34a2f14a..000000000 --- a/eazel-logos/druid_header.png +++ /dev/null diff --git a/eazel-logos/eazel-logo-right-side-logo.png b/eazel-logos/eazel-logo-right-side-logo.png Binary files differdeleted file mode 100644 index ff76d7d2f..000000000 --- a/eazel-logos/eazel-logo-right-side-logo.png +++ /dev/null diff --git a/eazel-logos/throbber/.cvsignore b/eazel-logos/throbber/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/eazel-logos/throbber/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/eazel-logos/throbber/001.png b/eazel-logos/throbber/001.png Binary files differdeleted file mode 100644 index 187bcd7c4..000000000 --- a/eazel-logos/throbber/001.png +++ /dev/null diff --git a/eazel-logos/throbber/002.png b/eazel-logos/throbber/002.png Binary files differdeleted file mode 100644 index 8acae28b4..000000000 --- a/eazel-logos/throbber/002.png +++ /dev/null diff --git a/eazel-logos/throbber/003.png b/eazel-logos/throbber/003.png Binary files differdeleted file mode 100644 index 00342738e..000000000 --- a/eazel-logos/throbber/003.png +++ /dev/null diff --git a/eazel-logos/throbber/004.png b/eazel-logos/throbber/004.png Binary files differdeleted file mode 100644 index 49a9271ba..000000000 --- a/eazel-logos/throbber/004.png +++ /dev/null diff --git a/eazel-logos/throbber/005.png b/eazel-logos/throbber/005.png Binary files differdeleted file mode 100644 index a6c518661..000000000 --- a/eazel-logos/throbber/005.png +++ /dev/null diff --git a/eazel-logos/throbber/006.png b/eazel-logos/throbber/006.png Binary files differdeleted file mode 100644 index b45bfcd76..000000000 --- a/eazel-logos/throbber/006.png +++ /dev/null diff --git a/eazel-logos/throbber/007.png b/eazel-logos/throbber/007.png Binary files differdeleted file mode 100644 index 58004a43a..000000000 --- a/eazel-logos/throbber/007.png +++ /dev/null diff --git a/eazel-logos/throbber/008.png b/eazel-logos/throbber/008.png Binary files differdeleted file mode 100644 index 1702ced20..000000000 --- a/eazel-logos/throbber/008.png +++ /dev/null diff --git a/eazel-logos/throbber/009.png b/eazel-logos/throbber/009.png Binary files differdeleted file mode 100644 index a2830eaad..000000000 --- a/eazel-logos/throbber/009.png +++ /dev/null diff --git a/eazel-logos/throbber/010.png b/eazel-logos/throbber/010.png Binary files differdeleted file mode 100644 index 483d3c6ac..000000000 --- a/eazel-logos/throbber/010.png +++ /dev/null diff --git a/eazel-logos/throbber/011.png b/eazel-logos/throbber/011.png Binary files differdeleted file mode 100644 index 00fe8457e..000000000 --- a/eazel-logos/throbber/011.png +++ /dev/null diff --git a/eazel-logos/throbber/012.png b/eazel-logos/throbber/012.png Binary files differdeleted file mode 100644 index 2daaa4680..000000000 --- a/eazel-logos/throbber/012.png +++ /dev/null diff --git a/eazel-logos/throbber/013.png b/eazel-logos/throbber/013.png Binary files differdeleted file mode 100644 index cf9745eb3..000000000 --- a/eazel-logos/throbber/013.png +++ /dev/null diff --git a/eazel-logos/throbber/014.png b/eazel-logos/throbber/014.png Binary files differdeleted file mode 100644 index 54954fa52..000000000 --- a/eazel-logos/throbber/014.png +++ /dev/null diff --git a/eazel-logos/throbber/015.png b/eazel-logos/throbber/015.png Binary files differdeleted file mode 100644 index e5aabdadc..000000000 --- a/eazel-logos/throbber/015.png +++ /dev/null diff --git a/eazel-logos/throbber/Makefile.am b/eazel-logos/throbber/Makefile.am deleted file mode 100644 index e69de29bb..000000000 --- a/eazel-logos/throbber/Makefile.am +++ /dev/null diff --git a/eazel-logos/throbber/rest.png b/eazel-logos/throbber/rest.png Binary files differdeleted file mode 100644 index 785bf3f4a..000000000 --- a/eazel-logos/throbber/rest.png +++ /dev/null diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index 8e8276957..53397c2b3 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -191,20 +191,11 @@ 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; } g_free (path); - return NULL; } diff --git a/nautilus.spec.in b/nautilus.spec.in index c45ecc4fd..ff6781cb6 100644 --- a/nautilus.spec.in +++ b/nautilus.spec.in @@ -234,10 +234,6 @@ scrollkeeper-update %{_datadir}/pixmaps/nautilus/crux_eggplant/throbber/*.png %{_datadir}/pixmaps/nautilus/crux_eggplant/backgrounds/*.png %{_datadir}/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/*.png -@EAZEL_LOGOS_PNG@ -@EAZEL_LOGOS_XML@ -@EAZEL_LOGOS_THROB@ -@EAZEL_LOGOS_LICENSE@ %{_datadir}/pixmaps/nautilus/gnome/*.png %{_datadir}/pixmaps/nautilus/gnome/*.xml %{_datadir}/pixmaps/nautilus/gnome/throbber/*.png |
