diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-program-choosing.c | 13 |
3 files changed, 21 insertions, 7 deletions
@@ -1,5 +1,18 @@ 2005-02-06 Martin Wehner <martin.wehner@epost.de> + * libnautilus-private/nautilus-program-choosing.c: + (slowly_and_stupidly_obtain_timestamp), + (nautilus_launch_show_file), (nautilus_launch_application), + (nautilus_launch_desktop_file): + Use new gnome_desktop_item_set_launch_time() API. (#166334) + + * configure.in: + Require gnome-desktop 2.9.91 + + Patch from Elijah Newren <newren@gmail.com> + +2005-02-06 Martin Wehner <martin.wehner@epost.de> + * configure.in: Make libexif dependency optional again. (#165773) diff --git a/configure.in b/configure.in index 73dccbfac..0f6c36fa2 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ m4_define(bonobo_minver, 2.1.0) m4_define(eel_minver, 2.9.90) m4_define(esound_minver, 0.2.27) m4_define(glib_minver, 2.6.0) -m4_define(gnome_desktop_minver, 2.1.0) +m4_define(gnome_desktop_minver, 2.9.91) m4_define(gnome_minver, 2.1.1) m4_define(gnome_ui_minver, 2.6.0) m4_define(gnome_vfs_minver, 2.9.1) diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c index b47d08902..ab6d9dc89 100644 --- a/libnautilus-private/nautilus-program-choosing.c +++ b/libnautilus-private/nautilus-program-choosing.c @@ -366,14 +366,11 @@ add_startup_timeout (GdkScreen *screen, * this should not be needed. */ static Time -slowly_and_stupidly_obtain_timestamp (SnDisplay *display) +slowly_and_stupidly_obtain_timestamp (Display *xdisplay) { Window xwindow; - Display *xdisplay; XEvent event; - xdisplay = sn_display_get_x_display (display); - { XSetWindowAttributes attrs; Atom atom_name; @@ -511,7 +508,7 @@ void nautilus_launch_show_file (NautilusFile *file, char **old_envp; Time timestamp; - timestamp = slowly_and_stupidly_obtain_timestamp (sn_display); + timestamp = slowly_and_stupidly_obtain_timestamp (GDK_WINDOW_XDISPLAY (GTK_WIDGET (parent_window)->window)); binary_name = gnome_vfs_mime_application_get_binary_name (application); @@ -742,7 +739,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application, char **old_envp; Time timestamp; - timestamp = slowly_and_stupidly_obtain_timestamp (sn_display); + timestamp = slowly_and_stupidly_obtain_timestamp (GDK_WINDOW_XDISPLAY (GTK_WIDGET (parent_window)->window)); binary_name = gnome_vfs_mime_application_get_binary_name (application); @@ -858,6 +855,7 @@ nautilus_launch_desktop_file (GdkScreen *screen, const GList *p; int total, count; char **envp; + Time timestamp; /* strip the leading command specifier */ if (eel_str_has_prefix (desktop_file_uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER)) { @@ -947,6 +945,9 @@ nautilus_launch_desktop_file (GdkScreen *screen, } error = NULL; + + timestamp = slowly_and_stupidly_obtain_timestamp (GDK_WINDOW_XDISPLAY (GTK_WIDGET (parent_window)->window)); + gnome_desktop_item_set_launch_time (ditem, timestamp); gnome_desktop_item_launch_with_env (ditem, (GList *) parameter_uris, flags, envp, &error); |