From 7243d998da4d037d4afc94d89cae05966a7ed364 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 12:56:24 -0600 Subject: Setting signals back down the pipe --- tests/test-glib-proxy-client.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'tests/test-glib-proxy-client.c') diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index 50ad5d3..36b553a 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -119,7 +119,15 @@ layout_updated (DbusmenuClient * client, gpointer data) return; } layouton++; - g_timeout_add (1500, layout_verify_timer, client); + if (layouton != 0) { + g_timeout_add (1500, layout_verify_timer, client); + } else { + DbusmenuMenuitem * mi = dbusmenu_client_get_root(client); + GValue value = {0}; + g_value_init(&value, G_TYPE_INT); + g_value_set_int(&value, 0); + dbusmenu_menuitem_handle_event(mi, "clicked", &value, layouton); + } return; } @@ -143,6 +151,11 @@ layout_verify_timer (gpointer data) g_main_loop_quit(mainloop); } + GValue value = {0}; + g_value_init(&value, G_TYPE_INT); + g_value_set_int(&value, 0); + dbusmenu_menuitem_handle_event(menuroot, "clicked", &value, layouton); + return FALSE; } -- cgit v1.2.3 From 2912cd25c85d03bd8250b75080a0463f7c3ffd3e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 12:56:56 -0600 Subject: Shorter timeout. --- tests/test-glib-proxy-client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/test-glib-proxy-client.c') diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index 36b553a..4a24172 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -144,7 +144,7 @@ layout_verify_timer (gpointer data) } else { /* Extend our death */ g_source_remove(death_timer); - death_timer = g_timeout_add_seconds(10, timer_func, data); + death_timer = g_timeout_add_seconds(2, timer_func, data); } if (layouts[layouton+1].id == -1) { @@ -167,7 +167,7 @@ main (int argc, char ** argv) DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); - death_timer = g_timeout_add_seconds(10, timer_func, client); + death_timer = g_timeout_add_seconds(2, timer_func, client); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 8630ce1c8e41a45ba83d8f49b517095ed25617d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 13:49:53 -0600 Subject: Starting in the right place --- tests/test-glib-proxy-client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/test-glib-proxy-client.c') diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index 4a24172..fc3eac6 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -26,7 +26,7 @@ with this program. If not, see . #include "test-glib-proxy.h" -static guint layouton = -1; +static guint layouton = -2; static GMainLoop * mainloop = NULL; static gboolean passed = TRUE; static guint death_timer = 0; @@ -119,7 +119,7 @@ layout_updated (DbusmenuClient * client, gpointer data) return; } layouton++; - if (layouton != 0) { + if (layouton != -1) { g_timeout_add (1500, layout_verify_timer, client); } else { DbusmenuMenuitem * mi = dbusmenu_client_get_root(client); -- cgit v1.2.3 From feada06b32e4bcf70a05de8a3669ff07449dc750 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 15:12:21 -0600 Subject: Putting the layout number on the root element --- tests/test-glib-proxy-client.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'tests/test-glib-proxy-client.c') diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index fc3eac6..5cdd7a1 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -30,6 +30,7 @@ static guint layouton = -2; static GMainLoop * mainloop = NULL; static gboolean passed = TRUE; static guint death_timer = 0; +static guint verify_timer = 0; static gboolean verify_props (DbusmenuMenuitem * mi, gchar ** properties) @@ -118,24 +119,27 @@ layout_updated (DbusmenuClient * client, gpointer data) g_debug("\tIgnored, no root"); return; } - layouton++; - if (layouton != -1) { - g_timeout_add (1500, layout_verify_timer, client); - } else { - DbusmenuMenuitem * mi = dbusmenu_client_get_root(client); - GValue value = {0}; - g_value_init(&value, G_TYPE_INT); - g_value_set_int(&value, 0); - dbusmenu_menuitem_handle_event(mi, "clicked", &value, layouton); + if (verify_timer != 0) { + g_source_remove(verify_timer); } + verify_timer = g_timeout_add (2500, layout_verify_timer, client); + + DbusmenuMenuitem * mi = dbusmenu_client_get_root(client); + GValue value = {0}; + g_value_init(&value, G_TYPE_INT); + g_value_set_int(&value, 0); + dbusmenu_menuitem_handle_event(mi, "clicked", &value, layouton); return; } static gboolean layout_verify_timer (gpointer data) { - g_debug("Verifing Layout: %d", layouton); DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(DBUSMENU_CLIENT(data)); + layouton = dbusmenu_menuitem_property_get_int(menuroot, LAYOUT_ON); + + g_debug("Verifing Layout: %d", layouton); + verify_timer = 0; proplayout_t * layout = &layouts[layouton]; if (!verify_root_to_layout(menuroot, layout)) { @@ -144,7 +148,7 @@ layout_verify_timer (gpointer data) } else { /* Extend our death */ g_source_remove(death_timer); - death_timer = g_timeout_add_seconds(2, timer_func, data); + death_timer = g_timeout_add_seconds(4, timer_func, data); } if (layouts[layouton+1].id == -1) { @@ -167,7 +171,7 @@ main (int argc, char ** argv) DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); - death_timer = g_timeout_add_seconds(2, timer_func, client); + death_timer = g_timeout_add_seconds(4, timer_func, client); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From aceec4edeaaca20cebfe894a51e4ce681fa5fa95 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 15:17:38 -0600 Subject: Don't need to send a signal at start --- tests/test-glib-proxy-client.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests/test-glib-proxy-client.c') diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index 5cdd7a1..cb26163 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -122,13 +122,8 @@ layout_updated (DbusmenuClient * client, gpointer data) if (verify_timer != 0) { g_source_remove(verify_timer); } - verify_timer = g_timeout_add (2500, layout_verify_timer, client); - DbusmenuMenuitem * mi = dbusmenu_client_get_root(client); - GValue value = {0}; - g_value_init(&value, G_TYPE_INT); - g_value_set_int(&value, 0); - dbusmenu_menuitem_handle_event(mi, "clicked", &value, layouton); + verify_timer = g_timeout_add (2500, layout_verify_timer, client); return; } -- cgit v1.2.3 From cba26859bdea6cfeb19d3e9b2ceb7a40ab7cb470 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 15:41:56 -0600 Subject: Longer timeout :-/ --- tests/test-glib-proxy-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test-glib-proxy-client.c') diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index cb26163..0ae2e20 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -123,7 +123,7 @@ layout_updated (DbusmenuClient * client, gpointer data) g_source_remove(verify_timer); } - verify_timer = g_timeout_add (2500, layout_verify_timer, client); + verify_timer = g_timeout_add (3000, layout_verify_timer, client); return; } -- cgit v1.2.3