This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository xfce/xfce4-panel.
commit f590e705122ef85f55093fbc7df5c82a662b9c7a
Author: Ali Abdallah <a...@xfce.org>
Date: Wed Jun 21 18:48:24 2017 +0200
Fix panel_return_if_fail call
Use is_exported instead of is_owned for the exported dbus interface.
---
panel/main.c | 2 +-
panel/panel-dbus-service.c | 3 ++-
panel/panel-dbus-service.h | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/panel/main.c b/panel/main.c
index d9f06d1..cce7793 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -313,7 +313,7 @@ main (gint argc, gchar **argv)
/* start dbus service */
dbus_service = panel_dbus_service_get ();
- if (!panel_dbus_service_is_owner (dbus_service))
+ if (!panel_dbus_service_is_exported (dbus_service))
{
/* quit without error if an instance is running */
succeed = TRUE;
diff --git a/panel/panel-dbus-service.c b/panel/panel-dbus-service.c
index aafceaa..65d235a 100644
--- a/panel/panel-dbus-service.c
+++ b/panel/panel-dbus-service.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2017 Ali Abdallah <a...@xfce.org>
* Copyright (C) 2008-2010 Nick Schermer <n...@xfce.org>
*
* This program is free software; you can redistribute it and/or modify
@@ -369,7 +370,7 @@ panel_dbus_service_terminate (XfcePanelExportedService
*skeleton,
gboolean restart,
PanelDBusService *service)
{
- return_val_if_fail (PANEL_IS_DBUS_SERVICE (service), FALSE);
+ panel_return_val_if_fail (PANEL_IS_DBUS_SERVICE (service), FALSE);
panel_dbus_service_exit_panel (restart);
diff --git a/panel/panel-dbus-service.h b/panel/panel-dbus-service.h
index 71278b5..2dc61b9 100644
--- a/panel/panel-dbus-service.h
+++ b/panel/panel-dbus-service.h
@@ -38,7 +38,7 @@ GType panel_dbus_service_get_type (void)
G_GNUC_CONST;
PanelDBusService *panel_dbus_service_get (void);
-gboolean panel_dbus_service_is_owner (PanelDBusService *service);
+gboolean panel_dbus_service_is_exported (PanelDBusService *service);
void panel_dbus_service_exit_panel (gboolean restart);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
