From d42c9b5ee091596357efe8e1f29d0c16173dc068 Mon Sep 17 00:00:00 2001 From: Neil Jagdish Patel Date: Mon, 9 Feb 2009 15:25:13 +0000 Subject: Add the indicate_server_hide function --- libindicate/server.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'libindicate/server.c') diff --git a/libindicate/server.c b/libindicate/server.c index 6139fd0..a90fbe8 100644 --- a/libindicate/server.c +++ b/libindicate/server.c @@ -40,6 +40,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; typedef struct _IndicateServerPrivate IndicateServerPrivate; struct _IndicateServerPrivate { + DBusGConnection *connection; gchar * path; GSList * indicators; gboolean visible; @@ -265,6 +266,8 @@ indicate_server_show (IndicateServer * server) connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + priv->connection = connection; + dbus_g_connection_register_g_object(connection, priv->path, G_OBJECT(server)); @@ -275,6 +278,25 @@ indicate_server_show (IndicateServer * server) return; } +void +indicate_server_hide (IndicateServer * server) +{ + g_return_if_fail(INDICATE_IS_SERVER(server)); + IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server); + + if (priv->visible) + return; + + priv->visible = FALSE; + + g_signal_emit(server, signals[SERVER_HIDE], 0, "", TRUE); + + dbus_g_connection_unref (priv->connection); + priv->connection = NULL; + + return; +} + static guint get_next_id (IndicateServer * server) { -- cgit v1.2.3 From eb7ca97f4b466902ac2040f1241badb7ecaa3c84 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 9 Feb 2009 10:58:05 -0600 Subject: Some formatting, reusing the private variable, making it so that hide sends the type and only sending a message of finalize if we're still visible. --- libindicate/server.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'libindicate/server.c') diff --git a/libindicate/server.c b/libindicate/server.c index 84f7562..7daedc7 100644 --- a/libindicate/server.c +++ b/libindicate/server.c @@ -40,7 +40,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; typedef struct _IndicateServerPrivate IndicateServerPrivate; struct _IndicateServerPrivate { - DBusGConnection *connection; + DBusGConnection *connection; gchar * path; GSList * indicators; gboolean visible; @@ -176,7 +176,9 @@ indicate_server_finalize (GObject * obj) IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server); /* TODO: This probably shouldn't be as far down as finalize, but it's fine here. */ - g_signal_emit(server, signals[SERVER_HIDE], 0, priv->type ? priv->type : "", TRUE); + if (priv->visible) { + g_signal_emit(server, signals[SERVER_HIDE], 0, priv->type ? priv->type : "", TRUE); + } if (priv->path) { g_free(priv->path); @@ -262,13 +264,9 @@ indicate_server_show (IndicateServer * server) if (priv->visible) return; - DBusGConnection * connection; - - connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + priv->connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); - priv->connection = connection; - - dbus_g_connection_register_g_object(connection, + dbus_g_connection_register_g_object(priv->connection, priv->path, G_OBJECT(server)); priv->visible = TRUE; @@ -287,12 +285,12 @@ indicate_server_hide (IndicateServer * server) if (priv->visible) return; - priv->visible = FALSE; + priv->visible = FALSE; - g_signal_emit(server, signals[SERVER_HIDE], 0, "", TRUE); + g_signal_emit(server, signals[SERVER_HIDE], 0, priv->type ? priv->type : "", TRUE); dbus_g_connection_unref (priv->connection); - priv->connection = NULL; + priv->connection = NULL; return; } -- cgit v1.2.3