commit gnome-settings-daemon

31 May 2008

Hello community,

here is the log from the commit of package gnome-settings-daemon
checked in at Sat May 31 12:21:01 CEST 2008.


--------

--- GNOME/gnome-settings-daemon/gnome-settings-daemon.changes	2008-05-26 17:05:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-settings-daemon/gnome-settings-daemon.changes	2008-05-29 20:33:17.004683000 +0200
@@ -1,0 +2,5 @@
+Thu May 29 20:39:30 CEST 2008 - federico@novell.com
+
+- Updated gnome-settings-daemon-randr-1.2.diff with the latest fixes from upstream.
+
+-------------------------------------------------------------------



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.R29323/_old	2008-05-31 12:20:42.000000000 +0200
+++ /var/tmp/diff_new_pack.R29323/_new	2008-05-31 12:20:42.000000000 +0200
@@ -17,7 +17,7 @@
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.22.1
-Release:        19
+Release:        21
 Summary:        Settings daemon for the GNOME desktop
 Source:         %{_name}-%{version}.tar.bz2
 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.patch
@@ -133,6 +133,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu May 29 2008 federico@novell.com
+- Updated gnome-settings-daemon-randr-1.2.diff with the latest fixes from upstream.
 * Mon May 26 2008 vuntz@suse.de
 - Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to
   unbreak corrupted keymaps on automatic login. This is only a

++++++ gnome-settings-daemon-randr-1.2.diff ++++++
--- /var/tmp/diff_new_pack.R29323/_old	2008-05-31 12:20:43.000000000 +0200
+++ /var/tmp/diff_new_pack.R29323/_new	2008-05-31 12:20:43.000000000 +0200
@@ -1,22 +1,79 @@
 diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
-index 620d783..02d2764 100644
+index 620d783..baf8f97 100644
 --- a/plugins/xrandr/gsd-xrandr-manager.c
 +++ b/plugins/xrandr/gsd-xrandr-manager.c
-@@ -35,7 +35,10 @@
+@@ -44,6 +44,10 @@
+ #include "gnome-settings-profile.h"
+ #include "gsd-xrandr-manager.h"
+ 
++#ifndef HOST_NAME_MAX
++#define HOST_NAME_MAX   255
++#endif
++
+ 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);
+@@ -186,11 +190,7 @@ apply_settings (GsdXrandrManager *manager)
+         int          height;
+         int          rate;
+         int          rotation;
+-#ifdef HOST_NAME_MAX
+         char         hostname[HOST_NAME_MAX + 1];
+-#else
+-        char         hostname[256];
+-#endif
+         char        *specific_path;
+         char        *keys[3];
+         int          i;
+@@ -381,7 +381,7 @@ gsd_xrandr_manager_dispose (GObject *object)
+ static void
+ gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass)
+ {
+-        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
++        GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ 
+         object_class->get_property = gsd_xrandr_manager_get_property;
+         object_class->set_property = gsd_xrandr_manager_set_property;
+diff --git a/plugins/background/gsd-background-manager.c b/plugins/background/gsd-background-manager.c
+index cf5119d..774bc66 100644
+--- a/plugins/background/gsd-background-manager.c
++++ b/plugins/background/gsd-background-manager.c
+@@ -2,6 +2,7 @@
+  *
+  * Copyright © 2001 Ximian, Inc.
+  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
++ * Copyright 2007 Red Hat, Inc.
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
+index baf8f97..e1340c4 100644
+--- a/plugins/xrandr/gsd-xrandr-manager.c
++++ b/plugins/xrandr/gsd-xrandr-manager.c
+@@ -1,6 +1,7 @@
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+  *
+  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
++ * Copyright (C) 2007, 2008 Red Hat, Inc
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -35,7 +36,11 @@
  #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
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++
 +#include <libgnomeui/monitor-db.h>
 +#include <libgnomeui/randrwrap.h>
  
  #ifdef HAVE_RANDR
  #include <X11/extensions/Xrandr.h>
-@@ -44,6 +47,22 @@
- #include "gnome-settings-profile.h"
- #include "gsd-xrandr-manager.h"
+@@ -48,6 +53,22 @@
+ #define HOST_NAME_MAX   255
+ #endif
  
 +#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
 +
@@ -37,7 +94,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 +71,74 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
+@@ -56,248 +77,75 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
  
  static gpointer manager_object = NULL;
  
@@ -46,9 +103,7 @@
 -get_rotation (GConfClient *client,
 -              char        *display,
 -              int          screen)
-+static GdkAtom
-+gnome_randr_atom (void)
- {
+-{
 -        char   *key;
 -        int     val;
 -        GError *error;
@@ -61,10 +116,13 @@
 -        if (error == NULL) {
 -                return val;
 -        }
--
+ 
 -        g_error_free (error);
 -
 -        return 0;
++static GdkAtom
++gnome_randr_atom (void)
++{
 +        return gdk_atom_intern ("_GNOME_RANDR_ATOM", FALSE);
  }
  
@@ -220,11 +278,7 @@
 -        int          height;
 -        int          rate;
 -        int          rotation;
--#ifdef HOST_NAME_MAX
 -        char         hostname[HOST_NAME_MAX + 1];
--#else
--        char         hostname[256];
--#endif
 -        char        *specific_path;
 -        char        *keys[3];
 -        int          i;
@@ -315,10 +369,10 @@
 -                        XRRFreeScreenConfigInfo (config);
 -                }
 -        }
+-
+-        g_free (specific_path);
 +        GsdXrandrManager *manager = data;
  
--        g_free (specific_path);
--
 -        /* We need to make sure we process the screen resize event. */
 -        gdk_display_sync (display);
 -
@@ -340,7 +394,7 @@
  }
  
  gboolean
-@@ -306,8 +147,30 @@ gsd_xrandr_manager_start (GsdXrandrManager *manager,
+@@ -306,8 +154,30 @@ gsd_xrandr_manager_start (GsdXrandrManager *manager,
  {
          g_debug ("Starting xrandr manager");
  
@@ -373,7 +427,7 @@
          return TRUE;
  }
  
-@@ -315,6 +178,16 @@ void
+@@ -315,6 +185,16 @@ void
  gsd_xrandr_manager_stop (GsdXrandrManager *manager)
  {
          g_debug ("Stopping xrandr manager");
@@ -390,7 +444,7 @@
  }
  
  static void
-@@ -388,11 +261,22 @@ gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass)
+@@ -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;
@@ -413,7 +467,7 @@
  }
  
  static void
-@@ -405,6 +289,8 @@ gsd_xrandr_manager_finalize (GObject *object)
+@@ -405,6 +296,8 @@ gsd_xrandr_manager_finalize (GObject *object)
  
          xrandr_manager = GSD_XRANDR_MANAGER (object);
  


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)