Hello community,
here is the log from the commit of package caja for openSUSE:Factory checked in
at 2016-02-22 08:58:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caja (Old)
and /work/SRC/openSUSE:Factory/.caja.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caja"
Changes:
--------
--- /work/SRC/openSUSE:Factory/caja/caja.changes 2016-01-28
17:24:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.caja.new/caja.changes 2016-02-22
08:58:07.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Feb 18 17:54:13 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to 1.12.4:
+ * Fix random crash on startup when python-caja extension is
+ enabled.
+ * Fix crash when restoring file with special characters from
+ trash.
+ * Fix few memleaks.
+
+-------------------------------------------------------------------
Old:
----
caja-1.12.3.tar.xz
New:
----
caja-1.12.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caja.spec ++++++
--- /var/tmp/diff_new_pack.zPGdj1/_old 2016-02-22 08:58:08.000000000 +0100
+++ /var/tmp/diff_new_pack.zPGdj1/_new 2016-02-22 08:58:08.000000000 +0100
@@ -20,7 +20,7 @@
%define typelib typelib-1_0-Caja-2_0
%define _version 1.12
Name: caja
-Version: 1.12.3
+Version: 1.12.4
Release: 0
Summary: File manager for the MATE desktop
License: GPL-2.0 and LGPL-2.0
@@ -44,6 +44,7 @@
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(unique-1.0)
Recommends: %{name}-lang
+# mate-file-manager was last used in openSUSE 13.1.
Provides: mate-file-manager = %{version}
Obsoletes: mate-file-manager < %{version}
Obsoletes: mate-file-manager-lang < %{version}
@@ -57,9 +58,10 @@
%package devel
Summary: Caja development files
License: GPL-2.0 and LGPL-2.0
-Group: Development/Libraries/Other
+Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
Requires: %{name} = %{version}
+# mate-file-manager-devel was last used in openSUSE 13.1.
Provides: mate-file-manager-devel = %{version}
Obsoletes: mate-file-manager-devel < %{version}
++++++ caja-1.12.3.tar.xz -> caja-1.12.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/NEWS new/caja-1.12.4/NEWS
--- old/caja-1.12.3/NEWS 2016-01-25 12:29:44.000000000 +0100
+++ new/caja-1.12.4/NEWS 2016-02-15 15:03:23.000000000 +0100
@@ -1,3 +1,8 @@
+Major changes in 1.12.4 are:
+* Fix random crash on startup when python-caja extension is enabled
+* Fix crash when restoring file with special characters from trash
+* Fix a few memleaks
+
Major changes in 1.12.3 are:
* Fix wrong text color in icon view with some light themes
* Fix crash due to unneeded assert
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/configure new/caja-1.12.4/configure
--- old/caja-1.12.3/configure 2016-01-25 12:30:41.000000000 +0100
+++ new/caja-1.12.4/configure 2016-02-15 15:07:15.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for caja 1.12.3.
+# Generated by GNU Autoconf 2.69 for caja 1.12.4.
#
# Report bugs to <http://www.mate-desktop.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='caja'
PACKAGE_TARNAME='caja'
-PACKAGE_VERSION='1.12.3'
-PACKAGE_STRING='caja 1.12.3'
+PACKAGE_VERSION='1.12.4'
+PACKAGE_STRING='caja 1.12.4'
PACKAGE_BUGREPORT='http://www.mate-desktop.org'
PACKAGE_URL=''
@@ -1475,7 +1475,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures caja 1.12.3 to adapt to many kinds of systems.
+\`configure' configures caja 1.12.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1545,7 +1545,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of caja 1.12.3:";;
+ short | recursive ) echo "Configuration of caja 1.12.4:";;
esac
cat <<\_ACEOF
@@ -1696,7 +1696,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-caja configure 1.12.3
+caja configure 1.12.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2065,7 +2065,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by caja $as_me 1.12.3, which was
+It was created by caja $as_me 1.12.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2975,7 +2975,7 @@
# Define the identity of the package.
PACKAGE='caja'
- VERSION='1.12.3'
+ VERSION='1.12.4'
cat >>confdefs.h <<_ACEOF
@@ -17169,7 +17169,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by caja $as_me 1.12.3, which was
+This file was extended by caja $as_me 1.12.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17235,7 +17235,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-caja config.status 1.12.3
+caja config.status 1.12.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/configure.ac new/caja-1.12.4/configure.ac
--- old/caja-1.12.3/configure.ac 2016-01-25 12:29:44.000000000 +0100
+++ new/caja-1.12.4/configure.ac 2016-02-15 15:02:17.000000000 +0100
@@ -19,7 +19,7 @@
m4_define(caja_extension_current, 5)
m4_define(caja_extension_revision, 0)
-AC_INIT([caja], [1.12.3], [http://www.mate-desktop.org])
+AC_INIT([caja], [1.12.4], [http://www.mate-desktop.org])
# GLib min/max required versions
AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/data/caja-autorun-software.desktop.in
new/caja-1.12.4/data/caja-autorun-software.desktop.in
--- old/caja-1.12.3/data/caja-autorun-software.desktop.in 2016-01-25
12:30:47.000000000 +0100
+++ new/caja-1.12.4/data/caja-autorun-software.desktop.in 2016-02-15
15:07:21.000000000 +0100
@@ -11,4 +11,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.3
+X-MATE-Bugzilla-Version=1.12.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/data/caja-browser.desktop.in
new/caja-1.12.4/data/caja-browser.desktop.in
--- old/caja-1.12.3/data/caja-browser.desktop.in 2016-01-25
12:30:47.000000000 +0100
+++ new/caja-1.12.4/data/caja-browser.desktop.in 2016-02-15
15:07:21.000000000 +0100
@@ -14,4 +14,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.3
+X-MATE-Bugzilla-Version=1.12.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/data/caja-computer.desktop.in
new/caja-1.12.4/data/caja-computer.desktop.in
--- old/caja-1.12.3/data/caja-computer.desktop.in 2016-01-25
12:30:47.000000000 +0100
+++ new/caja-1.12.4/data/caja-computer.desktop.in 2016-02-15
15:07:21.000000000 +0100
@@ -14,4 +14,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.3
+X-MATE-Bugzilla-Version=1.12.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caja-1.12.3/data/caja-file-management-properties.desktop.in
new/caja-1.12.4/data/caja-file-management-properties.desktop.in
--- old/caja-1.12.3/data/caja-file-management-properties.desktop.in
2016-01-25 12:30:47.000000000 +0100
+++ new/caja-1.12.4/data/caja-file-management-properties.desktop.in
2016-02-15 15:07:21.000000000 +0100
@@ -12,4 +12,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=Preferences
-X-MATE-Bugzilla-Version=1.12.3
+X-MATE-Bugzilla-Version=1.12.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/data/caja-folder-handler.desktop.in
new/caja-1.12.4/data/caja-folder-handler.desktop.in
--- old/caja-1.12.3/data/caja-folder-handler.desktop.in 2016-01-25
12:30:47.000000000 +0100
+++ new/caja-1.12.4/data/caja-folder-handler.desktop.in 2016-02-15
15:07:21.000000000 +0100
@@ -13,4 +13,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.3
+X-MATE-Bugzilla-Version=1.12.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/data/caja.desktop
new/caja-1.12.4/data/caja.desktop
--- old/caja-1.12.3/data/caja.desktop 2016-01-25 12:31:18.000000000 +0100
+++ new/caja-1.12.4/data/caja.desktop 2016-02-15 15:08:30.000000000 +0100
@@ -229,7 +229,7 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.3
+X-MATE-Bugzilla-Version=1.12.4
X-MATE-Autostart-Phase=Desktop
X-MATE-Autostart-Notify=true
X-MATE-AutoRestart=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/data/caja.desktop.in
new/caja-1.12.4/data/caja.desktop.in
--- old/caja-1.12.3/data/caja.desktop.in 2016-01-25 12:30:47.000000000
+0100
+++ new/caja-1.12.4/data/caja.desktop.in 2016-02-15 15:07:21.000000000
+0100
@@ -11,7 +11,7 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=caja
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.3
+X-MATE-Bugzilla-Version=1.12.4
X-MATE-Autostart-Phase=Desktop
X-MATE-Autostart-Notify=true
X-MATE-AutoRestart=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/eel/eel-glib-extensions.c
new/caja-1.12.4/eel/eel-glib-extensions.c
--- old/caja-1.12.3/eel/eel-glib-extensions.c 2015-07-16 09:11:15.000000000
+0200
+++ new/caja-1.12.4/eel/eel-glib-extensions.c 2016-02-15 15:01:43.000000000
+0100
@@ -825,6 +825,8 @@
g_signal_connect (settings, signal,
G_CALLBACK(update_auto_boolean),
storage);
+
+ g_free (signal);
}
static void
@@ -849,6 +851,8 @@
g_signal_connect (settings, signal,
G_CALLBACK(update_auto_int),
storage);
+
+ g_free (signal);
}
static void
@@ -873,6 +877,8 @@
g_signal_connect (settings, signal,
G_CALLBACK(update_auto_enum),
storage);
+
+ g_free (signal);
}
static void
@@ -921,6 +927,8 @@
g_signal_connect (settings, signal,
G_CALLBACK(update_auto_strv),
storage);
+
+ g_free (signal);
}
void
@@ -936,6 +944,8 @@
g_signal_connect (settings, signal,
G_CALLBACK(update_auto_strv_as_quarks),
storage);
+
+ g_free (signal);
}
#if !defined (EEL_OMIT_SELF_CHECK)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/eel/eel-gtk-extensions.c
new/caja-1.12.4/eel/eel-gtk-extensions.c
--- old/caja-1.12.3/eel/eel-gtk-extensions.c 2016-01-25 12:29:41.000000000
+0100
+++ new/caja-1.12.4/eel/eel-gtk-extensions.c 2016-02-15 15:01:43.000000000
+0100
@@ -430,6 +430,7 @@
{
gtk_tree_view_row_activated
(GTK_TREE_VIEW (tree_view), path, column);
+ gtk_tree_path_free (path);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/eel/eel-mate-extensions.c
new/caja-1.12.4/eel/eel-mate-extensions.c
--- old/caja-1.12.3/eel/eel-mate-extensions.c 2015-07-16 09:11:15.000000000
+0200
+++ new/caja-1.12.4/eel/eel-mate-extensions.c 2016-02-15 15:01:43.000000000
+0100
@@ -54,6 +54,7 @@
}
quoted = g_shell_quote (program_in_path);
+ g_free (program_in_path);
if (args == NULL || args[0] == '\0')
{
return quoted;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/libcaja-private/caja-bookmark.c
new/caja-1.12.4/libcaja-private/caja-bookmark.c
--- old/caja-1.12.3/libcaja-private/caja-bookmark.c 2016-01-25
12:29:41.000000000 +0100
+++ new/caja-1.12.4/libcaja-private/caja-bookmark.c 2016-02-15
14:58:17.000000000 +0100
@@ -32,7 +32,6 @@
#include <eel/eel-vfs-extensions.h>
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <string.h>
#include <libcaja-private/caja-file.h>
#include <libcaja-private/caja-icon-names.h>
@@ -300,7 +299,7 @@
g_return_val_if_fail (new_name != NULL, FALSE);
g_return_val_if_fail (CAJA_IS_BOOKMARK (bookmark), FALSE);
- if (strcmp (new_name, bookmark->details->name) == 0)
+ if (g_strcmp0 (new_name, bookmark->details->name) == 0)
{
return FALSE;
}
@@ -437,7 +436,7 @@
{
display_name = caja_file_get_display_name (file);
- if (strcmp (bookmark->details->name, display_name) != 0)
+ if (g_strcmp0 (bookmark->details->name, display_name) != 0)
{
g_free (bookmark->details->name);
bookmark->details->name = display_name;
@@ -554,7 +553,7 @@
caja_file_check_if_ready (bookmark->details->file,
CAJA_FILE_ATTRIBUTE_INFO))
{
display_name = caja_file_get_display_name (bookmark->details->file);
- if (strcmp (bookmark->details->name, display_name) != 0)
+ if (g_strcmp0 (bookmark->details->name, display_name) != 0)
{
g_free (bookmark->details->name);
bookmark->details->name = display_name;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/libcaja-private/caja-file.c
new/caja-1.12.4/libcaja-private/caja-file.c
--- old/caja-1.12.3/libcaja-private/caja-file.c 2016-01-25 12:29:41.000000000
+0100
+++ new/caja-1.12.4/libcaja-private/caja-file.c 2016-02-15 15:00:57.000000000
+0100
@@ -7279,17 +7279,13 @@
{
GFile *location;
CajaFile *original_file;
- char *filename;
original_file = NULL;
if (file->details->trash_orig_path != NULL) {
- /* file name is stored in URL encoding */
- filename = g_uri_unescape_string
(file->details->trash_orig_path, "");
- location = g_file_new_for_path (filename);
+ location = g_file_new_for_path (file->details->trash_orig_path);
original_file = caja_file_get (location);
- g_object_unref (G_OBJECT (location));
- g_free (filename);
+ g_object_unref (location);
}
return original_file;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/libcaja-private/caja-module.c
new/caja-1.12.4/libcaja-private/caja-module.c
--- old/caja-1.12.3/libcaja-private/caja-module.c 2015-12-23
13:32:00.000000000 +0100
+++ new/caja-1.12.4/libcaja-private/caja-module.c 2016-02-15
15:00:37.000000000 +0100
@@ -152,9 +152,9 @@
static void
add_module_objects (CajaModule *module)
{
- GObject *object;
- const GType *types;
- int num_types;
+ GObject *object = NULL;
+ const GType *types = NULL;
+ int num_types = 0;
int i;
module->list_types (&types, &num_types);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/src/caja-application.c
new/caja-1.12.4/src/caja-application.c
--- old/caja-1.12.3/src/caja-application.c 2015-11-16 10:07:41.000000000
+0100
+++ new/caja-1.12.4/src/caja-application.c 2016-02-15 14:58:17.000000000
+0100
@@ -2164,11 +2164,11 @@
for (node = root_node->children; node != NULL; node = node->next)
{
- if (!strcmp (node->name, "text"))
+ if (g_strcmp0 (node->name, "text") == 0)
{
continue;
}
- else if (!strcmp (node->name, "history"))
+ else if (g_strcmp0 (node->name, "history") == 0)
{
xmlNodePtr bookmark_node;
gboolean emit_change;
@@ -2177,11 +2177,11 @@
for (bookmark_node = node->children; bookmark_node != NULL;
bookmark_node = bookmark_node->next)
{
- if (!strcmp (bookmark_node->name, "text"))
+ if (g_strcmp0 (bookmark_node->name, "text") == 0)
{
continue;
}
- else if (!strcmp (bookmark_node->name, "bookmark"))
+ else if (g_strcmp0 (bookmark_node->name, "bookmark") == 0)
{
xmlChar *name, *icon_str, *uri;
gboolean has_custom_name;
@@ -2224,7 +2224,7 @@
caja_send_history_list_changed ();
}
}
- else if (!strcmp (node->name, "window"))
+ else if (g_strcmp0 (node->name, "window") == 0)
{
CajaWindow *window;
xmlChar *type, *location_uri, *slot_uri;
@@ -2249,7 +2249,7 @@
continue;
}
- if (!strcmp (type, "navigation"))
+ if (g_strcmp0 (type, "navigation") == 0)
{
xmlChar *geometry;
@@ -2296,7 +2296,7 @@
for (i = 0, slot_node = node->children; slot_node != NULL;
slot_node = slot_node->next)
{
- if (!strcmp (slot_node->name, "slot"))
+ if (g_strcmp0 (slot_node->name, "slot") == 0)
{
slot_uri = xmlGetProp (slot_node, "location");
if (slot_uri != NULL)
@@ -2334,7 +2334,7 @@
g_object_unref (location);
}
}
- else if (!strcmp (type, "spatial"))
+ else if (g_strcmp0 (type, "spatial") == 0)
{
location = g_file_new_for_uri (location_uri);
window = caja_application_get_spatial_window (application,
NULL, NULL,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-1.12.3/src/caja-window-slot.c
new/caja-1.12.4/src/caja-window-slot.c
--- old/caja-1.12.3/src/caja-window-slot.c 2016-01-25 12:29:41.000000000
+0100
+++ new/caja-1.12.4/src/caja-window-slot.c 2016-02-15 15:02:01.000000000
+0100
@@ -651,16 +651,8 @@
}
caja_window_slot_set_viewed_file (slot, NULL);
- /* TODO? why do we unref here? the file is NULL.
- * It was already here before the slot move, though */
- caja_file_unref (slot->viewed_file);
- if (slot->location)
- {
- /* TODO? why do we ref here, instead of unreffing?
- * It was already here before the slot migration, though */
- g_object_ref (slot->location);
- }
+ g_clear_object (&slot->location);
g_list_free_full (slot->pending_selection, g_free);
slot->pending_selection = NULL;
