X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=4fff6dfebfae1887ffd6fed01825b0477327d2a9;hb=082a08309e217bcbe1d31622a5eb55dec8475e77;hp=334d366e5b64923fa1832d1d502764a80d5c9d0d;hpb=b2e7a9f7c44d07a2af27c8b7a52c9fc4e19f615c;p=evince.git 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 */