[gnome-color-manager/colord: 4/6] Remove the ability to set a profile systemwide, we can do this in colord



commit ecfcec1190e7d42dfeb8e101017149483d31e77f
Author: Richard Hughes <richard hughsie com>
Date:   Sat Jan 15 13:40:56 2011 +0000

    Remove the ability to set a profile systemwide, we can do this in colord

 Makefile.am                      |    1 -
 configure.ac                     |    1 -
 po/POTFILES.in                   |    1 -
 policy/.gitignore                |    8 -
 policy/Makefile.am               |   14 --
 policy/org.gnome.color.policy.in |   37 -----
 src/.gitignore                   |    1 -
 src/Makefile.am                  |   12 --
 src/cc-color-panel.c             |   32 +----
 src/gcm-install-system-wide.c    |  277 --------------------------------------
 10 files changed, 2 insertions(+), 382 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3dcc91b..3ebaa94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = 						\
 	help						\
 	man						\
 	po						\
-	policy						\
 	rules						\
 	tools						\
 	session						\
diff --git a/configure.ac b/configure.ac
index baa88d9..0f50c0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,7 +292,6 @@ data/targets/Makefile
 data/figures/Makefile
 help/Makefile
 man/Makefile
-policy/Makefile
 po/Makefile.in
 rules/Makefile
 src/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8a38a10..3361ede 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,7 +23,6 @@ src/gcm-device-xrandr.c
 src/gcm-list-store-profiles.c
 src/gcm-import.c
 src/gcm-inspect.c
-src/gcm-install-system-wide.c
 src/gcm-picker.c
 src/gcm-session.c
 src/gcm-utils.c
diff --git a/src/.gitignore b/src/.gitignore
index a3c1b88..c08378a 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -12,5 +12,4 @@ gcm-picker
 gcm-inspect
 gcm-session
 gcm-self-test
-gcm-install-system-wide
 gcm-helper-exiv
diff --git a/src/Makefile.am b/src/Makefile.am
index 61df26f..db0d648 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,9 +81,6 @@ libgcmshared_a_CFLAGS =					\
 libgcmshared_a_LIBADD =					\
 	$(COLOR_GLIB_LIBS)
 
-sbin_PROGRAMS =						\
-	gcm-install-system-wide
-
 bin_PROGRAMS =						\
 	gcm-inspect					\
 	gcm-apply					\
@@ -99,15 +96,6 @@ gcm_helper_exiv_LDADD = $(EXIV_LIBS)
 gcm_helper_exiv_CXXFLAGS = -Wall
 endif
 
-gcm_install_system_wide_SOURCES =			\
-	gcm-install-system-wide.c
-
-gcm_install_system_wide_LDADD =				\
-	$(GLIB_LIBS)
-
-gcm_install_system_wide_CFLAGS =			\
-	$(WARNINGFLAGS_C)
-
 gcm_inspect_SOURCES =					\
 	gcm-inspect.c
 
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index 34ce173..e9d1a26 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -122,36 +122,8 @@ cc_color_panel_error_dialog (CcColorPanel *panel, const gchar *title, const gcha
 static gboolean
 cc_color_panel_set_default (CcColorPanel *panel, GcmDevice *device)
 {
-	GError *error = NULL;
-	gboolean ret = FALSE;
-	gchar *cmdline = NULL;
-	const gchar *filename;
-	const gchar *id;
-	gchar *install_cmd = NULL;
-
-	/* nothing set */
-	id = gcm_device_get_id (device);
-	filename = gcm_device_get_default_profile_filename (device);
-	if (filename == NULL) {
-		g_debug ("no filename for %s", id);
-		goto out;
-	}
-
-	/* run using PolicyKit */
-	install_cmd = g_build_filename (SBINDIR, "gcm-install-system-wide", NULL);
-	cmdline = g_strdup_printf ("pkexec %s --id %s \"%s\"", install_cmd, id, filename);
-	g_debug ("running: %s", cmdline);
-	ret = g_spawn_command_line_sync (cmdline, NULL, NULL, NULL, &error);
-	if (!ret) {
-		/* TRANSLATORS: could not save for all users */
-		cc_color_panel_error_dialog (panel, _("Failed to save defaults for all users"), error->message);
-		g_error_free (error);
-		goto out;
-	}
-out:
-	g_free (install_cmd);
-	g_free (cmdline);
-	return ret;
+	/* TODO: make default */
+	return TRUE;
 }
 
 /**



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]