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

diff --git a/ChangeLog b/ChangeLog
index d567dae3140cf8bc24a728bc8c8d47087644e7de..c1be1da2b67cfcf37ef5cb2a7bbc267efb154112 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 d9b5ab0dab00f53ff08b8c9706083d25debf80b5..2b4762927818627945823d599e60e067e6f4cdf3 100644 (file)
--- 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 33cb14ec6446a0a07ceebfe887c65ffe0804c88c..5af54e6eaed3644dcd03234cdca3d1ca4ce690a4 100644 (file)
--- 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