Hello community,
here is the log from the commit of package gnome-control-center for
openSUSE:Factory checked in at 2017-05-18 20:41:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old)
and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center"
Thu May 18 20:41:13 2017 rev:153 rq:494454 version:3.24.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes
2017-04-29 10:51:02.341293606 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes
2017-05-18 20:41:15.347077979 +0200
@@ -1,0 +2,17 @@
+Wed May 10 17:16:08 UTC 2017 - zai...@opensuse.org
+
+- Update to version 3.24.2:
+ + Memory leak and correctness fixes.
+ + Keyboard: Discard the added shortcut on Escape.
+ + Network: Fix mobile broadband switch state.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed May 3 06:01:24 UTC 2017 - fezh...@suse.com
+
+- Add gnome-control-center-info-disc-size-for-btrfs.patch:
+ Fix total disc size for btrfs subvolumes displayed in info panel,
+ backported upstream commit b619f7c (bsc#890385, bsc#1037234,
+ bgo#708786).
+
+-------------------------------------------------------------------
Old:
----
gnome-control-center-3.24.1.tar.xz
New:
----
gnome-control-center-3.24.2.tar.xz
gnome-control-center-info-disc-size-for-btrfs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.AXMxIn/_old 2017-05-18 20:41:16.190958887 +0200
+++ /var/tmp/diff_new_pack.AXMxIn/_new 2017-05-18 20:41:16.190958887 +0200
@@ -29,7 +29,7 @@
%define with_cacert_patch 0
Name: gnome-control-center
-Version: 3.24.1
+Version: 3.24.2
Release: 0
Summary: The GNOME Control Center
License: GPL-2.0+
@@ -52,6 +52,8 @@
Patch21: gnome-control-center-info-never-use-gnome-software.patch
# PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch
bsc#993381 fezh...@suse.com -- power: Bring back the "shutdown" and
"interactive" power button actions.
Patch22: gnome-control-center-more-power-button-actions.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-info-disc-size-for-btrfs.patch
bsc#890385 bsc#1037234 bgo#708786 fezh...@suse.com -- info: Fix total disc size
for btrfs subvolumes
+Patch23: gnome-control-center-info-disc-size-for-btrfs.patch
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -218,6 +220,7 @@
%patch21 -p1
%endif
%patch22 -p1
+%patch23 -p1
%build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
++++++ gnome-control-center-3.24.1.tar.xz -> gnome-control-center-3.24.2.tar.xz
++++++
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center-3.24.1.tar.xz
/work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center-3.24.2.tar.xz
differ: char 25, line 1
++++++ gnome-control-center-info-disc-size-for-btrfs.patch ++++++
diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
index d904f6c..d9d3504 100644
--- a/panels/info/cc-info-panel.c
+++ b/panels/info/cc-info-panel.c
@@ -547,7 +547,9 @@ get_primary_disc_info (CcInfoPanel *self)
{
GList *points;
GList *p;
+ GHashTable *hash;
+ hash = g_hash_table_new (g_str_hash, g_str_equal);
points = g_unix_mount_points_get (NULL);
/* If we do not have /etc/fstab around, try /etc/mtab */
@@ -558,21 +560,30 @@ get_primary_disc_info (CcInfoPanel *self)
{
GUnixMountEntry *mount = p->data;
const char *mount_path;
+ const char *device_path;
mount_path = g_unix_mount_get_mount_path (mount);
+ device_path = g_unix_mount_get_device_path (mount);
+
+ /* Do not count multiple mounts with same device_path, because it is
+ * probably something like btrfs subvolume. Use only the first one in
+ * order to count the real size. */
if (gsd_should_ignore_unix_mount (mount) ||
gsd_is_removable_mount (mount) ||
g_str_has_prefix (mount_path, "/media/") ||
- g_str_has_prefix (mount_path, g_get_home_dir ()))
+ g_str_has_prefix (mount_path, g_get_home_dir ()) ||
+ g_hash_table_lookup (hash, device_path) != NULL)
{
g_unix_mount_free (mount);
continue;
}
self->priv->primary_mounts = g_list_prepend (self->priv->primary_mounts,
mount);
+ g_hash_table_insert (hash, (gpointer) device_path, (gpointer)
device_path);
}
g_list_free (points);
+ g_hash_table_destroy (hash);
get_primary_disc_info_start (self);
}
