--- a/patches/nautilus-09-trusted-extensions.diff Tue Apr 07 10:48:30 2009 +0000
+++ b/patches/nautilus-09-trusted-extensions.diff Tue Apr 07 12:59:04 2009 +0000
@@ -1,7 +1,7 @@
diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/Makefile.am naut.new/libnautilus-private/Makefile.am
---- naut.orig/libnautilus-private/Makefile.am 2008-07-24 04:04:33.158109000 +0100
-+++ naut.new/libnautilus-private/Makefile.am 2008-07-24 04:04:45.104711000 +0100
-@@ -173,6 +173,8 @@
+--- naut.orig/libnautilus-private/Makefile.am 2009-03-25 15:48:56.404881573 +0000
++++ naut.new/libnautilus-private/Makefile.am 2009-03-25 15:50:31.163076538 +0000
+@@ -174,6 +174,8 @@
nautilus-trash-monitor.h \
nautilus-tree-view-drag-dest.c \
nautilus-tree-view-drag-dest.h \
@@ -11,8 +11,8 @@
nautilus-ui-utilities.h \
nautilus-undo-manager.c \
diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-column-utilities.c naut.new/libnautilus-private/nautilus-column-utilities.c
---- naut.orig/libnautilus-private/nautilus-column-utilities.c 2008-07-24 04:04:33.174273000 +0100
-+++ naut.new/libnautilus-private/nautilus-column-utilities.c 2008-07-24 04:04:45.129580000 +0100
+--- naut.orig/libnautilus-private/nautilus-column-utilities.c 2009-03-25 15:48:56.405155840 +0000
++++ naut.new/libnautilus-private/nautilus-column-utilities.c 2009-03-25 15:50:31.163460018 +0000
@@ -113,6 +113,7 @@
"label", _("MIME Type"),
"description", _("The mime type of the file."),
@@ -29,9 +29,36 @@
return columns;
}
+diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-module.c naut.new/libnautilus-private/nautilus-module.c
+--- naut.orig/libnautilus-private/nautilus-module.c 2009-03-25 15:48:56.426647854 +0000
++++ naut.new/libnautilus-private/nautilus-module.c 2009-03-31 11:05:33.382333482 +0100
+@@ -23,6 +23,7 @@
+
+ #include <config.h>
+ #include "nautilus-module.h"
++#include "nautilus-tsol-extensions.h"
+
+ #include <eel/eel-gtk-macros.h>
+ #include <eel/eel-debug.h>
+@@ -191,6 +192,15 @@
+ const char *name;
+
+ while ((name = g_dir_read_name (dir))) {
++ /* Brasero extension does not currently work with
++ labeled zones (no dbus system bus)*/
++ if (nautilus_tsol_multi_label_session () &&
++ getzoneid () != 0) {
++ if (g_str_has_prefix (name,
++ "libnautilus-brasero")) {
++ continue;
++ }
++ }
+ if (g_str_has_suffix (name, "." G_MODULE_SUFFIX)) {
+ char *filename;
+
diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-tsol-extensions.c naut.new/libnautilus-private/nautilus-tsol-extensions.c
--- naut.orig/libnautilus-private/nautilus-tsol-extensions.c 1970-01-01 01:00:00.000000000 +0100
-+++ naut.new/libnautilus-private/nautilus-tsol-extensions.c 2008-07-24 04:04:45.131769000 +0100
++++ naut.new/libnautilus-private/nautilus-tsol-extensions.c 2009-03-25 15:50:31.163916608 +0000
@@ -0,0 +1,303 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
@@ -338,7 +365,7 @@
+}
diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-tsol-extensions.h naut.new/libnautilus-private/nautilus-tsol-extensions.h
--- naut.orig/libnautilus-private/nautilus-tsol-extensions.h 1970-01-01 01:00:00.000000000 +0100
-+++ naut.new/libnautilus-private/nautilus-tsol-extensions.h 2008-07-24 04:04:45.133571000 +0100
++++ naut.new/libnautilus-private/nautilus-tsol-extensions.h 2009-03-25 15:50:31.164171360 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
@@ -361,9 +388,9 @@
+
+#endif
diff -urN -x '*.orig' -x '*.rej' naut.orig/src/file-manager/fm-directory-view.c naut.new/src/file-manager/fm-directory-view.c
---- naut.orig/src/file-manager/fm-directory-view.c 2008-07-24 04:04:32.048046000 +0100
-+++ naut.new/src/file-manager/fm-directory-view.c 2008-07-24 04:06:19.171777000 +0100
-@@ -82,6 +82,7 @@
+--- naut.orig/src/file-manager/fm-directory-view.c 2009-03-25 15:48:56.555869222 +0000
++++ naut.new/src/file-manager/fm-directory-view.c 2009-03-25 15:50:31.168489932 +0000
+@@ -79,6 +79,7 @@
#include <libnautilus-private/nautilus-trash-monitor.h>
#include <libnautilus-private/nautilus-ui-utilities.h>
#include <libnautilus-private/nautilus-signaller.h>
@@ -371,7 +398,7 @@
#include <libnautilus-private/nautilus-autorun.h>
#include <libnautilus-private/nautilus-icon-names.h>
-@@ -5559,7 +5560,7 @@
+@@ -5566,7 +5567,7 @@
gsize *len)
{
GString *uris;
@@ -380,7 +407,7 @@
GFile *f;
guint i;
-@@ -5567,6 +5568,12 @@
+@@ -5574,6 +5575,12 @@
uris = g_string_new (NULL);
} else {
uris = g_string_new (info->cut ? "cut" : "copy");
@@ -393,7 +420,7 @@
}
for (i = 0; i < info->n_file_uris; ++i) {
-@@ -5756,6 +5763,7 @@
+@@ -5763,6 +5770,7 @@
{
gboolean cut;
GList *item_uris;
@@ -401,7 +428,7 @@
cut = FALSE;
item_uris = nautilus_clipboard_get_uri_list_from_selection_data (selection_data, &cut,
-@@ -5765,10 +5773,12 @@
+@@ -5772,10 +5780,12 @@
nautilus_window_slot_info_set_status (view->details->slot,
_("There is nothing on the clipboard to paste."));
} else {
@@ -415,7 +442,7 @@
/* If items are cut then remove from clipboard */
if (cut) {
-@@ -5838,6 +5848,12 @@
+@@ -5845,6 +5855,12 @@
FMDirectoryView *view;
view = FM_DIRECTORY_VIEW (callback_data);
@@ -428,8 +455,9 @@
g_object_ref (view);
gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
---- /usr/tmp/nautilus-2.25.2/src/file-manager/fm-properties-window.c 2008-10-07 20:38:18.000000000 +0100
-+++ nautilus-2.25.2/src/file-manager/fm-properties-window.c 2009-01-02 09:24:26.558807000 +0000
+diff -urN -x '*.orig' -x '*.rej' naut.orig/src/file-manager/fm-properties-window.c naut.new/src/file-manager/fm-properties-window.c
+--- naut.orig/src/file-manager/fm-properties-window.c 2009-03-25 15:48:56.554763663 +0000
++++ naut.new/src/file-manager/fm-properties-window.c 2009-03-25 15:50:31.171186528 +0000
@@ -62,6 +62,8 @@
#include <sys/stat.h>
#include <cairo.h>
@@ -439,7 +467,7 @@
#if HAVE_SYS_STATVFS_H
#include <sys/statvfs.h>
#endif
-@@ -4786,7 +4788,9 @@
+@@ -4784,7 +4786,9 @@
{
GtkWidget *vbox, *button, *hbox;
GtkTable *page_table;
@@ -449,7 +477,7 @@
GList *file_list;
guint last_row;
-@@ -4832,6 +4836,17 @@
+@@ -4830,6 +4834,17 @@
"selinux_context", INCONSISTENT_STATE_STRING,
FALSE);
#endif
@@ -467,9 +495,10 @@
append_title_value_pair
(window, page_table, _("Last changed:"),
"date_permissions", INCONSISTENT_STATE_STRING,
---- /usr/tmp/nautilus-2.25.2/src/nautilus-application.c 2008-12-15 15:54:24.000000000 +0000
-+++ nautilus-2.25.2/src/nautilus-application.c 2009-01-02 09:28:46.538240000 +0000
-@@ -88,6 +88,9 @@
+diff -urN -x '*.orig' -x '*.rej' naut.orig/src/nautilus-application.c naut.new/src/nautilus-application.c
+--- naut.orig/src/nautilus-application.c 2009-03-25 15:48:56.565159696 +0000
++++ naut.new/src/nautilus-application.c 2009-03-25 15:50:31.172417300 +0000
+@@ -90,6 +90,9 @@
#include <gdk/gdkx.h>
#include <X11/Xlib.h>
@@ -479,7 +508,7 @@
/* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */
#define APPLICATION_WINDOW_MIN_WIDTH 300
#define APPLICATION_WINDOW_MIN_HEIGHT 100
-@@ -707,12 +710,12 @@
+@@ -897,12 +900,12 @@
static GtkWidget *
get_desktop_manager_selection (GdkDisplay *display, int screen)
{
@@ -494,8 +523,9 @@
selection_atom = gdk_atom_intern (selection_name, FALSE);
selection_owner = XGetSelectionOwner (GDK_DISPLAY_XDISPLAY (display),
---- /usr/tmp/nautilus-2.25.2/src/nautilus-desktop-window.c 2008-10-06 10:54:32.000000000 +0100
-+++ nautilus-2.25.2/src/nautilus-desktop-window.c 2009-01-02 09:32:49.333749000 +0000
+diff -urN -x '*.orig' -x '*.rej' naut.orig/src/nautilus-desktop-window.c naut.new/src/nautilus-desktop-window.c
+--- naut.orig/src/nautilus-desktop-window.c 2009-03-25 15:48:56.559673968 +0000
++++ naut.new/src/nautilus-desktop-window.c 2009-03-25 15:50:31.172816870 +0000
@@ -36,6 +36,10 @@
#include <libnautilus-private/nautilus-icon-names.h>
#include <gio/gio.h>
@@ -529,9 +559,9 @@
* Note that nautilus_desktop_window_init is too early to do this.
*/
diff -urN -x '*.orig' -x '*.rej' naut.orig/src/nautilus-window-manage-views.c naut.new/src/nautilus-window-manage-views.c
---- naut.orig/src/nautilus-window-manage-views.c 2008-07-24 04:04:31.989152000 +0100
-+++ naut.new/src/nautilus-window-manage-views.c 2008-07-24 04:06:51.380901000 +0100
-@@ -68,6 +68,7 @@
+--- naut.orig/src/nautilus-window-manage-views.c 2009-03-25 15:48:56.570198528 +0000
++++ naut.new/src/nautilus-window-manage-views.c 2009-03-25 15:50:31.173977404 +0000
+@@ -66,6 +66,7 @@
#include <libnautilus-private/nautilus-window-info.h>
#include <libnautilus-private/nautilus-window-slot-info.h>
#include <libnautilus-private/nautilus-autorun.h>
@@ -539,7 +569,7 @@
/* FIXME bugzilla.gnome.org 41243:
* We should use inheritance instead of these special cases
-@@ -1421,6 +1422,12 @@
+@@ -1405,6 +1406,12 @@
g_object_unref (location_copy);
}