From 981daa0d406ddf15038fc89da6f130cfa7093352 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 12:46:47 -0600 Subject: Changing from a timeout to a signal of change. --- tests/test-glib-proxy-server.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/test-glib-proxy-server.c') diff --git a/tests/test-glib-proxy-server.c b/tests/test-glib-proxy-server.c index cba8ec7..7dcae52 100644 --- a/tests/test-glib-proxy-server.c +++ b/tests/test-glib-proxy-server.c @@ -71,7 +71,7 @@ static DbusmenuServer * server = NULL; static GMainLoop * mainloop = NULL; static gboolean -timer_func (gpointer data) +layout_change (DbusmenuMenuitem * oldroot, guint timestamp, gpointer data) { if (layouts[layouton].id == -1) { g_main_loop_quit(mainloop); @@ -80,6 +80,7 @@ timer_func (gpointer data) g_debug("Updating to Layout %d", layouton); DbusmenuMenuitem * mi = layout2menuitem(&layouts[layouton]); + g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(layout_change), NULL); dbusmenu_server_set_root(server, mi); g_object_unref(G_OBJECT(mi)); layouton++; @@ -112,8 +113,9 @@ main (int argc, char ** argv) server = dbusmenu_server_new("/org/test"); - timer_func(NULL); - g_timeout_add(2500, timer_func, NULL); + DbusmenuMenuitem * root = dbusmenu_menuitem_new(); + g_signal_connect(G_OBJECT(root), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(layout_change), NULL); + dbusmenu_server_set_root(server, root); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 0df9435e0859a16e5b36d6964bcd38ca470bed5e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 13:07:15 -0600 Subject: Adding a timeout to the server --- tests/test-glib-proxy-server.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests/test-glib-proxy-server.c') diff --git a/tests/test-glib-proxy-server.c b/tests/test-glib-proxy-server.c index 7dcae52..14bc0b7 100644 --- a/tests/test-glib-proxy-server.c +++ b/tests/test-glib-proxy-server.c @@ -69,6 +69,15 @@ layout2menuitem (proplayout_t * layout) static guint layouton = 0; static DbusmenuServer * server = NULL; static GMainLoop * mainloop = NULL; +static guint death_timer = 0; + +static gboolean +timer_func (gpointer data) +{ + g_debug("Death timer. Oops. Got to: %d", layouton); + g_main_loop_quit(mainloop); + return FALSE; +} static gboolean layout_change (DbusmenuMenuitem * oldroot, guint timestamp, gpointer data) @@ -85,6 +94,10 @@ layout_change (DbusmenuMenuitem * oldroot, guint timestamp, gpointer data) g_object_unref(G_OBJECT(mi)); layouton++; + /* Extend our death */ + g_source_remove(death_timer); + death_timer = g_timeout_add_seconds(2, timer_func, data); + return TRUE; } @@ -117,6 +130,8 @@ main (int argc, char ** argv) g_signal_connect(G_OBJECT(root), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(layout_change), NULL); dbusmenu_server_set_root(server, root); + death_timer = g_timeout_add_seconds(2, timer_func, NULL); + mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- 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-server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/test-glib-proxy-server.c') diff --git a/tests/test-glib-proxy-server.c b/tests/test-glib-proxy-server.c index 14bc0b7..4fa0844 100644 --- a/tests/test-glib-proxy-server.c +++ b/tests/test-glib-proxy-server.c @@ -90,6 +90,7 @@ layout_change (DbusmenuMenuitem * oldroot, guint timestamp, gpointer data) DbusmenuMenuitem * mi = layout2menuitem(&layouts[layouton]); g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(layout_change), NULL); + dbusmenu_menuitem_property_set_int(mi, LAYOUT_ON, layouton); dbusmenu_server_set_root(server, mi); g_object_unref(G_OBJECT(mi)); layouton++; -- cgit v1.2.3 From 5e7f04b944d0fd52b38697a6bfdf7df0e61aa83a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Feb 2010 15:16:29 -0600 Subject: No dummy update --- tests/test-glib-proxy-server.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'tests/test-glib-proxy-server.c') diff --git a/tests/test-glib-proxy-server.c b/tests/test-glib-proxy-server.c index 4fa0844..f32b426 100644 --- a/tests/test-glib-proxy-server.c +++ b/tests/test-glib-proxy-server.c @@ -79,12 +79,12 @@ timer_func (gpointer data) return FALSE; } -static gboolean +static void layout_change (DbusmenuMenuitem * oldroot, guint timestamp, gpointer data) { if (layouts[layouton].id == -1) { g_main_loop_quit(mainloop); - return FALSE; + return; } g_debug("Updating to Layout %d", layouton); @@ -96,10 +96,12 @@ layout_change (DbusmenuMenuitem * oldroot, guint timestamp, gpointer data) layouton++; /* Extend our death */ - g_source_remove(death_timer); - death_timer = g_timeout_add_seconds(2, timer_func, data); + if (death_timer != 0) { + g_source_remove(death_timer); + } + death_timer = g_timeout_add_seconds(4, timer_func, data); - return TRUE; + return; } int @@ -126,12 +128,7 @@ main (int argc, char ** argv) } server = dbusmenu_server_new("/org/test"); - - DbusmenuMenuitem * root = dbusmenu_menuitem_new(); - g_signal_connect(G_OBJECT(root), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(layout_change), NULL); - dbusmenu_server_set_root(server, root); - - death_timer = g_timeout_add_seconds(2, timer_func, NULL); + layout_change(NULL, 0, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3