rpms/gnome-settings-daemon/F-9 add-randr-12.patch, 1.5, 1.6 gnome-settings-daemon.spec, 1.23, 1.24
Soren Sandmann Pedersen (ssp)
fedora-extras-commits at redhat.com
Fri Apr 25 05:05:15 UTC 2008
- Previous message (by thread): rpms/pyephem/devel pyephem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/vinagre/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 vinagre.spec, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ssp
Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21463
Modified Files:
add-randr-12.patch gnome-settings-daemon.spec
Log Message:
Integrate fixes from other distributions
add-randr-12.patch:
Index: add-randr-12.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-9/add-randr-12.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- add-randr-12.patch 5 Apr 2008 16:49:35 -0000 1.5
+++ add-randr-12.patch 25 Apr 2008 05:04:38 -0000 1.6
@@ -1,7 +1,8 @@
-diff -up gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c
---- gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 2008-03-24 17:21:50.000000000 -0400
-+++ gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c 2008-04-05 12:42:41.000000000 -0400
-@@ -35,15 +35,33 @@
+diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
+index 620d783..ad5a914 100644
+--- a/plugins/xrandr/gsd-xrandr-manager.c
++++ b/plugins/xrandr/gsd-xrandr-manager.c
+@@ -35,7 +35,10 @@
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
@@ -13,9 +14,8 @@
#ifdef HAVE_RANDR
#include <X11/extensions/Xrandr.h>
- #endif
-
--#include "gnome-settings-profile.h"
+@@ -44,6 +47,22 @@
+ #include "gnome-settings-profile.h"
#include "gsd-xrandr-manager.h"
+#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
@@ -37,7 +37,7 @@
static void gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass);
static void gsd_xrandr_manager_init (GsdXrandrManager *xrandr_manager);
static void gsd_xrandr_manager_finalize (GObject *object);
-@@ -52,252 +70,74 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xra
+@@ -52,262 +71,113 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
static gpointer manager_object = NULL;
@@ -46,7 +46,9 @@
-get_rotation (GConfClient *client,
- char *display,
- int screen)
--{
++static GdkAtom
++gnome_randr_atom (void)
+ {
- char *key;
- int val;
- GError *error;
@@ -63,9 +65,6 @@
- g_error_free (error);
-
- return 0;
-+static GdkAtom
-+gnome_randr_atom (void)
-+{
+ return gdk_atom_intern ("_GNOME_RANDR_ATOM", FALSE);
}
@@ -75,7 +74,9 @@
- char *keys[],
- int *width,
- int *height)
--{
++static Atom
++gnome_randr_xatom (void)
+ {
- int i;
- char *key;
- char *val;
@@ -96,30 +97,11 @@
- if (val == NULL) {
- return -1;
- }
-+static Atom
-+gnome_randr_xatom (void)
-+{
-+ return gdk_x11_atom_to_xatom (gnome_randr_atom());
-+}
-
+-
- if (sscanf (val, "%dx%d", &w, &h) != 2) {
- g_free (val);
- return -1;
-+static GdkFilterReturn
-+on_client_message (GdkXEvent *xevent,
-+ GdkEvent *event,
-+ gpointer data)
-+{
-+ RWScreen *screen = data;
-+ XEvent *ev = (XEvent *)xevent;
-+
-+ if (ev->type == ClientMessage &&
-+ ev->xclient.message_type == gnome_randr_xatom()) {
-+
-+ configuration_apply_stored (screen);
-+
-+ return GDK_FILTER_REMOVE;
- }
+- }
-
- g_free (val);
-
@@ -127,9 +109,7 @@
- *height = h;
-
- return i;
-+
-+ /* Pass the event on to GTK+ */
-+ return GDK_FILTER_CONTINUE;
++ return gdk_x11_atom_to_xatom (gnome_randr_atom());
}
-static int
@@ -137,41 +117,50 @@
- char *display,
- int screen)
+static GdkFilterReturn
-+event_filter (GdkXEvent *xevent,
-+ GdkEvent *event,
-+ gpointer data)
++on_client_message (GdkXEvent *xevent,
++ GdkEvent *event,
++ gpointer data)
{
- char *key;
- int val;
- GError *error;
-+ GsdXrandrManager *manager = data;
-+ XEvent *xev = (XEvent *) xevent;
-
+-
- key = g_strdup_printf ("%s/%d/rate", display, screen);
- error = NULL;
- val = gconf_client_get_int (client, key, &error);
- g_free (key);
-+ if (!manager->priv->running)
-+ return GDK_FILTER_CONTINUE;
-
+-
- if (error == NULL) {
- return val;
-- }
++ RWScreen *screen = data;
++ XEvent *ev = (XEvent *)xevent;
++
++ if (ev->type == ClientMessage &&
++ ev->xclient.message_type == gnome_randr_xatom()) {
++
++ configuration_apply_stored (screen);
++
++ return GDK_FILTER_REMOVE;
+ }
-
- g_error_free (error);
-+ /* verify we have a key event */
-+ if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease)
-+ return GDK_FILTER_CONTINUE;
-
-- return 0;
--}
-
+- return 0;
++
++ /* Pass the event on to GTK+ */
++ return GDK_FILTER_CONTINUE;
+ }
+
-static int
-find_closest_size (XRRScreenSize *sizes,
- int nsizes,
- int width,
- int height)
--{
++static GdkFilterReturn
++event_filter (GdkXEvent *xevent,
++ GdkEvent *event,
++ gpointer data)
+ {
- int closest;
- int closest_width;
- int closest_height;
@@ -188,6 +177,16 @@
- closest_width = sizes[i].width;
- closest_height = sizes[i].height;
- }
++ GsdXrandrManager *manager = data;
++ XEvent *xev = (XEvent *) xevent;
++
++ if (!manager->priv->running)
++ return GDK_FILTER_CONTINUE;
++
++ /* verify we have a key event */
++ if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease)
++ return GDK_FILTER_CONTINUE;
++
+ if (xev->xkey.keycode == manager->priv->keycode) {
+ /* FIXME: here we should cycle between valid
+ * configurations, and save them
@@ -316,13 +315,13 @@
- XRRFreeScreenConfigInfo (config);
- }
- }
-+ GsdXrandrManager *manager = data;
-
+-
- g_free (specific_path);
-
- /* We need to make sure we process the screen resize event. */
- gdk_display_sync (display);
--
++ GsdXrandrManager *manager = data;
+
- while (gtk_events_pending ()) {
- gtk_main_iteration ();
- }
@@ -341,12 +340,20 @@
}
gboolean
-@@ -306,8 +146,30 @@ gsd_xrandr_manager_start (GsdXrandrManag
+ gsd_xrandr_manager_start (GsdXrandrManager *manager,
+ GError **error)
{
- g_debug ("Starting xrandr manager");
+- g_debug ("Starting xrandr manager");
- apply_settings (manager);
--
++
++ g_debug ("Starting xrandr manager");
+
++ if (manager->priv->rw_screen == NULL) {
++ g_set_error (error, 0, 0, "Failed to initialize XRandR extension");
++ return FALSE;
++ }
++
+ manager->priv->running = TRUE;
+
+ if (manager->priv->keycode) {
@@ -374,7 +381,7 @@
return TRUE;
}
-@@ -315,6 +177,16 @@ void
+@@ -315,6 +185,16 @@ void
gsd_xrandr_manager_stop (GsdXrandrManager *manager)
{
g_debug ("Stopping xrandr manager");
@@ -391,7 +398,7 @@
}
static void
-@@ -388,11 +260,22 @@ gsd_xrandr_manager_class_init (GsdXrandr
+@@ -388,11 +268,22 @@ gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass)
object_class->constructor = gsd_xrandr_manager_constructor;
object_class->dispose = gsd_xrandr_manager_dispose;
object_class->finalize = gsd_xrandr_manager_finalize;
@@ -414,7 +421,7 @@
}
static void
-@@ -405,6 +288,8 @@ gsd_xrandr_manager_finalize (GObject *ob
+@@ -405,6 +296,8 @@ gsd_xrandr_manager_finalize (GObject *object)
xrandr_manager = GSD_XRANDR_MANAGER (object);
Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-9/gnome-settings-daemon.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-settings-daemon.spec 22 Apr 2008 17:48:15 -0000 1.23
+++ gnome-settings-daemon.spec 25 Apr 2008 05:04:38 -0000 1.24
@@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.22.1
-Release: 0.2008.03.26.6%{?dist}
+Release: 0.2008.03.26.7%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@@ -34,8 +34,6 @@
# http://bugzilla.gnome.org/show_bug.cgi?id=524499
Patch3: gsd-mouse-too-much-grab.patch
Patch4: gnome-settings-daemon-2.22.1-hide-white-screen.patch
-# survive xrandr being absent (such as on Xnest in sabayon)
-Patch5: xrandr-missingok.patch
%description
A daemon to share settings from GNOME to other applications. It also
@@ -61,7 +59,6 @@
%patch3 -p0 -b .no-eat-keys
popd
%patch4 -p1 -b .hide-white-screen
-%patch5 -p1 -b .xrandr-missingok
%build
%configure --enable-static=no --enable-profiling
@@ -143,6 +140,10 @@
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
+* Fri Apr 25 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.1-2008.03.26.7
+- Integrate various fixes from other distributions. Remove xrandr-missingok
+ patch.
+
* Tue Apr 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-2008.03.26.6
- Make the xrandr plugin survive the absence of Xrandr
- Previous message (by thread): rpms/pyephem/devel pyephem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/vinagre/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 vinagre.spec, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list