[vino] Fixed programming style. Also use dprintf instead of g_debug.
- From: Jonh Wendell <jwendell src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [vino] Fixed programming style. Also use dprintf instead of g_debug.
- Date: Fri, 28 Aug 2009 14:50:18 +0000 (UTC)
commit 8e0d84b4317dd55862a8042817e5ab6b7fe0bdc5
Author: Jonh Wendell <jwendell gnome org>
Date: Fri Aug 28 11:33:43 2009 -0300
Fixed programming style. Also use dprintf instead of g_debug.
server/vino-dbus-listener.c | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/server/vino-dbus-listener.c b/server/vino-dbus-listener.c
index e980d41..2c108df 100644
--- a/server/vino-dbus-listener.c
+++ b/server/vino-dbus-listener.c
@@ -377,9 +377,10 @@ vino_dbus_listener_set_server (VinoDBusListener *listener,
dprintf (DBUS, "Object registered at path '%s'\n", obj_path);
- g_signal_connect (server, "notify::alternative-port",
- G_CALLBACK (vino_dbus_listener_info_changed),
- listener);
+ g_signal_connect (server,
+ "notify::alternative-port",
+ G_CALLBACK (vino_dbus_listener_info_changed),
+ listener);
g_free (obj_path);
}
@@ -392,30 +393,30 @@ vino_dbus_listener_get_server (VinoDBusListener *listener)
return listener->priv->server;
}
-static DBusGConnection * vino_dbus_connection = NULL;
+static DBusGConnection *vino_dbus_connection = NULL;
static gboolean vino_dbus_failed_to_connect = FALSE;
DBusGConnection *
vino_dbus_get_connection (void)
{
- DBusConnection * dbus_conn;
if (vino_dbus_connection == NULL && !vino_dbus_failed_to_connect)
{
- GError * error = NULL;
+ GError *error = NULL;
if ((vino_dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error)))
- {
- dprintf (DBUS, "Successfully connected to the message bus\n");
- dbus_conn = dbus_g_connection_get_connection (vino_dbus_connection);
- dbus_connection_set_exit_on_disconnect (dbus_conn, FALSE);
- }
+ {
+ DBusConnection * dbus_conn;
+
+ dprintf (DBUS, "Successfully connected to the message bus\n");
+ dbus_conn = dbus_g_connection_get_connection (vino_dbus_connection);
+ dbus_connection_set_exit_on_disconnect (dbus_conn, FALSE);
+ }
else
- {
- vino_dbus_failed_to_connect = TRUE;
- g_printerr ("Failed to open connection to bus: %s\n",
- error->message);
- g_error_free (error);
- }
+ {
+ vino_dbus_failed_to_connect = TRUE;
+ dprintf (DBUS, "Failed to open connection to bus: %s\n", error->message);
+ g_error_free (error);
+ }
}
return vino_dbus_connection;
@@ -434,7 +435,7 @@ vino_dbus_request_name (void)
return FALSE;
dbus_g_object_type_install_info (VINO_TYPE_DBUS_LISTENER,
- &dbus_glib_vino_dbus_listener_object_info);
+ &dbus_glib_vino_dbus_listener_object_info);
bus_proxy = dbus_g_proxy_new_for_name (connection,
"org.freedesktop.DBus",
@@ -450,10 +451,9 @@ vino_dbus_request_name (void)
G_TYPE_UINT, &request_name_result,
G_TYPE_INVALID))
{
- g_debug ("Failed to request name: %s",
- error ? error->message : "No error given");
+ dprintf (DBUS, "Failed to request DBUS name: %s", error ? error->message : "No error given");
g_clear_error (&error);
- return FALSE ;
+ return FALSE;
}
if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]