From 12edcbdf1fbf4d45e9f111cd44df261623ab23e0 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Mon, 11 Jul 2005 11:20:42 +0000 Subject: [PATCH 1/1] Allow open more than one file 2005-07-11 Carlos Garcia Campos * shell/main.c: (load_files_remote): Allow open more than one file --- ChangeLog | 6 ++++++ shell/main.c | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32756913..efaa2d2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-11 Carlos Garcia Campos + + * shell/main.c: (load_files_remote): + + Allow open more than one file + 2005-07-11 Marco Pesenti Gritti * shell/main.c: (load_files_remote): diff --git a/shell/main.c b/shell/main.c index 334d366e..4fff6dfe 100644 --- a/shell/main.c +++ b/shell/main.c @@ -74,6 +74,7 @@ load_files_remote (const char **files) int i; GError *error = NULL; DBusGConnection *connection; + gboolean result = FALSE; #if DBUS_VERSION < 35 DBusGPendingCall *call; #endif @@ -119,7 +120,6 @@ load_files_remote (const char **files) } for (i = 0; files[i]; i++) { - gboolean result = TRUE; const char *page_label; char *uri; @@ -134,7 +134,8 @@ load_files_remote (const char **files) if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { g_warning (error->message); g_clear_error (&error); - result = FALSE; + g_free (uri); + continue; } #elif DBUS_VERSION == 34 call = dbus_g_proxy_begin_call (remote_object, "OpenURI", @@ -145,7 +146,8 @@ load_files_remote (const char **files) if (!dbus_g_proxy_end_call (remote_object, call, &error, G_TYPE_INVALID)) { g_warning (error->message); g_clear_error (&error); - result = FALSE; + g_free (uri); + continue; } #else if (!dbus_g_proxy_call (remote_object, "OpenURI", &error, @@ -154,14 +156,15 @@ load_files_remote (const char **files) G_TYPE_INVALID)) { g_warning (error->message); g_clear_error (&error); - result = FALSE; + g_free (uri); + continue; } #endif g_free (uri); - return result; + result = TRUE; } - return TRUE; + return result; } #endif /* ENABLE_DBUS */ -- 2.43.5