Fix build warnings and compilation with dbus 0.35.2

diff --git a/ChangeLog b/ChangeLog
index 49ff9894da498a4fbede3f20fd6d5e9d5eeb3712..204474d414930c85dedafefcb629e59507ecba90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-08-16  Nickolay V. Shmyrev   <nshmyrev@yandex.ru>
+
+       * shell/ev-utils.c: (set_umask_permissions), (write_to_temp_file):
+       * shell/ev-window.c:
+       Fix build warnings
+
+2005-08-16  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * configure.ac: Update script to get dbus version.
+       Fix for the bug #313443.
+
 2005-08-16  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * shell/ev-window.c: (ev_window_cmd_escape):

diff --git a/configure.ac b/configure.ac
index 519474b9b3739c174a71abccba980f2f2297702e..c0f0163a6c4db50095726fb3e70bd301375c76c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ if test "x$enable_dbus" = "xyes" ; then
 
         AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
 
-       DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0.\([[0-9]]*\)/\1/'`
+       DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0\.\([[0-9]]*\)\.\?\([[0-9]]*\)/\1/'`
        AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])
 fi
 

diff --git a/shell/ev-utils.c b/shell/ev-utils.c
index 21563eb97c173bdcb13a2055ef3e241b2405c179..9fc74c659573970102c2b131e23a5823cd3d45f5 100644 (file)
--- a/shell/ev-utils.c
+++ b/shell/ev-utils.c
@@ -213,6 +213,7 @@ ev_print_region_contents (GdkRegion *region)
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <string.h>
+#include <glib/gstdio.h>
 
 static gboolean
 rename_file (const char *old_name,
@@ -240,8 +241,6 @@ set_umask_permissions (int       fd,
    * the umask in between the getting and the setting of the umask.
    * So we have to do the whole thing in a child process.
    */
-
-  int save_errno;
   pid_t pid;
 
   pid = fork ();
@@ -276,9 +275,7 @@ set_umask_permissions (int       fd,
 
       if (WIFEXITED (status))
        {
-         save_errno = WEXITSTATUS (status);
-
-         if (save_errno == 0)
+         if (WEXITSTATUS (status) == 0)
            {
              return TRUE;
            }
@@ -309,7 +306,6 @@ write_to_temp_file (const gchar *contents,
   gchar *retval;
   FILE *file;
   gint fd;
-  int save_errno;
 
   retval = NULL;
   

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 68174cc3ffb6f92992aa131a4bcfa465fe228e99..d860d74589186daff904a6cb20c4dae0bd6eeadd 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -62,6 +62,7 @@
 #include "ev-stock-icons.h"
 #include "ev-metadata-manager.h"
 #include "ev-file-helpers.h"
+#include "ev-utils.h"
 
 #include <poppler.h>