Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 84997 | Differences between
and this patch

Collapse All | Expand All

(-)control-center-2.10.0.orig/capplets/theme-switcher/gnome-theme-installer.c (-3 / +3 lines)
Lines 176-182 Link Here
176
	
176
	
177
	filename = g_shell_quote(theme_props->filename);
177
	filename = g_shell_quote(theme_props->filename);
178
	/* this should be something more clever and nonblocking */
178
	/* this should be something more clever and nonblocking */
179
	command = g_strdup_printf ("sh -c 'cd \"%s\"; /usr/bin/bzip2 -d -c < \"%s\" | /bin/tar xf - '",
179
	command = g_strdup_printf ("sh -c 'cd \"%s\"; /bin/bzip2 -d -c < \"%s\" | /bin/tar xf - '",
180
				   theme_props->target_tmp_dir, filename);
180
				   theme_props->target_tmp_dir, filename);
181
	g_free (filename);
181
	g_free (filename);
182
	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
182
	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
Lines 215-221 Link Here
215
		g_free (filename);
215
		g_free (filename);
216
	} else if (path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
216
	} else if (path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
217
		filename = g_shell_quote (path);
217
		filename = g_shell_quote (path);
218
		command = g_strdup_printf ("sh -c '/usr/bin/bzip2 -d -c < \"%s\" | /bin/tar ft - | head -1'",
218
		command = g_strdup_printf ("sh -c '/bin/bzip2 -d -c < \"%s\" | /bin/tar ft - | head -1'",
219
					    filename);
219
					    filename);
220
		theme_props->filetype=TARBZ;
220
		theme_props->filetype=TARBZ;
221
		g_free (filename);
221
		g_free (filename);
Lines 254-260 Link Here
254
	theme_props->filename=g_strdup(path);
254
	theme_props->filename=g_strdup(path);
255
	
255
	
256
	if (theme_props->filetype == TARBZ ) {
256
	if (theme_props->filetype == TARBZ ) {
257
		if (!g_file_test ("/usr/bin/bzip2", G_FILE_TEST_EXISTS)) {
257
		if (!g_file_test ("/bin/bzip2", G_FILE_TEST_EXISTS)) {
258
			GtkWidget *dialog;
258
			GtkWidget *dialog;
259
				
259
				
260
			dialog = gtk_message_dialog_new (NULL,
260
			dialog = gtk_message_dialog_new (NULL,

Return to bug 84997