diff options
| author | Frédéric Crozat <fcrozat@src.gnome.org> | 2005-05-02 13:44:35 +0000 |
|---|---|---|
| committer | Frédéric Crozat <fcrozat@src.gnome.org> | 2005-05-02 13:44:35 +0000 |
| commit | 091b6fcdd8e03797eee60711ba3c0fa330b11f27 (patch) | |
| tree | 5ebe4a48c5699efa7c71ff621ab1fa856a5d6fac | |
| parent | 409ecd6789b9c5ca3d532270b2b2fe0c83521ce3 (diff) | |
| download | nautilus-091b6fcdd8e03797eee60711ba3c0fa330b11f27.tar.gz | |
fix build when startup notification isn't installed.
* libnautilus-private/nautilus-program-choosing.c:
(nautilus_launch_desktop_file):
* src/nautilus-application.c:
(nautilus_application_present_spatial_window_with_selection),
(nautilus_application_create_navigation_window):
fix build when startup notification isn't installed.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-program-choosing.c | 4 | ||||
| -rw-r--r-- | src/nautilus-application.c | 12 |
3 files changed, 25 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2005-05-02 Frederic Crozat <fcrozat@mandriva.com> + + * libnautilus-private/nautilus-program-choosing.c: + (nautilus_launch_desktop_file): + * src/nautilus-application.c: + (nautilus_application_present_spatial_window_with_selection), + (nautilus_application_create_navigation_window): + fix build when startup notification isn't installed. + 2005-05-02 Alexander Larsson <alexl@redhat.com> * src/file-manager/nautilus-desktop-icon-view-ui.xml: diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c index ab6d9dc89..3f121312c 100644 --- a/libnautilus-private/nautilus-program-choosing.c +++ b/libnautilus-private/nautilus-program-choosing.c @@ -855,7 +855,9 @@ nautilus_launch_desktop_file (GdkScreen *screen, const GList *p; int total, count; char **envp; +#ifdef HAVE_STARTUP_NOTIFICATION Time timestamp; +#endif /* strip the leading command specifier */ if (eel_str_has_prefix (desktop_file_uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER)) { @@ -946,8 +948,10 @@ nautilus_launch_desktop_file (GdkScreen *screen, error = NULL; +#ifdef HAVE_STARTUP_NOTIFICATION timestamp = slowly_and_stupidly_obtain_timestamp (GDK_WINDOW_XDISPLAY (GTK_WIDGET (parent_window)->window)); gnome_desktop_item_set_launch_time (ditem, timestamp); +#endif gnome_desktop_item_launch_with_env (ditem, (GList *) parameter_uris, flags, envp, &error); diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 2b3903041..80011c87b 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -83,8 +83,10 @@ #include <libnautilus-private/nautilus-desktop-link-monitor.h> #include <libnautilus-private/nautilus-directory-private.h> #include <bonobo-activation/bonobo-activation.h> +#ifdef HAVE_STARTUP_NOTIFICATION #define SN_API_NOT_YET_FROZEN Yes_i_know_DO_IT #include <libsn/sn-launchee.h> +#endif /* Needed for the is_kdesktop_present check */ #include <gdk/gdkx.h> @@ -984,6 +986,8 @@ nautilus_application_present_spatial_window (NautilusApplication *application, screen); } +#ifdef HAVE_STARTUP_NOTIFICATION + static void sn_error_trap_push (SnDisplay *display, Display *xdisplay) @@ -1057,6 +1061,8 @@ end_startup_notification (GtkWidget *widget, sn_display_unref (sn_display); } +#endif + NautilusWindow * nautilus_application_present_spatial_window_with_selection (NautilusApplication *application, NautilusWindow *requesting_window, @@ -1083,8 +1089,10 @@ nautilus_application_present_spatial_window_with_selection (NautilusApplication } if (gnome_vfs_uris_match (existing_location, location)) { +#ifdef HAVE_STARTUP_NOTIFICATION end_startup_notification (GTK_WIDGET (existing_window), startup_id); +#endif gtk_window_present (GTK_WINDOW (existing_window)); if (new_selection) { @@ -1095,8 +1103,10 @@ nautilus_application_present_spatial_window_with_selection (NautilusApplication } window = create_window (application, NAUTILUS_TYPE_SPATIAL_WINDOW, startup_id, screen); +#ifdef HAVE_STARTUP_NOTIFICATION end_startup_notification (GTK_WIDGET (window), startup_id); +#endif if (requesting_window) { /* Center the window over the requesting window by default */ int orig_x, orig_y, orig_width, orig_height; @@ -1139,8 +1149,10 @@ nautilus_application_create_navigation_window (NautilusApplication *application, g_return_val_if_fail (NAUTILUS_IS_APPLICATION (application), NULL); window = create_window (application, NAUTILUS_TYPE_NAVIGATION_WINDOW, startup_id, screen); +#ifdef HAVE_STARTUP_NOTIFICATION end_startup_notification (GTK_WIDGET (window), startup_id); +#endif return window; } |