Commit 5fa3a9e3 authored by Mark Wagie's avatar Mark Wagie
Browse files

[pkg-upd] gnome-control-center-cosmic: 41.1-1

parent 2c732e35
......@@ -2,7 +2,7 @@
pkgname=gnome-control-center-cosmic
_pkgname=${pkgname%-cosmic}
pkgver=40.0
pkgver=41.1
pkgrel=1
pkgdesc="GNOME's main interface to configure various aspects of the desktop (with Pop!_OS COSMIC patches)"
url="https://gitlab.gnome.org/GNOME/gnome-control-center"
......@@ -12,36 +12,37 @@ arch=(x86_64)
depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
libgtop nm-connection-editor sound-theme-freedesktop upower libpwquality
gnome-color-manager smbclient libmm-glib libgnomekbd grilo libibus
cheese libgudev bolt udisks2 libhandy gsound colord-gtk
gnome-color-manager smbclient libmm-glib libgnomekbd libibus libcheese
libgudev bolt udisks2 libhandy gsound colord-gtk power-profiles-daemon
# libfirmware-manager
pop-desktop-widget
pop-cosmic
# libs76-hidpi-widget
)
makedepends=(docbook-xsl modemmanager git python meson dpkg)
makedepends=(docbook-xsl modemmanager git python meson)
checkdepends=(python-dbusmock python-gobject xorg-server-xvfb)
optdepends=('system-config-printer: Printer settings'
'gnome-user-share: WebDAV file sharing'
'gnome-remote-desktop: screen sharing'
'rygel: media sharing'
'openssh: remote login'
'power-profiles-daemon: power profiles support')
'openssh: remote login')
provides=("$_pkgname")
conflicts=("$_pkgname")
_commit=49d71c07b5b3ce59e035b785310cba4fcf903868 # tags/40.0^0
_pop_commit=b0ac308c24521fbd8e82f74b479a99e68167d109 # 1:40.0-1ubuntu5pop0
_commit=eb053617651d251d29128525eb18592a2283d0cf # tags/41.1^0
_pop_commit=2dafb76ab69cf4c93e6dd8920c0e10b7cacf0d0f
source=("git+https://gitlab.gnome.org/GNOME/gnome-control-center.git#commit=$_commit"
'git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git'
"pop-gcc::git+https://github.com/pop-os/gnome-control-center.git#commit=$_pop_commit"
'pop-desktop-widget-41.patch'
'distro-logo.patch'
'software-updates.patch'
'software-updates.diff'
)
sha256sums=('SKIP'
'SKIP'
'SKIP'
'588a2b3982f63b67f0fb49f8b4717725b3c3447775b02d184d5c5c8499d6f4c8'
'4f4d0856a69d41d6f0e7f26939e2b3786a387be35e5da5234f614912c245e651')
'607b419fdc925a22ca8842e9d2ae679b4c4b57fc083d8ab84ea28f4d8251943a'
'd3c3ba0404f60df6c5a471b47b233e61164dc34713f623dc593196236f77e163'
'cb24b170a765fb4e20ec50603c0ea9d725547f51729d2961db384c5e0a0f1c15')
pkgver() {
cd $_pkgname
......@@ -52,22 +53,26 @@ prepare() {
cd $_pkgname
git submodule init
git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
git submodule set-url subprojects/libhandy.url "$srcdir/libhandy"
git submodule update
patch -Np1 -i ../pop-gcc/debian/patches/pop/'0001-mouse-Add-Disable-While-Typing-toggle-for-touchpad.patch'
patch -Np1 -i ../pop-gcc/debian/patches/pop/0001-shell-Fix-bug-when-multiple-panels-use-custom-sideba.patch
patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-mouse-accel.patch
# patch -Np1 -i ../pop-gcc/debian/patches/pop/'0001-mouse-Add-Disable-While-Typing-toggle-for-touchpad.patch'
# patch -Np1 -i ../pop-gcc/debian/patches/pop/0001-shell-Fix-bug-when-multiple-panels-use-custom-sideba.patch
# patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-mouse-accel.patch
# patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-hidpi.patch
# patch -Np1 -i ../pop-gcc/debian/patches/pop/system76-firmware.patch
patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-desktop-widget.patch
patch -Np1 -i ../pop-gcc/debian/patches/pop/'0001-keyboard-Pop-_OS-changes-with-support-for-multiple-b.patch'
# patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-desktop-widget.patch
patch -Np1 -i ../pop-desktop-widget-41.patch
# patch -Np1 -i ../pop-gcc/debian/patches/pop/'0001-keyboard-Pop-_OS-changes-with-support-for-multiple-b.patch'
patch -Np1 -i ../distro-logo.patch
patch --strip=1 panels/info-overview/cc-info-overview-panel.c < ../software-updates.patch
patch --strip=1 panels/info-overview/cc-info-overview-panel.c < ../software-updates.diff
}
build() {
arch-meson $_pkgname build -D documentation=true
arch-meson $_pkgname build \
-D documentation=true \
-Ddistributor_logo=/usr/share/icons/manjaro/maia/128x128.png
meson compile -C build
}
......
From 4369e31ec541172e1c0d7c64645c7990e413bbca Mon Sep 17 00:00:00 2001
From 763cde56be06ce352f41adcdc1c6756f17043f5d Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Tue, 9 Mar 2021 14:51:54 -0600
Subject: [PATCH 1/3] info-overview: add build option to control distributor
Subject: [PATCH 1/2] info-overview: add build option to control distributor
logo
Currently, we display a 256x256 version of the OS icon from
......@@ -22,7 +22,7 @@ this.
3 files changed, 11 insertions(+)
diff --git a/meson.build b/meson.build
index e8333c0da..1661caa4b 100644
index 6f08febd9..edaebeea3 100644
--- a/meson.build
+++ b/meson.build
@@ -50,6 +50,12 @@ foreach define: set_defines
......@@ -48,10 +48,10 @@ index 1b7b54810..93e551373 100644
option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support')
+option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel')
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index bd0e07762..95a5904df 100644
index 6e832eb35..3db143d80 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -869,6 +869,9 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
@@ -901,6 +901,9 @@ use_dark_theme (CcInfoOverviewPanel *panel)
static void
setup_os_logo (CcInfoOverviewPanel *panel)
{
......@@ -59,24 +59,23 @@ index bd0e07762..95a5904df 100644
+ gtk_image_set_from_file (panel->os_logo, DISTRIBUTOR_LOGO);
+#else
g_autofree char *logo_name = g_get_os_info ("LOGO");
if (logo_name != NULL)
{
@@ -879,6 +882,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
{
gtk_image_set_from_resource (panel->os_logo, "/org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg");
}
g_autoptr(GPtrArray) array = NULL;
g_autoptr(GIcon) icon = NULL;
@@ -920,6 +923,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
icon = g_themed_icon_new_from_names ((char **) array->pdata, array->len);
gtk_image_set_from_gicon (panel->os_logo, icon, GTK_ICON_SIZE_INVALID);
+#endif
}
static void
--
GitLab
2.31.1
From f08669767ca87ff99fc08e1a7334c8f2e7f18f0b Mon Sep 17 00:00:00 2001
From 314ef01084276cd0ca23c404a94087ff268700ba Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Tue, 9 Mar 2021 16:02:46 -0600
Subject: [PATCH 2/3] info-overview: add build option to specify a dark mode
Subject: [PATCH 2/2] info-overview: add build option to specify a dark mode
logo variant
Let's allow distributions to specify a different logo to use when using
......@@ -84,13 +83,13 @@ a dark GTK theme. This is best-effort only since it relies on the
convention that dark themes must end with "dark" and therefore will fail
for a theme named "midnight" or anything that doesn't match convention.
---
meson.build | 5 ++++
meson_options.txt | 1 +
panels/info-overview/cc-info-overview-panel.c | 27 +++++++++++++++++++
3 files changed, 33 insertions(+)
meson.build | 5 +++++
meson_options.txt | 1 +
panels/info-overview/cc-info-overview-panel.c | 9 +++++++++
3 files changed, 15 insertions(+)
diff --git a/meson.build b/meson.build
index 1661caa4b..124171626 100644
index edaebeea3..bb0e06d9e 100644
--- a/meson.build
+++ b/meson.build
@@ -54,6 +54,11 @@ distributor_logo = get_option('distributor_logo')
......@@ -115,39 +114,29 @@ index 93e551373..5305c8606 100644
option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel')
+option('dark_mode_distributor_logo', type: 'string', description: 'absolute path to distributor logo dark mode variant')
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index 95a5904df..cb20e16b1 100644
index 3db143d80..434850e7a 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -866,10 +866,37 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
@@ -880,6 +880,7 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
open_software_update (self);
}
+#ifdef DARK_MODE_DISTRIBUTOR_LOGO
+static gboolean
+is_dark_mode (CcInfoOverviewPanel *panel)
+{
+ GdkScreen *screen;
+ GtkSettings *settings;
+ g_autofree char *theme_name = NULL;
+
+ theme_name = g_strdup (g_getenv ("GTK_THEME"));
+ if (theme_name != NULL)
+ return g_str_has_suffix (theme_name, "dark");
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (panel));
+ settings = gtk_settings_get_for_screen (screen);
+
+ g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
+ return theme_name != NULL && g_str_has_suffix (theme_name, "dark");
+}
+#if !defined(DISTRIBUTOR_LOGO) || defined(DARK_MODE_DISTRIBUTOR_LOGO)
static gboolean
use_dark_theme (CcInfoOverviewPanel *panel)
{
@@ -897,11 +898,19 @@ use_dark_theme (CcInfoOverviewPanel *panel)
g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
return (theme_name != NULL && g_str_has_suffix (theme_name, "dark")) ? TRUE : FALSE;
}
+#endif
+
static void
setup_os_logo (CcInfoOverviewPanel *panel)
{
#ifdef DISTRIBUTOR_LOGO
+#ifdef DARK_MODE_DISTRIBUTOR_LOGO
+ if (is_dark_mode (panel))
+ if (use_dark_theme (panel))
+ {
+ gtk_image_set_from_file (panel->os_logo, DARK_MODE_DISTRIBUTOR_LOGO);
+ return;
......@@ -157,39 +146,6 @@ index 95a5904df..cb20e16b1 100644
#else
g_autofree char *logo_name = g_get_os_info ("LOGO");
--
GitLab
From c379ccc4e8f0bcdee78361f134ba29d3a25f7528 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Wed, 10 Mar 2021 11:30:57 -0600
Subject: [PATCH 3/3] info-overview: reduce size of logo when using icon from
/etc/os-release
When using the icon from /etc/os-release, display it as 128x128 rather
than 256x256. In distributions that don't ship a 128x128, such as
Fedora, this results in the 256x256 icon being scaled down to a
reasonable size. 256x256 is so large here as to be clearly undesirable.
128x128 is also the size that Ubuntu uses in its downstream patch. Might
as well reduce the need for patching as far as possible, even though
Fedora doesn't plan to use this codepath.
---
panels/info-overview/cc-info-overview-panel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
2.31.1
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index cb20e16b1..3575b90c5 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -903,7 +903,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
if (logo_name != NULL)
{
gtk_image_set_from_icon_name (panel->os_logo, logo_name, GTK_ICON_SIZE_INVALID);
- gtk_image_set_pixel_size (panel->os_logo, 256);
+ gtk_image_set_pixel_size (panel->os_logo, 128);
}
else
{
--
GitLab
diff --unified --recursive --text --color a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
--- a/panels/background/cc-background-panel.c 2021-11-10 08:58:57.319396000 -0700
+++ b/panels/background/cc-background-panel.c 2021-11-10 09:10:10.945927765 -0700
@@ -24,6 +24,7 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
+#include "pop_desktop_widget.h"
#include <gdesktop-enums.h>
@@ -49,6 +50,8 @@
GDBusConnection *connection;
+ PopDesktopWidget *pop;
+
GSettings *settings;
GSettings *lock_settings;
@@ -59,10 +62,51 @@
CcBackgroundChooser *background_chooser;
GtkButton *add_picture_button;
CcBackgroundPreview *desktop_preview;
+
+ GtkStack *stack;
+ GtkListBox *stack_sidebar;
+ GtkWidget *background_container;
};
CC_PANEL_REGISTER (CcBackgroundPanel, cc_background_panel)
+static void visible_child_changed (CcBackgroundPanel *self, GParamSpec *pspec, GtkStack *stack) {
+ gboolean visible = gtk_stack_get_visible_child (stack) == self->background_container;
+ gtk_widget_set_visible (GTK_WIDGET (self->add_picture_button), visible);
+}
+
+static void sidebar_row_selected_cb (CcBackgroundPanel *self, GtkListBoxRow *row, GtkListBox *box) {
+ GtkWidget *widget = g_object_get_data (G_OBJECT (row), "stack-child");
+ gtk_stack_set_visible_child (self->stack, widget);
+}
+
+static void for_each_stack_cb (GtkWidget *widget, gpointer user_data) {
+ CcBackgroundPanel *panel = CC_BACKGROUND_PANEL (user_data);
+ gchar *title;
+
+ gtk_container_child_get (GTK_CONTAINER (panel->stack), widget, "title", &title, NULL);
+
+ if (!title)
+ return;
+
+ GtkWidget *label = g_object_new (GTK_TYPE_LABEL,
+ "label", title,
+ "visible", TRUE,
+ "margin", 12,
+ "halign", GTK_ALIGN_START,
+ NULL);
+ GtkWidget *row = g_object_new (GTK_TYPE_LIST_BOX_ROW, "visible", TRUE, NULL);
+ gtk_container_add (GTK_CONTAINER (row), label);
+ g_object_set_data (G_OBJECT (row), "stack-child", widget);
+ gtk_container_add (GTK_CONTAINER (panel->stack_sidebar), row);
+}
+
+static GtkWidget *cc_background_panel_get_sidebar_widget (CcPanel *panel) {
+ CcBackgroundPanel *self = CC_BACKGROUND_PANEL (panel);
+
+ return GTK_WIDGET (self->stack_sidebar);
+}
+
static void
update_preview (CcBackgroundPanel *panel)
{
@@ -239,6 +283,7 @@
g_clear_object (&panel->settings);
g_clear_object (&panel->lock_settings);
g_clear_object (&panel->thumb_factory);
+ g_clear_pointer (&panel->pop, pop_desktop_widget_free);
G_OBJECT_CLASS (cc_background_panel_parent_class)->dispose (object);
}
@@ -264,6 +309,7 @@
g_type_ensure (CC_TYPE_BACKGROUND_PREVIEW);
panel_class->get_help_uri = cc_background_panel_get_help_uri;
+ panel_class->get_sidebar_widget = cc_background_panel_get_sidebar_widget;
object_class->constructed = cc_background_panel_constructed;
object_class->dispose = cc_background_panel_dispose;
@@ -274,9 +320,14 @@
gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, add_picture_button);
gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, background_chooser);
gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, desktop_preview);
+ gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, stack);
+ gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, stack_sidebar);
+ gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, background_container);
gtk_widget_class_bind_template_callback (widget_class, on_chooser_background_chosen_cb);
gtk_widget_class_bind_template_callback (widget_class, on_add_picture_button_clicked_cb);
+ gtk_widget_class_bind_template_callback (widget_class, sidebar_row_selected_cb);
+ gtk_widget_class_bind_template_callback (widget_class, visible_child_changed);
}
static void
@@ -303,6 +354,9 @@
panel->lock_settings = g_settings_new (WP_LOCK_PATH_ID);
g_settings_delay (panel->lock_settings);
+ panel->pop = pop_desktop_widget_new (panel->stack);
+ gtk_container_foreach (GTK_CONTAINER (panel->stack), for_each_stack_cb, panel);
+
/* Load the background */
reload_current_bg (panel);
update_preview (panel);
diff --unified --recursive --text --color a/panels/background/cc-background-panel.ui b/panels/background/cc-background-panel.ui
--- a/panels/background/cc-background-panel.ui 2021-11-10 08:58:57.319396000 -0700
+++ b/panels/background/cc-background-panel.ui 2021-11-10 09:16:56.922557538 -0700
@@ -1,49 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkListBox" id="stack_sidebar">
+ <property name="visible">True</property>
+ <signal name="row-selected" handler="sidebar_row_selected_cb" object="CcBackgroundPanel" swapped="yes" />
+ </object>
+
<template class="CcBackgroundPanel" parent="CcPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkBox">
+ <object class="GtkStack" id="stack">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="transition-type">crossfade</property>
+ <signal name="notify::visible-child" handler="visible_child_changed" object="CcBackgroundPanel" swapped="yes" />
+ <!-- Background page -->
<child>
- <object class="HdyClamp">
- <property name="visible">1</property>
- <property name="maximum_size">300</property>
- <property name="tightening_threshold">200</property>
+ <object class="GtkBox" id="background_container">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+
<child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">24</property>
- <property name="margin-start">12</property>
- <property name="margin-end">12</property>
- <property name="margin-top">18</property>
- <property name="margin-bottom">18</property>
- <property name="hexpand">True</property>
+ <object class="HdyClamp">
+ <property name="visible">1</property>
<child>
- <object class="CcBackgroundPreview" id="desktop_preview">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
+ <property name="spacing">24</property>
+ <property name="margin-start">12</property>
+ <property name="margin-end">12</property>
+ <property name="margin-top">18</property>
+ <property name="margin-bottom">18</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="CcBackgroundPreview" id="desktop_preview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
- </object>
- </child>
<child>
- <object class="CcBackgroundChooser" id="background_chooser">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="expand">True</property>
- <signal name="background-chosen" handler="on_chooser_background_chosen_cb" object="CcBackgroundPanel" swapped="yes" />
+ <object class="CcBackgroundChooser" id="background_chooser">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="expand">True</property>
+ <signal name="background-chosen" handler="on_chooser_background_chosen_cb" object="CcBackgroundPanel" swapped="yes" />
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="name">background</property>
+ <property name="title" translatable="yes" comments="Change the background in Pop!_OS">Background</property>
+ </packing>
</child>
</object>
</child>
diff --unified --recursive --text --color a/panels/background/gnome-background-panel.desktop.in.in b/panels/background/gnome-background-panel.desktop.in.in
--- a/panels/background/gnome-background-panel.desktop.in.in 2021-11-10 08:58:57.319396000 -0700
+++ b/panels/background/gnome-background-panel.desktop.in.in 2021-11-10 09:18:23.048004483 -0700
@@ -1,6 +1,6 @@
[Desktop Entry]
-Name=Background
-Comment=Change your background image to a wallpaper or photo
+Name=Desktop
+Comment=Customize desktop features. Change your background image. Toggle dark and light mode.
Exec=gnome-control-center background
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=preferences-desktop-wallpaper
@@ -11,4 +11,5 @@
Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
OnlyShowIn=GNOME;
# Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=Wallpaper;Screen;Desktop;
+Keywords=Wallpaper;Screen;Desktop;Dark;Light;Theme;Night;Dock;Panel;Windows;Workspaces;
+X-GNOME-ControlCenter-HasSidebar=true
diff --unified --recursive --text --color a/panels/background/meson.build b/panels/background/meson.build
--- a/panels/background/meson.build 2021-11-10 08:58:57.319396000 -0700
+++ b/panels/background/meson.build 2021-11-10 09:19:51.976853554 -0700
@@ -91,6 +91,7 @@
gnome_desktop_dep,
libxml_dep,
dependency('cairo-gobject'),
+ dependency('pop_desktop_widget'),
]
cflags += [
--- cc-info-overview-panel.orig.c 2021-03-26 10:06:51.071989132 -0600
+++ cc-info-overview-panel.new.c 2021-03-26 10:10:30.553412332 -0600
@@ -776,4 +776,11 @@
--- cc-info-overview-panel-a 2021-11-09 18:05:38.900919000 -0700
+++ cc-info-overview-panel-b 2021-11-09 18:12:33.650424772 -0700
@@ -789,6 +789,13 @@
}
static gboolean
+does_pamac_manager_exist (void)
......@@ -12,7 +13,9 @@
+static gboolean
does_gnome_software_exist (void)
{
@@ -796,4 +803,11 @@
g_autofree gchar *path = g_find_program_in_path ("gnome-software");
@@ -809,6 +816,13 @@
gboolean ret;
char *argv[3];
+ if (does_pamac_manager_exist ())
......@@ -24,10 +27,14 @@
+ else
if (does_gnome_software_exist ())
{
@@ -956,5 +970,5 @@
argv[0] = "gnome-software";
@@ -976,7 +990,7 @@
g_resources_register (cc_info_overview_get_resource ());
- if (!does_gnome_software_exist () && !does_gpk_update_viewer_exist ())
- if ((!does_gnome_software_exist () || !does_gnome_software_allow_updates ()) && !does_gpk_update_viewer_exist ())
+ if (!does_pamac_manager_exist () && !does_gnome_software_exist () && !does_gpk_update_viewer_exist ())
gtk_widget_hide (GTK_WIDGET (self->software_updates_row));
info_overview_panel_setup_overview (self);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment