[mate-file-manager/f17] Drop caja_remove_mate-bg-crossfade patch as it was causing crash

[leigh123linux]

commit bbdc76d79e49c67c8b3bde1fd201526cdb71432a
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 18 17:35:25 2012 +0100

    Drop caja_remove_mate-bg-crossfade patch as it was causing crash

 no_session_delay.patch |   10 ++++
 signal_curtain.patch   |  137 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 0 deletions(-)
---
diff --git a/no_session_delay.patch b/no_session_delay.patch
new file mode 100644
index 0000000..e89589f
--- /dev/null
+++ b/no_session_delay.patch
@@ -0,0 +1,10 @@
+--- a/data/caja.desktop.in.in
++++ b/data/caja.desktop.in.in
+@@ -11,7 +11,6 @@ X-MATE-Bugzilla-Bugzilla=MATE
+ X-MATE-Bugzilla-Product=caja
+ X-MATE-Bugzilla-Component=general
+ X-MATE-Bugzilla-Version=@VERSION@
+-X-MATE-Autostart-Phase=Desktop
+ X-MATE-Autostart-Notify=true
+ X-MATE-AutoRestart=true
+ X-MATE-Provides=filemanager
diff --git a/signal_curtain.patch b/signal_curtain.patch
new file mode 100644
index 0000000..625d86d
--- /dev/null
+++ b/signal_curtain.patch
@@ -0,0 +1,137 @@
+--- a/configure.in
++++ b/configure.in
+@@ -424,7 +424,7 @@ AC_SUBST(LIBCAJA_EXTENSION_LIBS)
+ 
+ dnl core caja
+ PKG_CHECK_MODULES(GMODULE, gmodule-2.0, [GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
+-CORE_MODULES="glib-2.0 $GMODULE_ADD mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 gail mateconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES gtk+-$GTK_API_VERSION"
++CORE_MODULES="glib-2.0 $GMODULE_ADD mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 dbus-glib-1 gail mateconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES gtk+-$GTK_API_VERSION"
+ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
+ AC_SUBST(CORE_CFLAGS)
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+--- a/src/file-manager/fm-desktop-icon-view.c
++++ b/src/file-manager/fm-desktop-icon-view.c
+@@ -42,6 +42,8 @@
+ #include <fcntl.h>
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
++#include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-bindings.h>
+ #include <libcaja-private/caja-desktop-icon-file.h>
+ #include <libcaja-private/caja-directory-background.h>
+ #include <libcaja-private/caja-directory-notify.h>
+@@ -539,6 +541,41 @@ fm_desktop_icon_view_update_icon_contain
+ }
+ 
+ static void
++end_loading (FMDesktopIconView *desktop_icon_view, gboolean all_files_seen)
++{
++	DBusGConnection *connection;
++	DBusGProxy      *proxy;
++	GError          *error = NULL;
++
++	connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++
++	if (error) {
++		g_warning ("%s", error->message);
++		g_error_free(error);
++		return;
++	}
++
++	/* Get the current session object */
++	proxy = dbus_g_proxy_new_for_name (connection,
++					   "com.ubuntu.BootCurtain",
++					   "/com/ubuntu/BootCurtain",
++					   "com.ubuntu.BootCurtain");
++
++	if (!proxy) {
++		g_warning ("Unable to connect to BootCurtain");
++		dbus_g_connection_unref (connection);
++		return;
++	}
++
++	dbus_g_proxy_call_no_reply (proxy,
++				    "SignalLoaded",
++				    G_TYPE_STRING, "caja",
++				    G_TYPE_INVALID);
++
++	g_object_unref (proxy);
++}
++
++static void
+ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
+ {
+     CajaIconContainer *icon_container;
+@@ -622,6 +659,8 @@ fm_desktop_icon_view_init (FMDesktopIcon
+     default_zoom_level_changed (desktop_icon_view);
+     fm_desktop_icon_view_update_icon_container_fonts (desktop_icon_view);
+ 
++    g_signal_connect (desktop_icon_view, "end_loading", G_CALLBACK (end_loading), NULL);
++
+     eel_preferences_add_callback (CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE,
+                                   lockdown_disable_command_line_changed_callback,
+                                   desktop_icon_view);
+--- a/src/caja-main.c
++++ b/src/caja-main.c
+@@ -42,6 +42,8 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
++#include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-bindings.h>
+ #include <gio/gdesktopappinfo.h>
+ #include <libcaja-private/caja-debug-log.h>
+ #include <libcaja-private/caja-global-preferences.h>
+@@ -310,6 +310,41 @@ setup_debug_log (void)
+     setup_debug_log_glog ();
+ }
+ 
++static void
++setup_boot_curtain (void)
++{
++	DBusGConnection *connection;
++	DBusGProxy      *proxy;
++	GError          *error = NULL;
++
++	connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++
++	if (error) {
++		g_warning ("%s", error->message);
++		g_error_free(error);
++		return;
++	}
++
++	/* Get the current session object */
++	proxy = dbus_g_proxy_new_for_name (connection,
++					   "com.ubuntu.BootCurtain",
++					   "/com/ubuntu/BootCurtain",
++					   "com.ubuntu.BootCurtain");
++
++	if (!proxy) {
++		g_warning ("Unable to connect to BootCurtain");
++		dbus_g_connection_unref (connection);
++		return;
++	}
++
++	dbus_g_proxy_call_no_reply (proxy,
++				    "AddWaitSignal",
++				    G_TYPE_STRING, "caja",
++				    G_TYPE_INVALID);
++
++	g_object_unref (proxy);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -493,6 +528,10 @@ main (int argc, char *argv[])
+      */
+     caja_global_preferences_init ();
+ 
++	if (eel_preferences_get_boolean (CAJA_PREFERENCES_SHOW_DESKTOP)) {
++		setup_boot_curtain ();
++	}
++
+     /* exit_with_last_window being FALSE, caja can run without window. */
+     exit_with_last_window = eel_preferences_get_boolean (CAJA_PREFERENCES_EXIT_WITH_LAST_WINDOW);
+