rpms/gnome-settings-daemon/devel add-randr-12.patch,1.2,1.3

[Soren Sandmann Pedersen (ssp)]

Author: ssp

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28387

Modified Files:
	add-randr-12.patch 
Log Message:
Diff against correct version

add-randr-12.patch:

Index: add-randr-12.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/add-randr-12.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- add-randr-12.patch	2 Mar 2008 22:21:35 -0000	1.2
+++ add-randr-12.patch	2 Mar 2008 22:42:21 -0000	1.3
@@ -1,34 +1,42 @@
-diff -up gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c
---- gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12	2007-12-24 06:18:48.000000000 -0500
-+++ gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c	2008-03-02 17:26:08.000000000 -0500
-@@ -36,6 +36,10 @@
+diff -up gnome-settings-daemon-2.21.92/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 gnome-settings-daemon-2.21.92/plugins/xrandr/gsd-xrandr-manager.c
+--- gnome-settings-daemon-2.21.92/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12	2008-02-20 09:20:27.000000000 -0500
++++ gnome-settings-daemon-2.21.92/plugins/xrandr/gsd-xrandr-manager.c	2008-03-02 17:48:02.000000000 -0500
+@@ -35,7 +35,10 @@
+ #include <gdk/gdk.h>
  #include <gdk/gdkx.h>
  #include <gtk/gtk.h>
- 
+-#include <gconf/gconf-client.h>
++
 +#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
 +#include <libgnomeui/monitor-db.h>
 +#include <libgnomeui/randrwrap.h>
-+
+ 
  #ifdef HAVE_RANDR
  #include <X11/extensions/Xrandr.h>
- #endif
-@@ -44,9 +48,14 @@
+@@ -43,6 +46,22 @@
  
- #define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
+ #include "gsd-xrandr-manager.h"
  
++#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
++
 +#define VIDEO_KEYSYM    "XF86Display"
 +
- struct GsdXrandrManagerPrivate
- {
--        gboolean dummy;
++struct GsdXrandrManagerPrivate
++{
 +        /* Key code of the fn-F7 video key (XF86Display) */
 +        guint keycode;
 +        RWScreen *rw_screen;
 +        gboolean running;
- };
- 
- enum {
-@@ -61,248 +70,74 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xra
++};
++
++enum {
++        PROP_0,
++};
++
+ 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);
+@@ -51,248 +70,74 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xra
  
  static gpointer manager_object = NULL;
  
@@ -135,28 +143,28 @@
 -        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);
-+        GsdXrandrManager *manager = data;
-+        XEvent *xev = (XEvent *) xevent;
++        if (!manager->priv->running)
++                return GDK_FILTER_CONTINUE;
  
 -        if (error == NULL) {
 -                return val;
 -        }
-+        if (!manager->priv->running)
-+                return GDK_FILTER_CONTINUE;
- 
--        g_error_free (error);
 -
--        return 0;
--}
+-        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;
+-}
+-
 -static int
 -find_closest_size (XRRScreenSize *sizes,
 -                   int            nsizes,
@@ -327,7 +335,7 @@
  }
  
  gboolean
-@@ -311,8 +146,25 @@ gsd_xrandr_manager_start (GsdXrandrManag
+@@ -301,8 +146,25 @@ gsd_xrandr_manager_start (GsdXrandrManag
  {
          g_debug ("Starting xrandr manager");
  
@@ -355,7 +363,7 @@
          return TRUE;
  }
  
-@@ -320,6 +172,12 @@ void
+@@ -310,6 +172,12 @@ void
  gsd_xrandr_manager_stop (GsdXrandrManager *manager)
  {
          g_debug ("Stopping xrandr manager");
@@ -368,7 +376,14 @@
  }
  
  static void
-@@ -400,8 +258,15 @@ gsd_xrandr_manager_class_init (GsdXrandr
+@@ -383,11 +251,22 @@ gsd_xrandr_manager_class_init (GsdXrandr
+         object_class->constructor = gsd_xrandr_manager_constructor;
+         object_class->dispose = gsd_xrandr_manager_dispose;
+         object_class->finalize = gsd_xrandr_manager_finalize;
++
++        g_type_class_add_private (klass, sizeof (GsdXrandrManagerPrivate));
+ }
+ 
  static void
  gsd_xrandr_manager_init (GsdXrandrManager *manager)
  {
@@ -376,11 +391,20 @@
 +        guint keyval = gdk_keyval_from_name (VIDEO_KEYSYM);
 +        guint keycode = XKeysymToKeycode (dpy, keyval);
 +        
-         manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
- 
++        manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
++
 +        manager->priv->keycode = keycode;
 +        manager->priv->rw_screen = rw_screen_new (
 +                gdk_screen_get_default(), on_randr_event, NULL);
  }
  
  static void
+@@ -400,6 +279,8 @@ gsd_xrandr_manager_finalize (GObject *ob
+ 
+         xrandr_manager = GSD_XRANDR_MANAGER (object);
+ 
++        g_return_if_fail (xrandr_manager->priv != NULL);
++
+         G_OBJECT_CLASS (gsd_xrandr_manager_parent_class)->finalize (object);
+ }
+