diff --git a/eel/eel-vfs-extensions.c b/eel/eel-vfs-extensions.c deleted file mode 100644 index 1de830d4d..000000000 --- a/eel/eel-vfs-extensions.c +++ /dev/null @@ -1,117 +0,0 @@ -/* eel-vfs-extensions.c - gnome-vfs extensions. Its likely some of these will - * be part of gnome-vfs in the future. - * - * Copyright (C) 1999, 2000 Eazel, Inc. - * - * The Gnome Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * The Gnome Library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * see . - * - * Authors: Darin Adler - * Pavel Cisler - * Mike Fleming - * John Sullivan - */ - -#include -#include "eel-vfs-extensions.h" - -#include -#include -#include - -#include -#include - -/** - * eel_filename_get_extension_offset: - * @filename: a null-terminated string representing the basename of a file, with - * or without extension. - * - * Returns: (nullable) (transfer none): A pointer to the substring containing - * the dot and extension, or %NULL if there - * is no extension. - */ -static char * -eel_filename_get_extension_offset (const char *filename) -{ - char *end, *end2; - const char *start; - - if (filename == NULL || filename[0] == '\0') - { - return NULL; - } - - /* basename must have at least one char */ - start = filename + 1; - - end = strrchr (start, '.'); - if (end == NULL || end[1] == '\0') - { - return NULL; - } - - for (const char *c = end; *c != '\0'; c = g_utf8_next_char (c)) - { - if (g_unichar_isspace (g_utf8_get_char (c))) - { - return NULL; - } - } - - if (end != start) - { - if (strcmp (end, ".gz") == 0 || - strcmp (end, ".bz2") == 0 || - strcmp (end, ".sit") == 0 || - strcmp (end, ".Z") == 0 || - strcmp (end, ".bz") == 0 || - strcmp (end, ".xz") == 0) - { - end2 = end - 1; - while (end2 > start && - *end2 != '.') - { - end2--; - } - if (end2 != start) - { - end = end2; - } - } - } - - return end; -} - -char * -eel_filename_strip_extension (const char *filename_with_extension) -{ - char *filename, *end; - - if (filename_with_extension == NULL) - { - return NULL; - } - - filename = g_strdup (filename_with_extension); - end = eel_filename_get_extension_offset (filename); - - if (end && end != filename) - { - *end = '\0'; - } - - return filename; -} diff --git a/eel/eel-vfs-extensions.h b/eel/eel-vfs-extensions.h deleted file mode 100644 index bdb4a90a2..000000000 --- a/eel/eel-vfs-extensions.h +++ /dev/null @@ -1,35 +0,0 @@ - -/* eel-vfs-extensions.h - gnome-vfs extensions. Its likely some of these will - be part of gnome-vfs in the future. - - Copyright (C) 1999, 2000 Eazel, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see . - - Authors: Darin Adler - Pavel Cisler - Mike Fleming - John Sullivan -*/ - -#pragma once - -#include - -G_BEGIN_DECLS - -char * eel_filename_strip_extension (const char *filename); - -G_END_DECLS diff --git a/eel/meson.build b/eel/meson.build index 2888196d2..1917e13f0 100644 --- a/eel/meson.build +++ b/eel/meson.build @@ -1,8 +1,6 @@ libeel_2_sources = [ 'eel-stock-dialogs.h', 'eel-stock-dialogs.c', - 'eel-vfs-extensions.h', - 'eel-vfs-extensions.c', ] libeel_2_deps = [ diff --git a/po/POTFILES.in b/po/POTFILES.in index 9e668e6d7..a6ddcec6f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,7 +5,6 @@ data/org.gnome.Nautilus.appdata.xml.in.in data/org.gnome.Nautilus.desktop.in.in data/org.gnome.nautilus.gschema.xml eel/eel-stock-dialogs.c -eel/eel-vfs-extensions.c extensions/audio-video-properties/totem-properties-main.c extensions/audio-video-properties/totem-properties-view.c extensions/image-properties/nautilus-image-properties-model.c diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c index a55046c97..e8de1a147 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -37,8 +37,6 @@ #include "nautilus-progress-info.h" -#include - #include #include #include diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c index 4f4595b58..78f9e2a9b 100644 --- a/src/nautilus-file-utilities.c +++ b/src/nautilus-file-utilities.c @@ -34,7 +34,6 @@ #include "nautilus-search-directory.h" #include "nautilus-starred-directory.h" #include "nautilus-ui-utilities.h" -#include #include #include #include diff --git a/src/nautilus-filename-utilities.c b/src/nautilus-filename-utilities.c index 08deebdb9..d50e08cc2 100644 --- a/src/nautilus-filename-utilities.c +++ b/src/nautilus-filename-utilities.c @@ -12,8 +12,6 @@ #include -#include - typedef gboolean (* AppendixParser) (const char *appendix, size_t appendix_len, diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 749b0dfa9..c148742e0 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -27,7 +27,6 @@ #include "nautilus-files-view.h" #include -#include #include #include #include