- Update to 2.21.1

- Switch from using n-c-b to 'gnome-eject' for ejcting cd's


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9895 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 12 insertions, 65 deletions

diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
index 5f5eb4bc1..ac875d14d 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
@@ -1,15 +1,15 @@
---- capplets/common/gnome-theme-info.c.orig	2007-08-27 04:09:06.000000000 -0400
-+++ capplets/common/gnome-theme-info.c	2007-09-20 15:24:56.000000000 -0400
-@@ -1845,7 +1845,7 @@ read_cursor_fonts (void)
+--- capplets/common/gnome-theme-info.c.orig	2007-10-30 18:58:26.000000000 -0400
++++ capplets/common/gnome-theme-info.c	2007-11-01 08:43:25.067405773 -0400
+@@ -661,7 +661,7 @@
      theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
      g_free (filename);
  
--    theme_info->name = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
+-    theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
 +    theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL);
-     theme_info->path = g_strdup (theme_info->name);
+     theme_info->name = g_strdup (theme_info->path);
  
      if (!strcmp (theme_info->path, cursor_font))
-@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_
+@@ -1922,7 +1922,7 @@
    gnome_vfs_uri_unref (top_theme_dir_uri);
  
    /* The weird /usr/share/icons */
@@ -17,4 +17,4 @@
 +  top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons");
    if (!gnome_vfs_uri_exists (top_theme_dir_uri))
      gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775);
-   result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
+   add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c
deleted file mode 100644
index 76c847540..000000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- gnome-settings-daemon/gnome-settings-keyboard-xkb.c.orig	2007-10-29 08:19:27.351818736 -0400
-+++ gnome-settings-daemon/gnome-settings-keyboard-xkb.c	2007-10-29 08:19:52.087524252 -0400
-@@ -35,7 +35,6 @@
- #include <string.h>
- #include <time.h>
- 
--#include <libgnomekbd/gkbd-config-registry.h>
- #include <libgnomekbd/gkbd-desktop-config.h>
- #include <libgnomekbd/gkbd-keyboard-config.h>
- 
-@@ -392,7 +391,6 @@
- void
- gnome_settings_keyboard_xkb_init (GConfClient * client)
- {
--	GObject *reg = NULL;
- #ifdef GSDKX
- 	xkl_set_debug_level (200);
- 	logfile = fopen ("/tmp/gsdkx.log", "a");
-@@ -425,8 +423,6 @@
- 					 XKLL_MANAGE_LAYOUTS |
- 					 XKLL_MANAGE_WINDOW_STATES);
- 
--		reg =
--		    g_object_new (gkbd_config_registry_get_type (), NULL);
- 	}
- }
- 
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
index 89ab3f5f5..658f19839 100644
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -1,41 +1,15 @@
 --- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	2007-09-18 05:32:43.000000000 -0400
-+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	2007-10-31 16:01:14.953632933 -0400
-@@ -31,6 +31,7 @@
- #include <glib/gi18n.h>
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
-+#include <nautilus-burn.h>
- 
- #include "eggaccelerators.h"
- 
-@@ -609,9 +610,24 @@
- 					   GCONF_MISC_DIR "/eject_command", NULL);
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	2007-11-01 08:29:46.987143617 -0400
+@@ -610,7 +610,7 @@
  	if ((command != NULL) && (strcmp (command, "") != 0))
  		execute (acme, command, FALSE, FALSE);
--	else
+ 	else
 -		execute (acme, "eject -T", FALSE, FALSE);
-+	else {
-+		g_type_init ();
-+		nautilus_burn_init ();
-+		GList *drives, *drivelist;
-+		NautilusBurnDriveMonitor *monitor;
-+
-+		monitor = nautilus_burn_get_drive_monitor ();
-+		drives = nautilus_burn_drive_monitor_get_drives (monitor);
-+
-+		for (drivelist = drives; drivelist != NULL; drivelist = drivelist->next) {
-+			NautilusBurnDrive *drive;
-+			drive = drivelist->data;
++		execute (acme, "gnome-eject -b --device=%%CDROM%%", FALSE, FALSE);
  
-+			nautilus_burn_drive_eject (drive);
-+		}
-+        	nautilus_burn_shutdown ();
-+	}
-+		
  	g_free (command);
  }
- 
-@@ -708,7 +724,7 @@
+@@ -708,7 +708,7 @@
  		do_mail_action (acme);
  		break;
  	case SLEEP_KEY: