rpms/control-center/devel add-randr12-capplet.patch, 1.11, 1.12 control-center.spec, 1.345, 1.346
Soren Sandmann Pedersen (ssp)
fedora-extras-commits at redhat.com
Sun Mar 2 22:32:17 UTC 2008
Author: ssp
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28055
Modified Files:
add-randr12-capplet.patch control-center.spec
Log Message:
Update randr
add-randr12-capplet.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- add-randr12-capplet.patch 16 Feb 2008 01:45:46 -0000 1.11
+++ add-randr12-capplet.patch 2 Mar 2008 22:32:01 -0000 1.12
@@ -1,141 +1,563 @@
-diff -up /dev/null gnome-control-center-2.21.90/capplets/display/foo-marshal.c
---- /dev/null 2008-02-13 09:53:53.228642516 -0500
-+++ gnome-control-center-2.21.90/capplets/display/foo-marshal.c 2008-02-15 20:33:42.000000000 -0500
-@@ -0,0 +1,279 @@
+diff -up /dev/null gnome-control-center-2.21.92/capplets/display/display-capplet.glade
+--- /dev/null 2008-02-19 17:35:05.543056439 -0500
++++ gnome-control-center-2.21.92/capplets/display/display-capplet.glade 2008-03-02 17:36:13.000000000 -0500
+@@ -0,0 +1,418 @@
++<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
++<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
-+#include <glib-object.h>
++<glade-interface>
+
++<widget class="GtkDialog" id="dialog">
++ <property name="border_width">18</property>
++ <property name="title" translatable="yes"></property>
++ <property name="type">GTK_WINDOW_TOPLEVEL</property>
++ <property name="window_position">GTK_WIN_POS_NONE</property>
++ <property name="modal">False</property>
++ <property name="resizable">True</property>
++ <property name="destroy_with_parent">False</property>
++ <property name="decorated">True</property>
++ <property name="skip_taskbar_hint">False</property>
++ <property name="skip_pager_hint">False</property>
++ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++ <property name="focus_on_map">True</property>
++ <property name="urgency_hint">False</property>
++ <property name="has_separator">False</property>
+
-+#ifdef G_ENABLE_DEBUG
-+#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-+#define g_marshal_value_peek_char(v) g_value_get_char (v)
-+#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
-+#define g_marshal_value_peek_int(v) g_value_get_int (v)
-+#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
-+#define g_marshal_value_peek_long(v) g_value_get_long (v)
-+#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
-+#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
-+#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
-+#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
-+#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
-+#define g_marshal_value_peek_float(v) g_value_get_float (v)
-+#define g_marshal_value_peek_double(v) g_value_get_double (v)
-+#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-+#define g_marshal_value_peek_param(v) g_value_get_param (v)
-+#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
-+#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
-+#define g_marshal_value_peek_object(v) g_value_get_object (v)
-+#else /* !G_ENABLE_DEBUG */
-+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
-+ * Do not access GValues directly in your code. Instead, use the
-+ * g_value_get_*() functions
-+ */
-+#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
-+#define g_marshal_value_peek_char(v) (v)->data[0].v_int
-+#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
-+#define g_marshal_value_peek_int(v) (v)->data[0].v_int
-+#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
-+#define g_marshal_value_peek_long(v) (v)->data[0].v_long
-+#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
-+#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
-+#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
-+#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
-+#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
-+#define g_marshal_value_peek_float(v) (v)->data[0].v_float
-+#define g_marshal_value_peek_double(v) (v)->data[0].v_double
-+#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
-+#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
-+#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
-+#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
-+#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
-+#endif /* !G_ENABLE_DEBUG */
++ <child internal-child="vbox">
++ <widget class="GtkVBox" id="dialog-vbox1">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">0</property>
+
++ <child internal-child="action_area">
++ <widget class="GtkHButtonBox" id="dialog-action_area1">
++ <property name="visible">True</property>
++ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
-+/* VOID:OBJECT,OBJECT (marshal.list:1) */
-+void
-+foo_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
-+ GValue *return_value G_GNUC_UNUSED,
-+ guint n_param_values,
-+ const GValue *param_values,
-+ gpointer invocation_hint G_GNUC_UNUSED,
-+ gpointer marshal_data)
-+{
-+ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
-+ gpointer arg_1,
-+ gpointer arg_2,
-+ gpointer data2);
-+ register GMarshalFunc_VOID__OBJECT_OBJECT callback;
-+ register GCClosure *cc = (GCClosure*) closure;
-+ register gpointer data1, data2;
++ <child>
++ <widget class="GtkButton" id="helpbutton1">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-help</property>
++ <property name="use_stock">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
++ <property name="response_id">-11</property>
++ </widget>
++ </child>
+
-+ g_return_if_fail (n_param_values == 3);
++ <child>
++ <widget class="GtkButton" id="button1">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-apply</property>
++ <property name="use_stock">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
++ <property name="response_id">-10</property>
++ </widget>
++ </child>
+
-+ if (G_CCLOSURE_SWAP_DATA (closure))
-+ {
-+ data1 = closure->data;
-+ data2 = g_value_peek_pointer (param_values + 0);
-+ }
-+ else
-+ {
-+ data1 = g_value_peek_pointer (param_values + 0);
-+ data2 = closure->data;
-+ }
-+ callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
++ <child>
++ <widget class="GtkButton" id="button2">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-close</property>
++ <property name="use_stock">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
++ <property name="response_id">-7</property>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="pack_type">GTK_PACK_END</property>
++ </packing>
++ </child>
+
-+ callback (data1,
-+ g_marshal_value_peek_object (param_values + 1),
-+ g_marshal_value_peek_object (param_values + 2),
-+ data2);
-+}
++ <child>
++ <widget class="GtkVBox" id="vbox1">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">12</property>
+
-+/* VOID:UINT,UINT,UINT,UINT (marshal.list:2) */
-+void
-+foo_marshal_VOID__UINT_UINT_UINT_UINT (GClosure *closure,
-+ GValue *return_value G_GNUC_UNUSED,
-+ guint n_param_values,
-+ const GValue *param_values,
-+ gpointer invocation_hint G_GNUC_UNUSED,
-+ gpointer marshal_data)
-+{
-+ typedef void (*GMarshalFunc_VOID__UINT_UINT_UINT_UINT) (gpointer data1,
-+ guint arg_1,
-+ guint arg_2,
-+ guint arg_3,
-+ guint arg_4,
-+ gpointer data2);
-+ register GMarshalFunc_VOID__UINT_UINT_UINT_UINT callback;
-+ register GCClosure *cc = (GCClosure*) closure;
-+ register gpointer data1, data2;
++ <child>
++ <widget class="GtkLabel" id="label1">
[...6235 lines suppressed...]
-+typedef struct FooScrollArea FooScrollArea;
-+typedef struct FooScrollAreaClass FooScrollAreaClass;
-+typedef struct FooScrollAreaPrivate FooScrollAreaPrivate;
-+typedef struct FooScrollAreaEvent FooScrollAreaEvent;
++ if (dx > 0)
++ {
++ rect.x = 0;
++ rect.width = dx;
++ }
++ else
++ {
++ rect.x = store->width + dx;
++ rect.width = -dx;
++ }
+
-+typedef enum
++ gdk_region_union_with_rect (store->update_region, &rect);
++}
++
++static void
++backing_store_invalidate_rect (BackingStore *store,
++ GdkRectangle *rect)
+{
-+ FOO_BUTTON_PRESS,
-+ FOO_BUTTON_RELEASE,
-+ FOO_MOTION
-+} FooScrollAreaEventType;
++ gdk_region_union_with_rect (store->update_region, rect);
++}
+
-+struct FooScrollAreaEvent
++static void
++backing_store_invalidate_region (BackingStore *store,
++ GdkRegion *region)
+{
-+ FooScrollAreaEventType type;
-+ int x;
-+ int y;
-+};
++ gdk_region_union (store->update_region, region);
++}
+
-+typedef void (* FooScrollAreaEventFunc) (FooScrollArea *area,
-+ FooScrollAreaEvent *event,
-+ gpointer data);
++static void
++backing_store_invalidate_all (BackingStore *store)
++{
++ GdkRectangle rect = { 0, 0, store->width, store->height };
++ gdk_region_destroy (store->update_region);
++ store->update_region = gdk_region_rectangle (&rect);
++}
+
-+struct FooScrollArea
++static void
++backing_store_resize (BackingStore *store,
++ int width,
++ int height)
+{
-+ GtkContainer parent_instance;
++ GdkPixmap *pixmap = gdk_pixmap_new (store->pixmap, width, height, -1);
+
-+ FooScrollAreaPrivate *priv;
-+};
++ /* Unfortunately we don't know in which direction we were resized,
++ * so we just assume we were dragged from the south-east corner.
++ *
++ * Although, maybe we could get the root coordinates of the input-window?
++ * That might just work, actually. We need to make sure metacity uses
++ * static gravity for the window before this will be useful.
++ */
++ simple_draw_drawable (pixmap, store->pixmap, 0, 0, 0, 0, -1, -1);
+
-+struct FooScrollAreaClass
-+{
-+ GtkContainerClass parent_class;
++ g_object_unref (store->pixmap);
+
-+ void (*set_scroll_adjustments) (FooScrollArea *scroll_area,
-+ GtkAdjustment *hadjustment,
-+ GtkAdjustment *vadjustment);
++ store->pixmap = pixmap;
+
-+ void (*viewport_changed) (FooScrollArea *scroll_area,
-+ GdkRectangle *old_viewport,
-+ GdkRectangle *new_viewport);
++ /* FIXME: invalidate uncovered strip only */
+
-+ void (*paint) (FooScrollArea *scroll_area,
-+ cairo_t *cr,
-+ GdkRectangle *extents,
-+ GdkRegion *region);
-+};
++ backing_store_invalidate_all (store);
++}
+
-+GType foo_scroll_area_get_type (void);
++static void
++cclip_to_region (cairo_t *cr, GdkRegion *region)
++{
++ int n_rects;
++ GdkRectangle *rects;
+
-+FooScrollArea *foo_scroll_area_new (void);
++ gdk_region_get_rectangles (region, &rects, &n_rects);
+
-+/* Set the requisition for the widget. */
-+void foo_scroll_area_set_min_size (FooScrollArea *scroll_area,
-+ int min_width,
-+ int min_height);
++ cairo_new_path (cr);
++ while (n_rects--)
++ {
++ GdkRectangle *rect = &(rects[n_rects]);
+
-+/* Set how much of the canvas can be scrolled into view */
-+void foo_scroll_area_set_size (FooScrollArea *scroll_area,
-+ int width,
-+ int height);
-+void foo_scroll_area_set_size_fixed_y (FooScrollArea *scroll_area,
-+ int width,
-+ int height,
-+ int old_y,
-+ int new_y);
-+void foo_scroll_area_set_viewport_pos (FooScrollArea *scroll_area,
-+ int x,
-+ int y);
-+void foo_scroll_area_get_viewport (FooScrollArea *scroll_area,
-+ GdkRectangle *viewport);
-+void foo_scroll_area_add_input_from_stroke (FooScrollArea *scroll_area,
-+ cairo_t *cr,
-+ FooScrollAreaEventFunc func,
-+ gpointer data);
-+void foo_scroll_area_add_input_from_fill (FooScrollArea *scroll_area,
-+ cairo_t *cr,
-+ FooScrollAreaEventFunc func,
-+ gpointer data);
-+void foo_scroll_area_invalidate_region (FooScrollArea *area,
-+ GdkRegion *region);
-+void foo_scroll_area_invalidate (FooScrollArea *scroll_area);
-+void foo_scroll_area_invalidate_rect (FooScrollArea *scroll_area,
-+ int x,
-+ int y,
-+ int width,
-+ int height);
-+void foo_scroll_area_begin_grab (FooScrollArea *scroll_area,
-+ FooScrollAreaEventFunc func,
-+ gpointer input_data);
-+void foo_scroll_area_end_grab (FooScrollArea *scroll_area);
-+gboolean foo_scroll_area_is_grabbed (FooScrollArea *scroll_area);
++ cairo_rectangle (cr, rect->x, rect->y, rect->width, rect->height);
++ }
++ cairo_clip (cr);
+
-+void foo_scroll_area_begin_auto_scroll (FooScrollArea *scroll_area);
-+void foo_scroll_area_auto_scroll (FooScrollArea *scroll_area,
-+ FooScrollAreaEvent *event);
-+void foo_scroll_area_end_auto_scroll (FooScrollArea *scroll_area);
-diff -up gnome-control-center-2.21.90/capplets/display/Makefile.am.add-randr12-capplet gnome-control-center-2.21.90/capplets/display/Makefile.am
---- gnome-control-center-2.21.90/capplets/display/Makefile.am.add-randr12-capplet 2008-01-29 07:22:35.000000000 -0500
-+++ gnome-control-center-2.21.90/capplets/display/Makefile.am 2008-02-13 13:12:09.000000000 -0500
-@@ -1,9 +1,18 @@
- # This is used in GNOMECC_CAPPLETS_CFLAGS
- cappletname = display
-
-+gladedir = $(pkgdatadir)/glade
-+dist_glade_DATA = display-capplet.glade
++ g_free (rects);
++}
+
- bin_PROGRAMS = gnome-display-properties
-
--gnome_display_properties_SOURCES = main.c
-+gnome_display_properties_SOURCES = \
-+ xrandr-capplet.c \
-+ scrollarea.c \
-+ foo-marshal.c \
-+ scrollarea.h \
-+ foo-marshal.h
++static void
++backing_store_process_updates (BackingStore *store,
++ ExposeFunc func,
++ gpointer data)
++{
++ cairo_t *cr = gdk_cairo_create (store->pixmap);
++ GdkRegion *region = store->update_region;
++ store->update_region = gdk_region_new ();
+
- gnome_display_properties_LDFLAGS = -export-dynamic
- gnome_display_properties_LDADD = \
- $(DISPLAY_CAPPLET_LIBS) \
++ cclip_to_region (cr, store->update_region);
++
++ func (cr, store->update_region, data);
++
++ gdk_region_destroy (region);
++ cairo_destroy (cr);
++}
++
++#endif
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- control-center.spec 1 Mar 2008 04:43:08 -0000 1.345
+++ control-center.spec 2 Mar 2008 22:32:01 -0000 1.346
@@ -22,7 +22,7 @@
Summary: GNOME Control Center
Name: control-center
Version: 2.21.92
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -353,6 +353,9 @@
%dir %{_datadir}/gnome-control-center/keybindings
%changelog
+* Sun Mar 2 2008 Soren Sandmann <sandmann at redhat.com> - 2.21.92-3
+- Update randr
+
* Fri Feb 29 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.92-2
- Fix broken schema translations
More information about the fedora-extras-commits
mailing list