[Xfce4-commits] [xfce/thunar] 01/02: Exit when name org.freedesktop.filemanager1 lost on message-dbus (Bug #15088)

[noreply at xfce.org]

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

a   l   e   x       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       x   f   c   e   -   4   .   1   4   
   in repository xfce/thunar.

commit 1300101e50161c7f6b4fa3dd73c9808e5ff27d84
Author: Alexander Schwinn <alexxcons at xfce.org>
Date:   Sun Jan 27 19:04:32 2019 +0100

    Exit when name org.freedesktop.filemanager1 lost on message-dbus
    (Bug #15088)
---
 thunar/thunar-application.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 4e27360..694db53 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -117,7 +117,10 @@ static void           thunar_application_dbus_acquired_cb       (GDBusConnection
 static void           thunar_application_name_acquired_cb       (GDBusConnection        *connection,
                                                                  const gchar            *name,
                                                                  gpointer                user_data);
-static void           thunar_application_dbus_name_lost_cb      (GDBusConnection        *connection,
+static void           thunar_application_dbus_name_lost_crit_cb (GDBusConnection        *connection,
+                                                                 const gchar            *name,
+                                                                 gpointer                user_data);
+static void           thunar_application_dbus_name_lost_warn_cb (GDBusConnection        *connection,
                                                                  const gchar            *name,
                                                                  gpointer                user_data);
 static void           thunar_application_dbus_init              (ThunarApplication      *application);
@@ -305,7 +308,7 @@ thunar_application_name_acquired_cb (GDBusConnection *connection,
 
 
 static void
-thunar_application_dbus_name_lost_cb (GDBusConnection *connection,
+thunar_application_dbus_name_lost_crit_cb (GDBusConnection *connection,
                                       const gchar     *name,
                                       gpointer         user_data)
 {
@@ -316,6 +319,16 @@ thunar_application_dbus_name_lost_cb (GDBusConnection *connection,
 
 
 
+static void
+thunar_application_dbus_name_lost_warn_cb (GDBusConnection *connection,
+                                      const gchar     *name,
+                                      gpointer         user_data)
+{
+  g_warning (_("Name '%s' lost on the message dbus."), name);
+}
+
+
+
 /* TODO: [GTK3 Port] Check if there's a cleaner way to register */
 /* this extra dbus name (besides org.xfce.Thunar) */
 static void
@@ -330,7 +343,7 @@ thunar_application_dbus_init (ThunarApplication *application)
                                       G_BUS_NAME_OWNER_FLAGS_NONE,
                                       thunar_application_dbus_acquired_cb,
                                       thunar_application_name_acquired_cb,
-                                      thunar_application_dbus_name_lost_cb,
+                                      thunar_application_dbus_name_lost_crit_cb,
                                       application,
                                       NULL);
 
@@ -339,7 +352,7 @@ thunar_application_dbus_init (ThunarApplication *application)
                                      G_BUS_NAME_OWNER_FLAGS_NONE,
                                      thunar_application_dbus_acquired_cb,
                                      thunar_application_name_acquired_cb,
-                                     thunar_application_dbus_name_lost_cb,
+                                     thunar_application_dbus_name_lost_warn_cb,
                                      application,
                                      NULL);
 }

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