Sun Feb 10 01:12:35 PST 2013

4 files changed, 0 insertions, 111 deletions

diff --git a/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch b/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch
deleted file mode 100644
index 9369c87bd..000000000
--- a/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ca7743a63721c3dd1c166006539e356412466dcc Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Sun, 23 Sep 2012 18:51:32 +0000
-Subject: proxy: don't emit connected/added signals at object creation
-
-It's unnecessary to emit those signals when the object is created, and
-it can cause weird side-effects if applications e.g. play a sound on
-signal emission.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=684677
----
-diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
-index 1af6c34..37fc788 100644
---- a/monitor/proxy/gproxyvolumemonitor.c
-+++ b/monitor/proxy/gproxyvolumemonitor.c
-@@ -955,6 +955,7 @@ g_proxy_volume_monitor_constructor (GType                  type,
-   GObjectClass *parent_class;
-   GError *error;
-   const char *dbus_name;
-+  gchar *name_owner;
- 
-   G_LOCK (proxy_vm);
- 
-@@ -1018,7 +1019,12 @@ g_proxy_volume_monitor_constructor (GType                  type,
-   /* listen to when the owner of the service appears/disappears */
-   g_signal_connect (monitor->proxy, "notify::g-name-owner", G_CALLBACK (name_owner_changed), monitor);
-   /* initially seed drives/volumes/mounts if we have an owner */
--  name_owner_changed (G_OBJECT (monitor->proxy), NULL, monitor);
-+  name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (monitor->proxy));
-+  if (name_owner != NULL)
-+    {
-+      seed_monitor (monitor);
-+      g_free (name_owner);
-+    }
- 
-   g_hash_table_insert (the_volume_monitors, (gpointer) type, object);
- 
---
-cgit v0.9.0.2
diff --git a/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch b/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
deleted file mode 100644
index 2d3bcb6c4..000000000
--- a/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4a0915c25815647c165e7ca6047f3da84ece04ea Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Mon, 22 Oct 2012 13:07:04 +0000
-Subject: gdaemonmount: Check for a NULL GMountOperation when unmounting
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686637
----
-diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c
-index 53f22b5..ca77648 100644
---- a/client/gdaemonmount.c
-+++ b/client/gdaemonmount.c
-@@ -330,8 +330,9 @@ g_daemon_mount_unmount_with_operation (GMount *mount,
-   data = g_new0 (AsyncProxyCreate, 1);
-   data->mount = g_object_ref (mount);
-   data->mount_info = daemon_mount->mount_info;
--  data->mount_operation = g_object_ref (mount_operation);
-   data->flags = flags;
-+  if (mount_operation)
-+    data->mount_operation = g_object_ref (mount_operation);
-   if (cancellable)
-     data->cancellable = g_object_ref (cancellable);
- 
---
-cgit v0.9.0.2
diff --git a/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
deleted file mode 100644
index e56a46ac6..000000000
--- a/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5265dff7b56d892917640367414cf5d3f5e7ddb7 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Thu, 01 Nov 2012 13:37:37 +0000
-Subject: proxy volume monitor: Don't disable exit_on_close on session bus
-
-We're on shared session bus, let's exit when connection closes
-(usually tied to running desktop session).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687074
-(cherry picked from commit f70800d655ca6b222625cd72af820f17404bdb4d)
----
-diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
-index 1af6c34..e0d17b7 100644
---- a/monitor/proxy/gproxyvolumemonitor.c
-+++ b/monitor/proxy/gproxyvolumemonitor.c
-@@ -1418,7 +1418,6 @@ g_proxy_volume_monitor_setup_session_bus_connection (void)
-       g_error_free (error);
-       goto out;
-     }
--  g_dbus_connection_set_exit_on_close (the_session_bus, FALSE);
- 
-   the_volume_monitors = g_hash_table_new (g_direct_hash, g_direct_equal);
- 
---
-cgit v0.9.0.2
diff --git a/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch
deleted file mode 100644
index 1a09ef7e6..000000000
--- a/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5dfdaf9a18971bf5504a0d3fe00f747a853ee800 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Thu, 01 Nov 2012 13:46:10 +0000
-Subject: proxy volume monitor: Don't force-close the session bus
-
-Simple fix to prevent bus closing on GIO module unload.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687074
----
-diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
-index e0d17b7..df99935 100644
---- a/monitor/proxy/gproxyvolumemonitor.c
-+++ b/monitor/proxy/gproxyvolumemonitor.c
-@@ -1435,7 +1435,6 @@ g_proxy_volume_monitor_teardown_session_bus_connection (void)
-   G_LOCK (proxy_vm);
-   if (the_session_bus != NULL)
-     {
--      g_dbus_connection_close_sync (the_session_bus, NULL, NULL);
-       g_object_unref (the_session_bus);
-       the_session_bus = NULL;
- 
---
-cgit v0.9.0.2