From e2fae3b7987703033c61b454999be415a73e5e9e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 6 Feb 2009 10:37:30 +0100 Subject: Removing GObject introspection for now --- libindicate/Makefile.am | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'libindicate') diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 3ceba08..b06f644 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -71,31 +71,31 @@ listener-marshal.c: listener-marshal.list --prefix=indicate_listener_marshal $(srcdir)/listener-marshal.list \ > listener-marshal.c -pkgconfig_DATA = indicate.pc -pkgconfigdir = $(libdir)/pkgconfig - -gobjectintrospection_gir_DATA = \ - Indicate-0.1.gir -gobjectintrospection_girdir = $(datadir)/gir - -gobjectintrospection_type_DATA = \ - Indicate-0.1.typelib -gobjectintrospection_typedir = $(libdir)/girepository - -irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers)) -Indicate-0.1.gir: $(irscanner_headers) - $(G_IR_SCANNER) \ - -v --namespace Indicate \ - --nsversion=0.1 \ - --add-include-path=$(srcdir) \ - --include=GObject-2.0 \ - --include=GLib-2.0 \ - --include=GdkPixbuf-2.0 \ - --library=indicate --pkg indicate \ - --output Indicate-0.1.gir $(irscanner_headers) - -Indicate-0.1.typelib: Indicate-0.1.gir - $(G_IR_COMPILER) \ - --includedir=$(srcdir) Indicate-0.1.gir \ - -o Indicate-0.1.typelib +#pkgconfig_DATA = indicate.pc +#pkgconfigdir = $(libdir)/pkgconfig +# +#gobjectintrospection_gir_DATA = \ +# Indicate-0.1.gir +#gobjectintrospection_girdir = $(datadir)/gir +# +#gobjectintrospection_type_DATA = \ +# Indicate-0.1.typelib +#gobjectintrospection_typedir = $(libdir)/girepository +# +#irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers)) +#Indicate-0.1.gir: $(irscanner_headers) +# $(G_IR_SCANNER) \ +# -v --namespace Indicate \ +# --nsversion=0.1 \ +# --add-include-path=$(srcdir) \ +# --include=GObject-2.0 \ +# --include=GLib-2.0 \ +# --include=GdkPixbuf-2.0 \ +# --library=indicate --pkg indicate \ +# --output Indicate-0.1.gir $(irscanner_headers) +# +#Indicate-0.1.typelib: Indicate-0.1.gir +# $(G_IR_COMPILER) \ +# --includedir=$(srcdir) Indicate-0.1.gir \ +# -o Indicate-0.1.typelib -- cgit v1.2.3 From 37a0956068737430827119a939ecf92170aba75d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 6 Feb 2009 14:15:41 +0100 Subject: releasing version 0.1~ppa32 --- libindicate/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libindicate') diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index b06f644..0bf400c 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -71,9 +71,9 @@ listener-marshal.c: listener-marshal.list --prefix=indicate_listener_marshal $(srcdir)/listener-marshal.list \ > listener-marshal.c -#pkgconfig_DATA = indicate.pc -#pkgconfigdir = $(libdir)/pkgconfig -# +pkgconfig_DATA = indicate.pc +pkgconfigdir = $(libdir)/pkgconfig + #gobjectintrospection_gir_DATA = \ # Indicate-0.1.gir #gobjectintrospection_girdir = $(datadir)/gir -- cgit v1.2.3 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') 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') 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 From 50411f8937483d86f9425f1f06f346f559042ba4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 9 Feb 2009 10:59:57 -0600 Subject: Only emitting a changed signal on properties changed when the indicator is visible --- libindicate/indicator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libindicate') diff --git a/libindicate/indicator.c b/libindicate/indicator.c index b77d7d7..cf77316 100644 --- a/libindicate/indicator.c +++ b/libindicate/indicator.c @@ -255,7 +255,9 @@ set_property (IndicateIndicator * indicator, const gchar * key, const gchar * da /* If the value has changed or there is no value */ gchar * newkey = g_strdup(key); g_hash_table_insert(priv->properties, newkey, g_strdup(data)); - g_signal_emit(indicator, signals[MODIFIED], 0, newkey, TRUE); + if (indicate_indicator_is_visible(indicator)) { + g_signal_emit(indicator, signals[MODIFIED], 0, newkey, TRUE); + } } return; -- cgit v1.2.3