[Xfce4-commits] [xfce/xfdesktop] 06/35: Drop warning when D-Bus timeout error occurs (Bug #11283)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch xfce-4.12
in repository xfce/xfdesktop.

commit 949e35f3446155088311db71f6ed90045a3dcec6
Author: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
Date:   Sun Mar 1 23:42:52 2015 +0100

    Drop warning when D-Bus timeout error occurs (Bug #11283)
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 src/xfdesktop-file-utils.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 8494387..5295ed3 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -679,11 +679,14 @@ xfdesktop_file_utils_async_cb(DBusGProxy *proxy, GError *error, gpointer userdat
     GtkWindow *parent = GTK_WINDOW(userdata);
 
     if(error != NULL) {
-        xfce_message_dialog(parent,
-                            _("Error"), GTK_STOCK_DIALOG_ERROR,
-                            _("The requested operation could not be completed"),
-                            error->message, GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
-                            NULL);
+        /* ignore dbus timeout error (bug #11283) */
+        if(error->code != DBUS_GERROR_NO_REPLY) {
+            xfce_message_dialog(parent,
+                                _("Error"), GTK_STOCK_DIALOG_ERROR,
+                                _("The requested operation could not be completed"),
+                                error->message, GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
+                                NULL);
+        }
         g_error_free(error);
     }
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.