[ev-daemon] Respect GNOME22_USER_DIR env variable

[evince.git] / shell / ev-daemon.c

diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c
index c5b9c6d2daf44516b5c3d5f1e490a2e1e4f25878..d767c495747ed628858e59b5ae15b18442fa5ca5 100644 (file)
--- a/shell/ev-daemon.c
+++ b/shell/ev-daemon.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -149,7 +150,7 @@ ev_daemon_shutdown (EvDaemon *ev_daemon)
 static void
 ev_daemon_stop_killtimer (EvDaemon *ev_daemon)
 {
-       if (ev_daemon->timer_id > 0)
+       if (ev_daemon->timer_id != 0)
                g_source_remove (ev_daemon->timer_id);
        ev_daemon->timer_id = 0;
 }
@@ -333,7 +334,7 @@ static gboolean
 convert_metadata (const gchar *metadata)
 {
        GFile   *file;
-       gchar   *cmd;
+       char    *argv[3];
        gint     exit_status;
        GFileAttributeInfoList *namespaces;
        gboolean supported = FALSE;
@@ -357,38 +358,47 @@ convert_metadata (const gchar *metadata)
                g_file_attribute_info_list_unref (namespaces);
        }
        if (!supported) {
-               g_warning ("%s\n",
-                          "GVFS metadata not supported, "
-                          "Evince will run without metadata support");
+               g_warning ("GVFS metadata not supported. "
+                          "Evince will run without metadata support.\n");
                g_object_unref (file);
                return FALSE;
        }
        g_object_unref (file);
 
-       cmd = g_strdup_printf ("%s %s", LIBEXECDIR"/evince-convert-metadata", metadata);
+       argv[0] = g_build_filename (LIBEXECDIR, "evince-convert-metadata", NULL);
+       argv[1] = (char *) metadata;
+       argv[2] = NULL;
 
-       retval = g_spawn_command_line_sync (cmd, NULL, NULL, &exit_status, &error);
-       g_free (cmd);
+       retval = g_spawn_sync (NULL /* wd */, argv, NULL /* env */,
+                              0, NULL, NULL, NULL, NULL,
+                              &exit_status, &error);
+       g_free (argv[0]);
 
        if (!retval) {
                g_printerr ("Error migrating metadata: %s\n", error->message);
                g_error_free (error);
        }
 
-       return retval && exit_status == 0;
+       return retval && WIFEXITED (exit_status) && WEXITSTATUS (exit_status) == 0;
 }
 
 static void
 ev_migrate_metadata (void)
 {
-       gchar *updated;
-       gchar *metadata;
-       gchar *dot_dir;
-
-       dot_dir = g_build_filename (g_get_home_dir (),
-                                   ".gnome2",
-                                   "evince",
-                                   NULL);
+       gchar       *updated;
+       gchar       *metadata;
+       gchar       *dot_dir;
+       const gchar *userdir;
+
+       userdir = g_getenv ("GNOME22_USER_DIR");
+       if (userdir) {
+               dot_dir = g_build_filename (userdir, "evince", NULL);
+       } else {
+               dot_dir = g_build_filename (g_get_home_dir (),
+                                           ".gnome2",
+                                           "evince",
+                                           NULL);
+       }
 
        updated = g_build_filename (dot_dir, "migrated-to-gvfs", NULL);
        if (g_file_test (updated, G_FILE_TEST_EXISTS)) {