From 31d107e227f9e6d663ab43bfbecdc5b81bc3ae64 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 08:20:29 -0600 Subject: Using the time property function --- tests/im-client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/im-client.c b/tests/im-client.c index db04b8e..255ca37 100644 --- a/tests/im-client.c +++ b/tests/im-client.c @@ -45,10 +45,12 @@ main (int argc, char ** argv) indicator = indicate_indicator_message_new(); indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "subtype", "im"); indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "sender", "Ted Gould"); - indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "time", "11:11"); + GTimeVal time; g_get_current_time(&time); + indicate_indicator_set_property_time(INDICATE_INDICATOR(indicator), "time", &time); indicate_indicator_show(INDICATE_INDICATOR(indicator)); - indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "time", "11:12"); + g_get_current_time(&time); + indicate_indicator_set_property_time(INDICATE_INDICATOR(indicator), "time", &time); g_signal_connect(G_OBJECT(indicator), INDICATE_INDICATOR_SIGNAL_DISPLAY, G_CALLBACK(display), NULL); -- cgit v1.2.3 From e1c5a98895875aaa39aeb274e631f19fb0cb6414 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 08:24:36 -0600 Subject: Adding in a timer function to change the time every three minutes or so in order to test modifying times. --- tests/im-client.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests') diff --git a/tests/im-client.c b/tests/im-client.c index 255ca37..3670bfa 100644 --- a/tests/im-client.c +++ b/tests/im-client.c @@ -23,6 +23,20 @@ with this program. If not, see . #include "libindicate/server.h" #include "libindicate/indicator-message.h" +static gboolean +timeout_cb (gpointer data) +{ + g_debug("Modifying time"); + + IndicateIndicator * indicator = INDICATE_INDICATOR(data); + + GTimeVal time; + g_get_current_time(&time); + indicate_indicator_set_property_time(INDICATE_INDICATOR(indicator), "time", &time); + + return TRUE; +} + static void display (IndicateIndicator * indicator, gpointer data) { @@ -54,6 +68,8 @@ main (int argc, char ** argv) g_signal_connect(G_OBJECT(indicator), INDICATE_INDICATOR_SIGNAL_DISPLAY, G_CALLBACK(display), NULL); + g_timeout_add_seconds(180, timeout_cb, indicator); + g_main_loop_run(g_main_loop_new(NULL, FALSE)); return 0; -- cgit v1.2.3 From 8a2cf3491cfd800cf6525b4d9180136976809311 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 08:31:14 -0600 Subject: Setting the properties property and picking up Empathy's desktop file --- tests/im-client.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/im-client.c b/tests/im-client.c index 3670bfa..0731468 100644 --- a/tests/im-client.c +++ b/tests/im-client.c @@ -49,10 +49,8 @@ main (int argc, char ** argv) g_type_init(); IndicateServer * server = indicate_server_ref_default(); - GValue value = {0}; - g_value_init(&value, G_TYPE_STRING); - g_value_set_static_string(&value, "message.im"); - g_object_set_property(G_OBJECT(server), "type", &value); + indicate_server_set_type(server, "message.im"); + indicate_server_set_desktop_file(server, "/usr/share/applications/empathy.desktop"); IndicateIndicatorMessage * indicator; -- cgit v1.2.3 From 1a5e21eb86c396d5535bfa4f74255740c8ee25d3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 13:10:19 -0600 Subject: Added in a way to print the values of properties while they change. More later, but a start. --- tests/listen-and-print.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'tests') diff --git a/tests/listen-and-print.c b/tests/listen-and-print.c index 6e1104d..dca299b 100644 --- a/tests/listen-and-print.c +++ b/tests/listen-and-print.c @@ -22,10 +22,61 @@ with this program. If not, see . #include #include "libindicate/listener.h" +static void +show_property_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data) +{ + g_debug("Indicator Property: %s %d %s %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server), INDICATE_LISTENER_INDICATOR_ID(indicator), property, propertydata); + return; +} + +static void +show_property_time_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GTimeVal * propertydata, gpointer data) +{ + time_t timet; + struct tm * structtm; + + timet = propertydata->tv_sec; + structtm = localtime(&timet); + + gchar timestring[80]; + strftime(timestring, 80, "%I:%M", structtm); + + g_debug("Indicator Property: %s %d %s %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server), INDICATE_LISTENER_INDICATOR_ID(indicator), property, timestring); + return; +} + +static void +show_property_icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GdkPixbuf * propertydata, gpointer data) +{ + + +} + +static void +show_property (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property) +{ + if (!strcmp(property, "icon")) { + indicate_listener_get_property_icon(listener, server, indicator, property, show_property_icon_cb, NULL); + } else if (!strcmp(property, "time")) { + indicate_listener_get_property_time(listener, server, indicator, property, show_property_time_cb, NULL); + } else { + indicate_listener_get_property(listener, server, indicator, property, show_property_cb, NULL); + } + + return; +} + +static void +get_properties (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator) +{ + //TODO: Not in API yet. +} + static void indicator_added (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data) { g_debug("Indicator Added: %s %d %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server), INDICATE_LISTENER_INDICATOR_ID(indicator), type); + get_properties(listener, server, indicator); } static void @@ -38,6 +89,7 @@ static void indicator_modified (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gchar * property, gpointer data) { g_debug("Indicator Modified: %s %d %s %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server), INDICATE_LISTENER_INDICATOR_ID(indicator), type, property); + show_property(listener, server, indicator, property); } static void -- cgit v1.2.3 From 52cd253079f2d50f0b14e4369f0604fd1ff6ab64 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 13:47:24 -0600 Subject: Seems like a better name --- tests/im-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/im-client.c b/tests/im-client.c index 0731468..aa2ef8c 100644 --- a/tests/im-client.c +++ b/tests/im-client.c @@ -56,7 +56,7 @@ main (int argc, char ** argv) indicator = indicate_indicator_message_new(); indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "subtype", "im"); - indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "sender", "Ted Gould"); + indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "sender", "IM Client Test"); GTimeVal time; g_get_current_time(&time); indicate_indicator_set_property_time(INDICATE_INDICATOR(indicator), "time", &time); indicate_indicator_show(INDICATE_INDICATOR(indicator)); -- cgit v1.2.3 From 3eb4043f4a65d15996b8463502bef5b680019a57 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 16:43:32 -0600 Subject: Adding in support for icons, specifically passing them back and forth on the bus --- tests/im-client.c | 20 ++++++++++++++++++-- tests/listen-and-print.c | 5 +++-- 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/im-client.c b/tests/im-client.c index aa2ef8c..d47903b 100644 --- a/tests/im-client.c +++ b/tests/im-client.c @@ -23,10 +23,14 @@ with this program. If not, see . #include "libindicate/server.h" #include "libindicate/indicator-message.h" +gchar * patha = "/usr/share/icons/hicolor/16x16/apps/empathy.png"; +gchar * pathb = "/usr/share/icons/hicolor/22x22/apps/empathy.png"; +gchar * lastpath = NULL; + static gboolean timeout_cb (gpointer data) { - g_debug("Modifying time"); + g_debug("Modifying properties"); IndicateIndicator * indicator = INDICATE_INDICATOR(data); @@ -34,6 +38,18 @@ timeout_cb (gpointer data) g_get_current_time(&time); indicate_indicator_set_property_time(INDICATE_INDICATOR(indicator), "time", &time); + if (lastpath == patha) { + lastpath = pathb; + } else { + lastpath = patha; + } + + GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(lastpath, NULL); + g_return_val_if_fail(pixbuf != NULL, TRUE); + + indicate_indicator_set_property_icon(INDICATE_INDICATOR(indicator), "icon", pixbuf); + g_object_unref(G_OBJECT(pixbuf)); + return TRUE; } @@ -66,7 +82,7 @@ main (int argc, char ** argv) g_signal_connect(G_OBJECT(indicator), INDICATE_INDICATOR_SIGNAL_DISPLAY, G_CALLBACK(display), NULL); - g_timeout_add_seconds(180, timeout_cb, indicator); + g_timeout_add_seconds(10, timeout_cb, indicator); g_main_loop_run(g_main_loop_new(NULL, FALSE)); diff --git a/tests/listen-and-print.c b/tests/listen-and-print.c index dca299b..a4c8c25 100644 --- a/tests/listen-and-print.c +++ b/tests/listen-and-print.c @@ -48,8 +48,9 @@ show_property_time_cb (IndicateListener * listener, IndicateListenerServer * ser static void show_property_icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GdkPixbuf * propertydata, gpointer data) { - - + g_debug("Indicator Property: %s %d %s %dx%d", INDICATE_LISTENER_SERVER_DBUS_NAME(server), INDICATE_LISTENER_INDICATOR_ID(indicator), property, gdk_pixbuf_get_width(propertydata), gdk_pixbuf_get_height(propertydata)); + g_object_unref(G_OBJECT(propertydata)); + return; } static void -- cgit v1.2.3 From 2c157aa63cbc5904ca8ae1481a705309be6b7ed2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Feb 2009 16:44:59 -0600 Subject: Forgot to set the timer back to something reasonable! --- tests/im-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/im-client.c b/tests/im-client.c index d47903b..3419a9d 100644 --- a/tests/im-client.c +++ b/tests/im-client.c @@ -82,7 +82,7 @@ main (int argc, char ** argv) g_signal_connect(G_OBJECT(indicator), INDICATE_INDICATOR_SIGNAL_DISPLAY, G_CALLBACK(display), NULL); - g_timeout_add_seconds(10, timeout_cb, indicator); + g_timeout_add_seconds(180, timeout_cb, indicator); g_main_loop_run(g_main_loop_new(NULL, FALSE)); -- cgit v1.2.3