budgie-control-center: Drop gnome-color-manager
The color panel has been disabled. https://github.com/BuddiesOfBudgie/budgie-control-center/commit/d08826f8391e17c6637385a58aa63ea6c8330877
This commit is contained in:
@@ -18,7 +18,6 @@
|
||||
glibc,
|
||||
gnome,
|
||||
gst_all_1,
|
||||
gnome-color-manager,
|
||||
gnome-desktop,
|
||||
gnome-settings-daemon,
|
||||
gsettings-desktop-schemas,
|
||||
@@ -83,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
(replaceVars ./paths.patch {
|
||||
budgie_desktop = budgie-desktop;
|
||||
gcm = gnome-color-manager;
|
||||
inherit
|
||||
cups
|
||||
libgnomekbd
|
||||
|
||||
@@ -1,42 +1,3 @@
|
||||
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
|
||||
index a2f90b093..7801b4a5e 100644
|
||||
--- a/panels/color/cc-color-panel.c
|
||||
+++ b/panels/color/cc-color-panel.c
|
||||
@@ -587,7 +587,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs)
|
||||
|
||||
/* run with modal set */
|
||||
argv = g_ptr_array_new_with_free_func (g_free);
|
||||
- g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));
|
||||
+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
|
||||
g_ptr_array_add (argv, g_strdup ("--device"));
|
||||
g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
|
||||
g_ptr_array_add (argv, g_strdup ("--parent-window"));
|
||||
@@ -940,7 +940,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
|
||||
|
||||
/* open up gcm-viewer as a info pane */
|
||||
argv = g_ptr_array_new_with_free_func (g_free);
|
||||
- g_ptr_array_add (argv, g_strdup ("gcm-viewer"));
|
||||
+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL));
|
||||
g_ptr_array_add (argv, g_strdup ("--profile"));
|
||||
g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
|
||||
g_ptr_array_add (argv, g_strdup ("--parent-window"));
|
||||
@@ -1186,15 +1186,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
|
||||
static void
|
||||
gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
|
||||
{
|
||||
- g_autofree gchar *s = NULL;
|
||||
-
|
||||
/* get profile */
|
||||
g_debug ("selected profile = %s",
|
||||
cd_profile_get_filename (profile));
|
||||
|
||||
/* allow getting profile info */
|
||||
- if (cd_profile_get_filename (profile) != NULL &&
|
||||
- (s = g_find_program_in_path ("gcm-viewer")) != NULL)
|
||||
+ if (cd_profile_get_filename (profile) != NULL)
|
||||
gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE);
|
||||
else
|
||||
gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);
|
||||
diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
|
||||
index b6b7ab9d0..31f268e91 100644
|
||||
--- a/panels/datetime/tz.h
|
||||
|
||||
Reference in New Issue
Block a user