From 184a04a0f101e4005794ea72217dda0f452ae97d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 08:17:37 -0600 Subject: Adding in a time property function --- libindicate/indicator.c | 11 +++++++++++ libindicate/indicator.h | 1 + 2 files changed, 12 insertions(+) (limited to 'libindicate') diff --git a/libindicate/indicator.c b/libindicate/indicator.c index c6df80a..3b6581b 100644 --- a/libindicate/indicator.c +++ b/libindicate/indicator.c @@ -244,6 +244,17 @@ indicate_indicator_set_property_icon (IndicateIndicator * indicator, const gchar } +void +indicate_indicator_set_property_time (IndicateIndicator * indicator, const gchar * key, GTimeVal * time) +{ + gchar * timestr = g_time_val_to_iso8601(time); + if (timestr != NULL) { + indicate_indicator_set_property(indicator, key, timestr); + g_free(timestr); + } + return; +} + const gchar * indicate_indicator_get_property (IndicateIndicator * indicator, const gchar * key) { diff --git a/libindicate/indicator.h b/libindicate/indicator.h index 5423247..5faea3c 100644 --- a/libindicate/indicator.h +++ b/libindicate/indicator.h @@ -99,6 +99,7 @@ void indicate_indicator_user_display (IndicateIndicator * indicator); /* Properties handling */ void indicate_indicator_set_property (IndicateIndicator * indicator, const gchar * key, const gchar * data); void indicate_indicator_set_property_icon (IndicateIndicator * indicator, const gchar * key, const GdkPixbuf * data); +void indicate_indicator_set_property_time (IndicateIndicator * indicator, const gchar * key, GTimeVal * time); const gchar * indicate_indicator_get_property (IndicateIndicator * indicator, const gchar * key); GPtrArray * indicate_indicator_list_properties (IndicateIndicator * indicator); -- cgit v1.2.3 From ee2747416fa823d805af6d417dcd5f6159399f11 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 10:47:54 -0600 Subject: Rebuilding the way that priorities get done so that we can handle a time and icon version of the functions so that apps don't have to worry about those details. --- libindicate/listener.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- libindicate/listener.h | 16 ++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) (limited to 'libindicate') diff --git a/libindicate/listener.c b/libindicate/listener.c index 4da6d59..f641b56 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -650,14 +650,22 @@ proxy_indicators_free (gpointer data) return; } +typedef enum _get_property_type get_property_type; +enum _get_property_type { + PROPERTY_TYPE_STRING, + PROPERTY_TYPE_TIME, + PROPERTY_TYPE_ICON +}; + typedef struct _get_property_t get_property_t; struct _get_property_t { - indicate_listener_get_property_cb cb; + GCallback cb; gpointer data; IndicateListener * listener; IndicateListenerServer * server; IndicateListenerIndicator * indicator; gchar * property; + get_property_type type; }; static void @@ -671,7 +679,19 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us return; } - get_property_data->cb(get_property_data->listener, get_property_data->server, get_property_data->indicator, get_property_data->property, OUT_value, get_property_data->data); + switch (get_property_data->type) { + case PROPERTY_TYPE_STRING: { + indicate_listener_get_property_cb cb = (indicate_listener_get_property_cb)get_property_data->cb; + cb(get_property_data->listener, get_property_data->server, get_property_data->indicator, get_property_data->property, OUT_value, get_property_data->data); + break; + } + case PROPERTY_TYPE_ICON: { + break; + } + case PROPERTY_TYPE_TIME: { + break; + } + } g_free(get_property_data->property); g_free(get_property_data); @@ -679,8 +699,8 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us return; }; -void -indicate_listener_get_property (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, indicate_listener_get_property_cb callback, gpointer data) +static void +get_property_helper (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GCallback callback, gpointer data, get_property_type prop_type) { /* TODO: Do we need to somehow refcount the server/indicator while we're waiting on this? */ IndicateListenerPrivate * priv = INDICATE_LISTENER_GET_PRIVATE(listener); @@ -703,6 +723,24 @@ indicate_listener_get_property (IndicateListener * listener, IndicateListenerSer return; } +void +indicate_listener_get_property (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, indicate_listener_get_property_cb callback, gpointer data) +{ + return get_property_helper(listener, server, indicator, property, G_CALLBACK(callback), data, PROPERTY_TYPE_STRING); +} + +void +indicate_listener_get_property_time (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, indicate_listener_get_property_time_cb callback, gpointer data) +{ + return get_property_helper(listener, server, indicator, property, G_CALLBACK(callback), data, PROPERTY_TYPE_TIME); +} + +void +indicate_listener_get_property_icon (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, indicate_listener_get_property_icon_cb callback, gpointer data) +{ + return get_property_helper(listener, server, indicator, property, G_CALLBACK(callback), data, PROPERTY_TYPE_ICON); +} + static void listener_display_cb (DBusGProxy *proxy, GError *error, gpointer userdata) { diff --git a/libindicate/listener.h b/libindicate/listener.h index 3d8c7ef..ed40630 100644 --- a/libindicate/listener.h +++ b/libindicate/listener.h @@ -33,6 +33,8 @@ License version 3 and version 2.1 along with this program. If not, see #include #include +#include + #include "indicator.h" #include "server.h" @@ -79,6 +81,8 @@ struct _IndicateListenerClass { GType indicate_listener_get_type (void) G_GNUC_CONST; typedef void (*indicate_listener_get_property_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data); +typedef void (*indicate_listener_get_property_time_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GTimeVal * propertydata, gpointer data); +typedef void (*indicate_listener_get_property_icon_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GdkPixbuf * propertydata, gpointer data); typedef void (*indicate_listener_get_server_property_cb) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data); /* Create a new listener */ @@ -90,6 +94,18 @@ void indicate_listener_get_property (IndicateListener * l gchar * property, indicate_listener_get_property_cb callback, gpointer data); +void indicate_listener_get_property_time (IndicateListener * listener, + IndicateListenerServer * server, + IndicateListenerIndicator * indicator, + gchar * property, + indicate_listener_get_property_time_cb callback, + gpointer data); +void indicate_listener_get_property_icon (IndicateListener * listener, + IndicateListenerServer * server, + IndicateListenerIndicator * indicator, + gchar * property, + indicate_listener_get_property_icon_cb callback, + gpointer data); void indicate_listener_display (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator); -- cgit v1.2.3 From c3964b3bdbd6ccfe97d6b0387f6784e891df8552 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 12:15:09 -0600 Subject: Adding in the code for handling icons and time --- libindicate/listener.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'libindicate') diff --git a/libindicate/listener.c b/libindicate/listener.c index f641b56..3b1e3ea 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -686,9 +686,39 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us break; } case PROPERTY_TYPE_ICON: { + indicate_listener_get_property_icon_cb cb = (indicate_listener_get_property_icon_cb)get_property_data->cb; + + GInputStream * input = g_memory_input_stream_new_from_data(OUT_value, strlen(OUT_value) - 1, NULL); + if (input == NULL) { + g_warning("Cound not create input stream from icon property data"); + break; + } + + GError * error = NULL; + GdkPixbuf * icon = gdk_pixbuf_new_from_stream(input, NULL, &error); + if (icon != NULL) { + cb(get_property_data->listener, get_property_data->server, get_property_data->indicator, get_property_data->property, icon, get_property_data->data); + } + + if (error != NULL) { + g_warning("Unable to build Pixbuf from icon data: %s", error->message); + g_error_free(error); + } + + error = NULL; + g_input_stream_close(input, NULL, error); + if (error != NULL) { + g_warning("Unable to close input stream: %s", error->message); + g_error_free(error); + } break; } case PROPERTY_TYPE_TIME: { + indicate_listener_get_property_time_cb cb = (indicate_listener_get_property_icon_cb)get_property_data->cb; + GTimeVal time; + if (g_time_val_from_iso8601(OUT_value, &time)) { + cb(get_property_data->listener, get_property_data->server, get_property_data->indicator, get_property_data->property, &time, get_property_data->data); + } break; } } -- cgit v1.2.3 From b94d3a706d4f3e93e4e23dd908ffc0704add19f8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 12:31:08 -0600 Subject: Seeing what happens if I turn on "sign always" in Bazaar. --- libindicate/listener.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libindicate') diff --git a/libindicate/listener.c b/libindicate/listener.c index 3b1e3ea..4dc874d 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -887,3 +887,4 @@ indicate_listener_server_get_desktop (IndicateListener * listener, IndicateListe { return get_server_property(listener, server, callback, "desktop", data); } + -- cgit v1.2.3 From 8b91e1dd1bcd3f72cd414244ed434cc98227de5d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 13:34:24 -0600 Subject: Adding in some debug messages and making the signal use the original key to broadcast itself. --- libindicate/indicator.c | 4 +++- libindicate/server.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'libindicate') diff --git a/libindicate/indicator.c b/libindicate/indicator.c index 3b6581b..1c6225e 100644 --- a/libindicate/indicator.c +++ b/libindicate/indicator.c @@ -293,9 +293,11 @@ set_property (IndicateIndicator * indicator, const gchar * key, const gchar * da if (current == NULL || strcmp(current, data)) { /* If the value has changed or there is no value */ gchar * newkey = g_strdup(key); + /* g_debug("What is newkey? %s", newkey); */ g_hash_table_insert(priv->properties, newkey, g_strdup(data)); if (indicate_indicator_is_visible(indicator)) { - g_signal_emit(indicator, signals[MODIFIED], 0, newkey, TRUE); + /* g_debug("Indicator property modified: %s %s", key, data); */ + g_signal_emit(indicator, signals[MODIFIED], 0, key, TRUE); } } diff --git a/libindicate/server.c b/libindicate/server.c index 0c74376..ee20321 100644 --- a/libindicate/server.c +++ b/libindicate/server.c @@ -352,6 +352,7 @@ indicator_hide_cb (IndicateIndicator * indicator, IndicateServer * server) static void indicator_modified_cb (IndicateIndicator * indicator, gchar * property, IndicateServer * server) { + /* g_debug("Indicator Modified: %d %s", indicate_indicator_get_id(indicator), property); */ g_signal_emit(server, signals[INDICATOR_MODIFIED], 0, indicate_indicator_get_id(indicator), property, TRUE); } -- cgit v1.2.3 From e921d552aff2da24cacd119e24bc73a90133c4d4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 13:44:45 -0600 Subject: Fixing some prototypes to fix warnings and errors we haven't yet encountered. Also setting the type so that our switch statement actually works. --- libindicate/listener.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libindicate') diff --git a/libindicate/listener.c b/libindicate/listener.c index 4dc874d..c4b1882 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -706,7 +706,7 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us } error = NULL; - g_input_stream_close(input, NULL, error); + g_input_stream_close(input, NULL, &error); if (error != NULL) { g_warning("Unable to close input stream: %s", error->message); g_error_free(error); @@ -714,7 +714,7 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us break; } case PROPERTY_TYPE_TIME: { - indicate_listener_get_property_time_cb cb = (indicate_listener_get_property_icon_cb)get_property_data->cb; + indicate_listener_get_property_time_cb cb = (indicate_listener_get_property_time_cb)get_property_data->cb; GTimeVal time; if (g_time_val_from_iso8601(OUT_value, &time)) { cb(get_property_data->listener, get_property_data->server, get_property_data->indicator, get_property_data->property, &time, get_property_data->data); @@ -732,6 +732,7 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us static void get_property_helper (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GCallback callback, gpointer data, get_property_type prop_type) { + /* g_debug("get_property_helper: %s %d", property, prop_type); */ /* TODO: Do we need to somehow refcount the server/indicator while we're waiting on this? */ IndicateListenerPrivate * priv = INDICATE_LISTENER_GET_PRIVATE(listener); @@ -748,6 +749,7 @@ get_property_helper (IndicateListener * listener, IndicateListenerServer * serve get_property_data->server = server; get_property_data->indicator = indicator; get_property_data->property = g_strdup(property); + get_property_data->type = prop_type; org_freedesktop_indicator_get_indicator_property_async (proxyt->proxy , INDICATE_LISTENER_INDICATOR_ID(indicator), property, get_property_cb, get_property_data); return; -- cgit v1.2.3 From 1a8b895c2815ad2055fbd579df4f6f53189f702c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 14:03:52 -0600 Subject: Changing the icon data to be base64 encoded, should have done that originally, how silly. --- libindicate/listener.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libindicate') diff --git a/libindicate/listener.c b/libindicate/listener.c index c4b1882..b704236 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -687,10 +687,14 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us } case PROPERTY_TYPE_ICON: { indicate_listener_get_property_icon_cb cb = (indicate_listener_get_property_icon_cb)get_property_data->cb; + + gsize length = 0; + guchar * icondata = g_base64_decode(OUT_value, &length); - GInputStream * input = g_memory_input_stream_new_from_data(OUT_value, strlen(OUT_value) - 1, NULL); + GInputStream * input = g_memory_input_stream_new_from_data(icondata, length, NULL); if (input == NULL) { g_warning("Cound not create input stream from icon property data"); + g_free(icondata); break; } @@ -711,6 +715,7 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us g_warning("Unable to close input stream: %s", error->message); g_error_free(error); } + g_free(icondata); break; } case PROPERTY_TYPE_TIME: { -- cgit v1.2.3 From a2e77d6839d9236118886f2cdc761ff298ff43c1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 14:17:18 -0600 Subject: Adding in the function to take a pixbuf, turn it into a png, base64 encode it and then send it across the wire. --- libindicate/indicator.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'libindicate') diff --git a/libindicate/indicator.c b/libindicate/indicator.c index 1c6225e..d647930 100644 --- a/libindicate/indicator.c +++ b/libindicate/indicator.c @@ -240,8 +240,24 @@ indicate_indicator_set_property (IndicateIndicator * indicator, const gchar * ke void indicate_indicator_set_property_icon (IndicateIndicator * indicator, const gchar * key, const GdkPixbuf * data) { + GOutputStream * output = g_memory_output_stream_new(NULL, 0, g_realloc, g_free); + if (!gdk_pixbuf_save_to_stream(data, output, "png", NULL, NULL, "compress", 9)) { + g_output_stream_close(output, NULL, NULL); + g_warning("Unable to create pixbuf data stream"); + return; + } + + gpointer png_data = g_memory_output_stream_get_data(output); + gsize png_data_len = g_memory_output_stream_get_data_size(output); + gchar * prop_str = g_base64_encode(png_data, png_data_len); + indicate_indicator_set_property(indicator, key, prop_str); + + g_free(prop_str); + g_output_stream_close(output, NULL, NULL); + + return; } void -- cgit v1.2.3 From 6b3a32c443111a23d2953d85be2f2f3b930ed405 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 16:43:00 -0600 Subject: Changing from using a memory stream to using a buffer, the memory stream one seems to be broken. --- libindicate/indicator.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'libindicate') diff --git a/libindicate/indicator.c b/libindicate/indicator.c index d647930..e4bae76 100644 --- a/libindicate/indicator.c +++ b/libindicate/indicator.c @@ -240,22 +240,32 @@ indicate_indicator_set_property (IndicateIndicator * indicator, const gchar * ke void indicate_indicator_set_property_icon (IndicateIndicator * indicator, const gchar * key, const GdkPixbuf * data) { - GOutputStream * output = g_memory_output_stream_new(NULL, 0, g_realloc, g_free); - - if (!gdk_pixbuf_save_to_stream(data, output, "png", NULL, NULL, "compress", 9)) { - g_output_stream_close(output, NULL, NULL); - g_warning("Unable to create pixbuf data stream"); + if (!GDK_IS_PIXBUF(data)) { + g_warning("Invalide GdkPixbuf"); return; } - gpointer png_data = g_memory_output_stream_get_data(output); - gsize png_data_len = g_memory_output_stream_get_data_size(output); + GError * error = NULL; + gchar * png_data; + gsize png_data_len; + + if (!gdk_pixbuf_save_to_buffer(data, &png_data, &png_data_len, "png", &error, NULL)) { + if (error == NULL) { + g_warning("Unable to create pixbuf data stream: %d", png_data_len); + } else { + g_warning("Unable to create pixbuf data stream: %s", error->message); + g_error_free(error); + error = NULL; + } + + return; + } gchar * prop_str = g_base64_encode(png_data, png_data_len); indicate_indicator_set_property(indicator, key, prop_str); g_free(prop_str); - g_output_stream_close(output, NULL, NULL); + g_free(png_data); return; } -- cgit v1.2.3