From 95ffa35949739ceccaafac2e734b43afc3a8aa06cb56a6ca3996b670eb12d004 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 18 Aug 2008 23:31:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=9 --- gnome-control-center-monitor-labeling.diff | 25 ++++++++++++++++------ gnome-control-center.changes | 5 +++++ gnome-control-center.spec | 4 +++- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gnome-control-center-monitor-labeling.diff b/gnome-control-center-monitor-labeling.diff index 439ebab..c9e9f16 100644 --- a/gnome-control-center-monitor-labeling.diff +++ b/gnome-control-center-monitor-labeling.diff @@ -1,5 +1,5 @@ diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c -index 23d3c5d..faa75a7 100644 +index c6d1237..91d4d2e 100644 --- a/capplets/display/xrandr-capplet.c +++ b/capplets/display/xrandr-capplet.c @@ -28,6 +28,7 @@ @@ -10,14 +10,17 @@ index 23d3c5d..faa75a7 100644 #include #include #include -@@ -40,6 +41,7 @@ struct App +@@ -40,8 +41,9 @@ struct App { GnomeRRScreen *screen; GnomeRRConfig *current_configuration; + GnomeRRLabeler *labeler; GnomeOutputInfo *current_output; - +- ++ GtkWidget *dialog; + GtkListStore *resolution_store; + GtkWidget *resolution_combo; @@ -139,6 +141,13 @@ on_screen_changed (GnomeRRScreen *scr, qsort (app->current_configuration->outputs, i, sizeof (GnomeOutputInfo *), compare_outputs); @@ -32,7 +35,7 @@ index 23d3c5d..faa75a7 100644 #if 0 for (i = 0; app->current_configuration->outputs[i] != NULL; ++i) { -@@ -1351,6 +1360,8 @@ paint_output (App *app, cairo_t *cr, int i) +@@ -1351,9 +1360,11 @@ paint_output (App *app, cairo_t *cr, int i) PangoRectangle extent; GdkRectangle viewport; double angle; @@ -40,15 +43,22 @@ index 23d3c5d..faa75a7 100644 + double r, g, b; cairo_save (cr); +- ++ + foo_scroll_area_get_viewport (FOO_SCROLL_AREA (app->area), &viewport); + + get_geometry (output, &w, &h); +@@ -1419,12 +1430,22 @@ paint_output (App *app, cairo_t *cr, int i) -@@ -1420,10 +1431,20 @@ paint_output (App *app, cairo_t *cr, int i) cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5); cairo_clip_preserve (cr); - +- - if (output->on) - cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0); - else - cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 1.0); +- ++ + gnome_rr_labeler_get_color_for_output (app->labeler, output, &output_color); + r = output_color.red / 65535.0; + g = output_color.green / 65535.0; @@ -63,6 +73,7 @@ index 23d3c5d..faa75a7 100644 + } + + cairo_set_source_rgba (cr, r, g, b, 1.0); - ++ foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (app->area), cr, on_output_event, output); + cairo_fill (cr); diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 61c42fe..32a5cd5 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 19 00:28:33 CEST 2008 - federico@novell.com + +- Updated gnome-control-center-monitor-labeling.diff so that it applies cleanly. + ------------------------------------------------------------------- Fri Aug 15 18:26:15 CEST 2008 - federico@novell.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 10e5d51..aed92b0 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -26,7 +26,7 @@ Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.23.6 -Release: 2 +Release: 3 Summary: The GNOME Control Center Source: gnome-%{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -234,6 +234,8 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Tue Aug 19 2008 federico@novell.com +- Updated gnome-control-center-monitor-labeling.diff so that it applies cleanly. * Fri Aug 15 2008 federico@novell.com - Added gnome-control-center-monitor-labeling.diff to implement labeling of physical monitors while their properties are being set