From 10e1b28eb8d8944fdc5c021d32461f990fb646ef Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Fri, 27 Feb 2009 19:16:48 +0000
Subject: Update to 2.25.90.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11937 df743ca5-7f9a-e211-a948-0013205c9059
---
 ...atch-plugins_background_gsd-background-manager.c | 21 +++++++++++++++++++++
 ...atch-plugins_media-keys_gsd-media-keys-manager.c | 11 +++++++++++
 .../files/patch-plugins_sound_gst-sound-manager.c   | 10 ++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c
 create mode 100644 sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
 create mode 100644 sysutils/gnome-settings-daemon/files/patch-plugins_sound_gst-sound-manager.c

(limited to 'sysutils/gnome-settings-daemon/files')

diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c
new file mode 100644
index 000000000..8820c1482
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c
@@ -0,0 +1,21 @@
+--- plugins/background/gsd-background-manager.c.orig	2008-11-03 13:25:29.000000000 -0600
++++ plugins/background/gsd-background-manager.c	2008-11-03 13:28:16.000000000 -0600
+@@ -160,6 +160,18 @@
+         GdkDisplay *display;
+         int         n_screens;
+         int         i;
++        GConfClient *client;
++        gboolean    enabled;
++
++        client = gconf_client_get_default ();
++
++        enabled = gconf_client_get_bool (client,
++                "/desktop/gnome/background/draw_background",
++                NULL);
++        g_object_unref (client);
++
++        if (!enabled)
++                return FALSE;
+ 
+         if (nautilus_is_running ()) {
+                 return;
diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
new file mode 100644
index 000000000..73931511d
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
@@ -0,0 +1,11 @@
+--- plugins/media-keys/gsd-media-keys-manager.c.orig	2009-02-04 16:33:14.000000000 -0500
++++ plugins/media-keys/gsd-media-keys-manager.c	2009-02-27 14:05:26.000000000 -0500
+@@ -64,6 +64,8 @@
+ 
+ #if defined(__OpenBSD__)
+ # define EJECT_COMMAND "eject -t /dev/cd0"
++#elif defined(__FreeBSD__)
++# define EJECT_COMMAND "cdcontrol eject"
+ #else
+ # define EJECT_COMMAND "eject -T"
+ #endif
diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_sound_gst-sound-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_sound_gst-sound-manager.c
new file mode 100644
index 000000000..cc0baf6fd
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-plugins_sound_gst-sound-manager.c
@@ -0,0 +1,10 @@
+--- plugins/sound/gsd-sound-manager.c.orig	2008-04-07 10:04:58.426471043 -0400
++++ plugins/sound/gsd-sound-manager.c	2008-04-07 10:05:10.592326201 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
-- 
cgit v1.2.3