diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2005-08-26 04:46:08 (GMT) |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2005-08-26 04:46:08 (GMT) |
| commit | 06001de7e17bdccc2197b9f690269e6f8328e521 (patch) | |
| tree | a91148da4291405a80e914a274cbc691179f2d95 | |
| parent | 08f59cdd977b86d17d0a9c70a56b2bfd7f6741a2 (diff) | |
Last minute GTK-2.6 fixes. Release 0.4.0
Fri Aug 26 00:45:09 2005 Jonathan Blandford <jrb@redhat.com>
* shell/main.c:
* shell/ev-application.c: Last minute GTK-2.6 fixes.
* NEWS: Release 0.4.0
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | shell/ev-application.c | 12 | ||||
| -rw-r--r-- | shell/main.c | 4 |
3 files changed, 20 insertions, 3 deletions
@@ -1,8 +1,13 @@ +Fri Aug 26 00:45:09 2005 Jonathan Blandford <jrb@redhat.com> + + * shell/main.c: + * shell/ev-application.c: Last minute GTK-2.6 fixes. + * NEWS: Release 0.4.0 + Thu Aug 25 23:40:23 2005 Jonathan Blandford <jrb@redhat.com> * configure.ac: catch another gtk+-2.8ism * shell/main.c: Make work with gtk+-2.6 - * NEWS: Release 0.4.0 2005-08-25 Ryan Lortie <desrt@desrt.ca> diff --git a/shell/ev-application.c b/shell/ev-application.c index d9b5ab0..2b47629 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -192,9 +192,12 @@ ev_application_open_uri (EvApplication *application, new_window = ev_application_get_uri_window (application, uri); if (new_window != NULL) { +#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); - +#else + gtk_window_present (GTK_WINDOW (new_window)); +#endif return TRUE; } @@ -207,7 +210,12 @@ ev_application_open_uri (EvApplication *application, ev_window_open_uri (new_window, uri); - gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); +#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME + gtk_window_present_with_time (GTK_WINDOW (new_window), + timestamp); +#else + gtk_window_present (GTK_WINDOW (new_window)); +#endif if (page_label != NULL) { ev_window_open_page_label (new_window, page_label); diff --git a/shell/main.c b/shell/main.c index 33cb14e..5af54e6 100644 --- a/shell/main.c +++ b/shell/main.c @@ -26,6 +26,8 @@ #include <glib/gi18n.h> #include <gdk/gdkx.h> #include <gtk/gtkmain.h> +#include <stdlib.h> +#include <string.h> #include <libgnome/gnome-program.h> #include <libgnomeui/gnome-ui-init.h> #include <libgnomeui/gnome-app-helper.h> @@ -123,7 +125,9 @@ load_files_remote (const char **files) DBusGPendingCall *call; #endif DBusGProxy *remote_object; +#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME GdkDisplay *display; +#endif guint32 timestamp; #ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME |