pool/gnome-settings-daemon
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=11

Browse Source
This commit is contained in:
OBS User unknown 2008-05-31 10:21:02 +00:00 committed by Git OBS Bridge
parent 4a0e390f54
commit 7b226219f0
3 changed files with 83 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
gnome-settings-daemon-randr-1.2.diff
View File

@ -1,22 +1,79 @@
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c 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 --- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/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/gdk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
-#include <gconf/gconf-client.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/monitor-db.h>
+#include <libgnomeui/randrwrap.h> +#include <libgnomeui/randrwrap.h>
#ifdef HAVE_RANDR #ifdef HAVE_RANDR
#include <X11/extensions/Xrandr.h> #include <X11/extensions/Xrandr.h>
@@ -44,6 +47,22 @@ @@ -48,6 +53,22 @@
#include "gnome-settings-profile.h" #define HOST_NAME_MAX 255
#include "gsd-xrandr-manager.h" #endif
+#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate)) +#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
+ +
@ -37,7 +94,7 @@ index 620d783..02d2764 100644
static void gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass); static void gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass);
static void gsd_xrandr_manager_init (GsdXrandrManager *xrandr_manager); static void gsd_xrandr_manager_init (GsdXrandrManager *xrandr_manager);
static void gsd_xrandr_manager_finalize (GObject *object); 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; static gpointer manager_object = NULL;
@ -46,9 +103,7 @@ index 620d783..02d2764 100644
-get_rotation (GConfClient *client, -get_rotation (GConfClient *client,
- char *display, - char *display,
- int screen) - int screen)
+static GdkAtom -{
+gnome_randr_atom (void)
{
- char *key; - char *key;
- int val; - int val;
- GError *error; - GError *error;
@ -61,10 +116,13 @@ index 620d783..02d2764 100644
- if (error == NULL) { - if (error == NULL) {
- return val; - return val;
- } - }
-
- g_error_free (error); - g_error_free (error);
- -
- return 0; - return 0;
+static GdkAtom
+gnome_randr_atom (void)
+{
+ return gdk_atom_intern ("_GNOME_RANDR_ATOM", FALSE); + return gdk_atom_intern ("_GNOME_RANDR_ATOM", FALSE);
} }
@ -220,11 +278,7 @@ index 620d783..02d2764 100644
- int height; - int height;
- int rate; - int rate;
- int rotation; - int rotation;
-#ifdef HOST_NAME_MAX
- char hostname[HOST_NAME_MAX + 1]; - char hostname[HOST_NAME_MAX + 1];
-#else
- char hostname[256];
-#endif
- char *specific_path; - char *specific_path;
- char *keys[3]; - char *keys[3];
- int i; - int i;
@ -315,10 +369,10 @@ index 620d783..02d2764 100644
- XRRFreeScreenConfigInfo (config); - XRRFreeScreenConfigInfo (config);
- } - }
- } - }
-
- g_free (specific_path);
+ GsdXrandrManager *manager = data; + GsdXrandrManager *manager = data;
- g_free (specific_path);
-
- /* We need to make sure we process the screen resize event. */ - /* We need to make sure we process the screen resize event. */
- gdk_display_sync (display); - gdk_display_sync (display);
- -
@ -340,7 +394,7 @@ index 620d783..02d2764 100644
} }
gboolean 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"); g_debug ("Starting xrandr manager");
@ -373,7 +427,7 @@ index 620d783..02d2764 100644
return TRUE; return TRUE;
} }
@@ -315,6 +178,16 @@ void @@ -315,6 +185,16 @@ void
gsd_xrandr_manager_stop (GsdXrandrManager *manager) gsd_xrandr_manager_stop (GsdXrandrManager *manager)
{ {
g_debug ("Stopping xrandr manager"); g_debug ("Stopping xrandr manager");
@ -390,7 +444,7 @@ index 620d783..02d2764 100644
} }
static void 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->constructor = gsd_xrandr_manager_constructor;
object_class->dispose = gsd_xrandr_manager_dispose; object_class->dispose = gsd_xrandr_manager_dispose;
object_class->finalize = gsd_xrandr_manager_finalize; object_class->finalize = gsd_xrandr_manager_finalize;
@ -413,7 +467,7 @@ index 620d783..02d2764 100644
} }
static void 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); xrandr_manager = GSD_XRANDR_MANAGER (object);

5
gnome-settings-daemon.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 26 17:10:43 CEST 2008 - vuntz@suse.de Mon May 26 17:10:43 CEST 2008 - vuntz@suse.de

4
gnome-settings-daemon.spec
View File

@ -17,7 +17,7 @@ BuildRequires: fdupes gnome-common gnome-desktop-devel gnome-patch-translation
License: GPL v2 or later License: GPL v2 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.22.1 Version: 2.22.1
Release: 19 Release: 21
Summary: Settings daemon for the GNOME desktop Summary: Settings daemon for the GNOME desktop
Source: %{_name}-%{version}.tar.bz2 Source: %{_name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.patch # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.patch
@ -133,6 +133,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %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 * Mon May 26 2008 vuntz@suse.de
- Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to - Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to
unbreak corrupted keymaps on automatic login. This is only a unbreak corrupted keymaps on automatic login. This is only a