summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2009-03-31 12:46:41 +0000
committerAlexander Larsson <alexl@src.gnome.org>2009-03-31 12:46:41 +0000
commit7a981dffd5c9eb56bc10c46548c0e6d0716b0249 (patch)
treedc47b71acc4569e522e1fa5a9da90bfeac2931e2
parent20ec5e6e12cca17e3fa8c82f3afc51187f241922 (diff)
downloadgvfs-7a981dffd5c9eb56bc10c46548c0e6d0716b0249.tar.gz
Make sure async callbacks are sent in mainloop.
2009-03-31 Alexander Larsson <alexl@redhat.com> * client/gdaemonmount.c: (g_daemon_mount_guess_content_type): * monitor/proxy/gproxymount.c: (g_proxy_mount_guess_content_type): Make sure async callbacks are sent in mainloop. svn path=/trunk/; revision=2355
-rw-r--r--ChangeLog8
-rw-r--r--client/gdaemonmount.c2
-rw-r--r--monitor/proxy/gproxymount.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e5e7411e..6b395cc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-03-31 Alexander Larsson <alexl@redhat.com>
+ * client/gdaemonmount.c:
+ (g_daemon_mount_guess_content_type):
+ * monitor/proxy/gproxymount.c:
+ (g_proxy_mount_guess_content_type):
+ Make sure async callbacks are sent in mainloop.
+
+2009-03-31 Alexander Larsson <alexl@redhat.com>
+
Bug 567635 – flickering context menu item
* monitor/proxy/gproxyshadowmount.c:
diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c
index 5c41c026..2169cd91 100644
--- a/client/gdaemonmount.c
+++ b/client/gdaemonmount.c
@@ -247,7 +247,7 @@ g_daemon_mount_guess_content_type (GMount *mount,
callback,
user_data,
NULL);
- g_simple_async_result_complete (simple);
+ g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
}
diff --git a/monitor/proxy/gproxymount.c b/monitor/proxy/gproxymount.c
index 18259f53..5b2a640f 100644
--- a/monitor/proxy/gproxymount.c
+++ b/monitor/proxy/gproxymount.c
@@ -614,7 +614,7 @@ g_proxy_mount_guess_content_type (GMount *mount,
callback,
user_data,
NULL);
- g_simple_async_result_complete (simple);
+ g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
}