summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--COPYING38
-rw-r--r--COPYING-DOCS6
-rw-r--r--COPYING.LIB21
-rw-r--r--configure.in21
-rw-r--r--data/caja-browser.desktop.in.in2
-rw-r--r--data/caja-computer.desktop.in.in2
-rw-r--r--data/caja-file-management-properties.desktop.in.in2
-rw-r--r--data/caja-home.desktop.in.in2
-rw-r--r--icons/thumbnail_frame.pngbin482 -> 2232 bytes
-rw-r--r--libcaja-private/org.mate.caja.gschema.xml.in2
-rw-r--r--po/POTFILES.in3
-rw-r--r--src/caja-window-menus.c4
12 files changed, 38 insertions, 65 deletions
diff --git a/COPYING b/COPYING
index 5838501c..b6814ebe 100644
--- a/COPYING
+++ b/COPYING
@@ -1,18 +1,18 @@
**********************************************************************
The following license applies to the Caja software but does not
-apply to the Eazel Trademarks. Please read the TRADEMARK_NOTICE file
+apply to the Eazel Trademarks. Please read the TRADEMARK_NOTICE file
for licensing information about the Eazel Trademarks.
**********************************************************************
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -21,7 +21,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -62,8 +62,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -118,7 +117,6 @@ above, provided that you also meet all of these conditions:
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -177,7 +175,6 @@ access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -235,7 +232,6 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -265,7 +261,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -287,10 +283,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
+ END OF TERMS AND CONDITIONS
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -314,17 +309,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -347,5 +341,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/COPYING-DOCS b/COPYING-DOCS
index b42936be..1d742231 100644
--- a/COPYING-DOCS
+++ b/COPYING-DOCS
@@ -1,8 +1,8 @@
- GNU Free Documentation License
- Version 1.1, March 2000
+ GNU Free Documentation License
+ Version 1.1, March 2000
Copyright (C) 2000 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/COPYING.LIB b/COPYING.LIB
index 161a3d1d..5bc8fb2c 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -1,15 +1,15 @@
- GNU LIBRARY GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the library GPL. It is
numbered 2 because it goes with version 2 of the ordinary GPL.]
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
- GNU LIBRARY GENERAL PUBLIC LICENSE
+ GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
- Appendix: How to Apply These Terms to Your New Libraries
+ How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
@@ -463,9 +463,8 @@ convey the exclusion of warranty; and each file should have at least the
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
diff --git a/configure.in b/configure.in
index 0b7e21ce..8d3a0f02 100644
--- a/configure.in
+++ b/configure.in
@@ -106,7 +106,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
AH_TEMPLATE([ENABLE_INSTALLER])
AH_TEMPLATE([ENABLE_NLS])
-AH_TEMPLATE([ENABLE_PROFILER])
AH_TEMPLATE([GETTEXT_PACKAGE])
AH_TEMPLATE([HAVE_CATGETS])
AH_TEMPLATE([HAVE_GETTEXT])
@@ -145,25 +144,6 @@ GTK_DOC_CHECK([1.4])
dnl ==========================================================================
-ENABLE_PROFILER=
-AC_ARG_ENABLE(profiler,
- AC_HELP_STRING([--enable-profiler], [Enable profiler]),
- [ENABLE_PROFILER=1
- AC_DEFINE(ENABLE_PROFILER, 1, [define to enable the profiler])])
-
-profiling_support=off
-if test "x$ENABLE_PROFILER" = "x1"
-then
- CFLAGS="-g -O -gdwarf-2 -finstrument-functions -D__NO_STRING_INLINES $CFLAGS"
- LDFLAGS="/mate/MATE2/lib/libprofiler.so -lpthread $LDFLAGS"
- profiling_support=on
-fi
-
-AC_SUBST(ENABLE_PROFILER)
-AM_CONDITIONAL(ENABLE_PROFILER, test "x$ENABLE_PROFILER" = "x1")
-
-dnl ==========================================================================
-
AC_CHECK_PROGS(PERL, perl5 perl)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
@@ -504,7 +484,6 @@ caja-$VERSION:
Gtk+ version: ${GTK_API_VERSION}
PackageKit support: $msg_packagekit
- profiling support: ${profiling_support}
caja-extension documentation: ${enable_gtk_doc}
caja-extension introspection: ${found_introspection}
"
diff --git a/data/caja-browser.desktop.in.in b/data/caja-browser.desktop.in.in
index 6fcd19a7..7e817bff 100644
--- a/data/caja-browser.desktop.in.in
+++ b/data/caja-browser.desktop.in.in
@@ -7,7 +7,7 @@ Icon=system-file-manager
Terminal=false
StartupNotify=true
Type=Application
-Categories=MATE;GTK;System;Utility;Core;
+Categories=GTK;System;Utility;Core;
OnlyShowIn=MATE;
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
diff --git a/data/caja-computer.desktop.in.in b/data/caja-computer.desktop.in.in
index 03dcc796..66f43eaf 100644
--- a/data/caja-computer.desktop.in.in
+++ b/data/caja-computer.desktop.in.in
@@ -7,7 +7,7 @@ Icon=computer
Terminal=false
StartupNotify=true
Type=Application
-Categories=MATE;GTK;Core;
+Categories=GTK;Core;
OnlyShowIn=MATE;
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
diff --git a/data/caja-file-management-properties.desktop.in.in b/data/caja-file-management-properties.desktop.in.in
index 84b98eae..f8310a47 100644
--- a/data/caja-file-management-properties.desktop.in.in
+++ b/data/caja-file-management-properties.desktop.in.in
@@ -6,7 +6,7 @@ Icon=system-file-manager
Terminal=false
Type=Application
StartupNotify=true
-Categories=MATE;GTK;Settings;X-MATE-PersonalSettings;
+Categories=GTK;Settings;X-MATE-PersonalSettings;
OnlyShowIn=MATE;
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
diff --git a/data/caja-home.desktop.in.in b/data/caja-home.desktop.in.in
index 559f2aaf..b2986da1 100644
--- a/data/caja-home.desktop.in.in
+++ b/data/caja-home.desktop.in.in
@@ -7,7 +7,7 @@ Icon=user-home
Terminal=false
StartupNotify=true
Type=Application
-Categories=MATE;GTK;Core;
+Categories=GTK;Core;
OnlyShowIn=MATE;
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
diff --git a/icons/thumbnail_frame.png b/icons/thumbnail_frame.png
index 674b648b..723dd87f 100644
--- a/icons/thumbnail_frame.png
+++ b/icons/thumbnail_frame.png
Binary files differ
diff --git a/libcaja-private/org.mate.caja.gschema.xml.in b/libcaja-private/org.mate.caja.gschema.xml.in
index 04c790d6..f4e27ef3 100644
--- a/libcaja-private/org.mate.caja.gschema.xml.in
+++ b/libcaja-private/org.mate.caja.gschema.xml.in
@@ -343,7 +343,7 @@
<schema id="org.mate.caja.desktop" path="/apps/caja/desktop/" gettext-domain="caja">
<key name="font" type="s">
- <default l10n="messages" context="desktop-font">''</default>
+ <default l10n="messages" context="desktop-font">'Sans 10'</default>
<_summary>Desktop font</_summary>
<_description>The font _description used for the icons on the desktop.</_description>
</key>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8d4ac956..4c28aeb0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,7 +15,6 @@ eel/eel-vfs-extensions.c
libcaja-extension/caja-column.c
libcaja-extension/caja-menu-item.c
libcaja-extension/caja-property-page.c
-libcaja-private/apps_caja_preferences.schemas.in
libcaja-private/caja-autorun.c
libcaja-private/caja-clipboard.c
libcaja-private/caja-column-chooser.c
@@ -46,6 +45,8 @@ libcaja-private/caja-search-directory-file.c
libcaja-private/caja-tree-view-drag-dest.c
libcaja-private/caja-undostack-manager.c
libcaja-private/caja-vfs-file.c
+libcaja-private/org.mate.caja.gschema.xml.in
+libcaja-private/org.mate.media-handling.gschema.xml.in
data/caja-autorun-software.desktop.in.in
data/caja-browser.desktop.in.in
data/caja-computer.desktop.in.in
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index 01408c07..b0522b03 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -504,7 +504,7 @@ action_about_caja_callback (GtkAction *action,
};
const gchar *documenters[] =
{
- "MATE Documentation Team",
+ "GNOME Documentation Team",
"Sun Microsystem",
NULL
};
@@ -534,7 +534,7 @@ action_about_caja_callback (GtkAction *action,
"files and folders, both on "
"your computer and online."),
"copyright", _("Copyright \xC2\xA9 1999-2009 The Nautilus authors\n"
- "Copyright \xC2\xA9 2011 The Caja authors"),
+ "Copyright \xC2\xA9 2011-2012 The Caja authors"),
"license", license_trans,
"wrap-license", TRUE,
"authors", authors,
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 20:49:53 +0000