summaryrefslogtreecommitdiff
path: root/sysutils/gnome-settings-daemon/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/gnome-settings-daemon/files')
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c10
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c21
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c35
3 files changed, 10 insertions, 56 deletions
diff --git a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c b/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c
deleted file mode 100644
index 6fce0da1831a..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/typing-break/gsd-typing-break-manager.c.orig 2008-01-14 01:20:09.000000000 +0100
-+++ plugins/typing-break/gsd-typing-break-manager.c 2008-01-14 01:20:37.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/signal.h>
-
- #include <locale.h>
-
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
deleted file mode 100644
index 8820c1482a96..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
index 1db1bb16efe8..73931511df77 100644
--- 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
@@ -1,26 +1,11 @@
---- plugins/media-keys/gsd-media-keys-manager.c.orig 2008-01-29 15:58:30.000000000 -0600
-+++ plugins/media-keys/gsd-media-keys-manager.c 2008-01-29 16:00:55.000000000 -0600
-@@ -667,7 +667,11 @@
- if ((command != NULL) && (strcmp (command, "") != 0)) {
- execute (manager, command, FALSE, FALSE);
- } else {
-+#if __FreeBSD__
-+ execute (manager, "cdcontrol eject", FALSE, FALSE);
-+#else
- execute (manager, "eject -T", FALSE, FALSE);
-+#endif
- }
+--- 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 @@
- g_free (command);
-@@ -869,7 +873,11 @@
- do_mail_action (manager);
- break;
- case SLEEP_KEY:
-+#if __FreeBSD__
-+ do_sleep_action ("zzz", "xset dpms force off");
-+#else
- do_sleep_action ("apm", "xset dpms force off");
-+#endif
- break;
- case SCREENSAVER_KEY:
- if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) {
+ #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