rpms/control-center/devel add-randr12-capplet.patch, 1.15, 1.16 control-center.spec, 1.353, 1.354

[Soren Sandmann Pedersen (ssp)]

Author: ssp

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32080

Modified Files:
	add-randr12-capplet.patch control-center.spec 
Log Message:
Remove ability to turn off the single active display

add-randr12-capplet.patch:

Index: add-randr12-capplet.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/add-randr12-capplet.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- add-randr12-capplet.patch	7 Apr 2008 17:42:47 -0000	1.15
+++ add-randr12-capplet.patch	7 Apr 2008 17:56:23 -0000	1.16
@@ -1,6 +1,6 @@
 diff -up /dev/null gnome-control-center-2.22.0/capplets/display/scrollarea.c
 --- /dev/null	2008-03-16 00:14:46.954006998 -0400
-+++ gnome-control-center-2.22.0/capplets/display/scrollarea.c	2008-04-07 13:37:22.000000000 -0400
++++ gnome-control-center-2.22.0/capplets/display/scrollarea.c	2008-04-07 13:50:17.000000000 -0400
 @@ -0,0 +1,1902 @@
 +#include <gdk/gdkprivate.h> /* For GDK_PARENT_RELATIVE_BG */
 +#include "scrollarea.h"
@@ -1906,7 +1906,7 @@
 +#endif
 diff -up /dev/null gnome-control-center-2.22.0/capplets/display/foo-marshal.c
 --- /dev/null	2008-03-16 00:14:46.954006998 -0400
-+++ gnome-control-center-2.22.0/capplets/display/foo-marshal.c	2008-04-07 13:37:22.000000000 -0400
++++ gnome-control-center-2.22.0/capplets/display/foo-marshal.c	2008-04-07 13:50:17.000000000 -0400
 @@ -0,0 +1,279 @@
 +
 +#include	<glib-object.h>
@@ -2189,7 +2189,7 @@
 +
 diff -up /dev/null gnome-control-center-2.22.0/capplets/display/foo-marshal.h
 --- /dev/null	2008-03-16 00:14:46.954006998 -0400
-+++ gnome-control-center-2.22.0/capplets/display/foo-marshal.h	2008-04-07 13:37:22.000000000 -0400
++++ gnome-control-center-2.22.0/capplets/display/foo-marshal.h	2008-04-07 13:50:17.000000000 -0400
 @@ -0,0 +1,63 @@
 +
 +#ifndef __foo_marshal_MARSHAL_H__
@@ -2279,7 +2279,7 @@
  	$(DISPLAY_CAPPLET_LIBS) \
 diff -up /dev/null gnome-control-center-2.22.0/capplets/display/scrollarea.h
 --- /dev/null	2008-03-16 00:14:46.954006998 -0400
-+++ gnome-control-center-2.22.0/capplets/display/scrollarea.h	2008-04-07 13:37:22.000000000 -0400
++++ gnome-control-center-2.22.0/capplets/display/scrollarea.h	2008-04-07 13:50:17.000000000 -0400
 @@ -0,0 +1,107 @@
 +#include <cairo/cairo.h>
 +#include <gtk/gtk.h>
@@ -2390,7 +2390,7 @@
 +void foo_scroll_area_end_auto_scroll (FooScrollArea *scroll_area);
 diff -up /dev/null gnome-control-center-2.22.0/capplets/display/display-capplet.glade
 --- /dev/null	2008-03-16 00:14:46.954006998 -0400
-+++ gnome-control-center-2.22.0/capplets/display/display-capplet.glade	2008-04-07 13:37:22.000000000 -0400
++++ gnome-control-center-2.22.0/capplets/display/display-capplet.glade	2008-04-07 13:50:17.000000000 -0400
 @@ -0,0 +1,412 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -2806,8 +2806,8 @@
 +</glade-interface>
 diff -up /dev/null gnome-control-center-2.22.0/capplets/display/xrandr-capplet.c
 --- /dev/null	2008-03-16 00:14:46.954006998 -0400
-+++ gnome-control-center-2.22.0/capplets/display/xrandr-capplet.c	2008-04-07 13:37:22.000000000 -0400
-@@ -0,0 +1,1608 @@
++++ gnome-control-center-2.22.0/capplets/display/xrandr-capplet.c	2008-04-07 13:50:17.000000000 -0400
+@@ -0,0 +1,1624 @@
 +/* Monitor Settings. A preference panel for configuring monitors
 + *
 + * Copyright (C) 2007, 2008  Red Hat, Inc.
@@ -3289,6 +3289,21 @@
 +	combo_select (app->refresh_combo, idle_free (g_strdup_printf ("%d Hz", best)));
 +}
 +
++static int
++count_active_outputs (App *app)
++{
++    int i, count = 0;
++    
++    for (i = 0; app->current_configuration->outputs[i] != NULL; ++i)
++    {
++	Output *output = app->current_configuration->outputs[i];
++	if (output->on)
++	    count++;
++    }
++    
++    return count;
++}
++
 +static void
 +rebuild_resolution_combo (App *app)
 +{
@@ -3322,7 +3337,8 @@
 +	}
 +    }
 +
-+    add_key (app->resolution_combo, "Off", 0, 0, 0, 0);
++    if (count_active_outputs (app) > 1 || !app->current_output->on)
++	add_key (app->resolution_combo, "Off", 0, 0, 0, 0);
 +
 +    if (!app->current_output->on)
 +    {


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- control-center.spec	7 Apr 2008 17:42:47 -0000	1.353
+++ control-center.spec	7 Apr 2008 17:56:23 -0000	1.354
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.22.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -353,6 +353,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Apr 7 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.0-6
+- Disallow turning off the only active screen
+
 * Mon Apr 7 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.0-5
 - Add detect displays button; fix clone text