Updating branch refs/heads/devel
to d986d0f7fb50bb43636baf688c7c83ab657301c7 (commit)
from 3d1858ee05d39e3ac1e2f18a4f1097c8f648cf37 (commit)
commit d986d0f7fb50bb43636baf688c7c83ab657301c7
Author: Nick Schermer <n...@xfce.org>
Date: Wed Jan 20 17:38:06 2010 +0100
Review PanelDBusClient.
panel/panel-dbus-client.c | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/panel/panel-dbus-client.c b/panel/panel-dbus-client.c
index 8dc86a1..ac55dea 100644
--- a/panel/panel-dbus-client.c
+++ b/panel/panel-dbus-client.c
@@ -53,21 +53,18 @@ static DBusGProxy *
panel_dbus_client_get_proxy (GError **error)
{
DBusGConnection *dbus_connection;
- DBusGProxy *dbus_proxy;
- /* try to open the dbus connection */
+ /* return null if no connection is found */
dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, error);
+ panel_return_val_if_fail (dbus_connection != NULL, NULL);
if (G_UNLIKELY (dbus_connection == NULL))
return NULL;
- /* get the proxy */
- dbus_proxy = dbus_g_proxy_new_for_name_owner (dbus_connection,
- PANEL_DBUS_NAME,
- PANEL_DBUS_PATH,
- PANEL_DBUS_INTERFACE,
- error);
-
- return dbus_proxy;
+ return dbus_g_proxy_new_for_name_owner (dbus_connection,
+ PANEL_DBUS_NAME,
+ PANEL_DBUS_PATH,
+ PANEL_DBUS_INTERFACE,
+ error);
}
@@ -77,12 +74,11 @@ panel_dbus_client_check_instance_running (void)
{
DBusGProxy *dbus_proxy;
- /* get the proxy */
+ /* if no proxy is returned, there is no registered PanelDBusService */
dbus_proxy = panel_dbus_client_get_proxy (NULL);
- if (G_UNLIKELY (dbus_proxy == NULL))
+ if (dbus_proxy == NULL)
return FALSE;
- /* cleanup */
g_object_unref (G_OBJECT (dbus_proxy));
return TRUE;
@@ -99,16 +95,13 @@ panel_dbus_client_display_preferences_dialog (guint
active,
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- /* get the proxy */
dbus_proxy = panel_dbus_client_get_proxy (error);
- if (G_UNLIKELY (dbus_proxy == NULL))
+ if (G_LIKELY (dbus_proxy == NULL))
return FALSE;
- /* call */
result = _panel_dbus_client_display_preferences_dialog (dbus_proxy,
active, error);
- /* cleanup */
g_object_unref (G_OBJECT (dbus_proxy));
return result;
@@ -125,16 +118,13 @@ panel_dbus_client_display_items_dialog (guint active,
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- /* get the proxy */
dbus_proxy = panel_dbus_client_get_proxy (error);
if (G_UNLIKELY (dbus_proxy == NULL))
return FALSE;
- /* call */
result = _panel_dbus_client_display_items_dialog (dbus_proxy, active,
error);
- /* cleanup */
g_object_unref (G_OBJECT (dbus_proxy));
return result;
@@ -150,13 +140,12 @@ panel_dbus_client_save (GError **error)
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- /* get the proxy */
dbus_proxy = panel_dbus_client_get_proxy (error);
if (G_UNLIKELY (dbus_proxy == NULL))
return FALSE;
- /* call */
result = _panel_dbus_client_save (dbus_proxy, error);
+
g_object_unref (G_OBJECT (dbus_proxy));
return result;
@@ -174,15 +163,14 @@ panel_dbus_client_add_new_item (const gchar *plugin_name,
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- /* get the proxy */
dbus_proxy = panel_dbus_client_get_proxy (error);
if (G_UNLIKELY (dbus_proxy == NULL))
return FALSE;
- /* call */
result = _panel_dbus_client_add_new_item (dbus_proxy, plugin_name,
(const gchar **) arguments,
error);
+
g_object_unref (G_OBJECT (dbus_proxy));
return result;
@@ -307,13 +295,12 @@ panel_dbus_client_terminate (gboolean restart,
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- /* get the proxy */
dbus_proxy = panel_dbus_client_get_proxy (error);
if (G_UNLIKELY (dbus_proxy == NULL))
return FALSE;
- /* call */
result = _panel_dbus_client_terminate (dbus_proxy, restart, error);
+
g_object_unref (G_OBJECT (dbus_proxy));
return result;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
