pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 492575 from home:zhangxiaofei:branches:GNOME:Factory

Browse Source 
- 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).

OBS-URL: https://build.opensuse.org/request/show/492575
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=348
This commit is contained in:
Dominique Leuenberger 2017-05-10 13:24:47 +00:00 committed by Git OBS Bridge
parent 6580bf7420
commit 3a3a7d5745
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gnome-control-center-info-disc-size-for-btrfs.patch Normal file
View File

@ -0,0 +1,46 @@
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);
}

8
gnome-control-center.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 3 06:01:24 UTC 2017 - fezhang@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).
-------------------------------------------------------------------
Mon Apr 24 16:56:35 UTC 2017 - dimstar@opensuse.org

3
gnome-control-center.spec
View File

@ -52,6 +52,8 @@ Patch20: gnome-control-center-disable-error-message-for-NM.patch
Patch21: gnome-control-center-info-never-use-gnome-software.patch
# PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@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 fezhang@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 @@ translation-update-upstream
%patch21 -p1
%endif
%patch22 -p1
%patch23 -p1
%build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh