diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:03:46 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:03:46 +0200 |
| commit | b4d146190da79eaf88b63d38e7d0d40856b5262f (patch) | |
| tree | cd3b5e99ccb2ba8a7fd32fe20d78b9c6563ef82f /tests/service-version-good-service.c | |
| parent | 34b4a4d73f886573fc992d0618f44817ec12c3a5 (diff) | |
| parent | d14f25ad6ec36e956cd2d2c031147b8cb2fddec3 (diff) | |
| download | libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.tar.gz libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.tar.bz2 libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.zip | |
Merging new upstream release and some changes from Ubuntu.
Don't drop debian/source
* Merged in fix for (LP: #603489)
* New upstream release.
* Removing checking for style properties that aren't used.
* Make it so that a watcher dying is the same as unregistering.
* Merge debian changes
* Drop debian/source/*
* debian/control: Switch VCS for this branch to be the indicator
applet developers branch.
Diffstat (limited to 'tests/service-version-good-service.c')
| -rw-r--r-- | tests/service-version-good-service.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c index bcfe46d..12a6a32 100644 --- a/tests/service-version-good-service.c +++ b/tests/service-version-good-service.c @@ -5,12 +5,19 @@ static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; +static IndicatorService * is = NULL; gboolean timeout (gpointer data) { passed = FALSE; g_debug("Timeout with no shutdown."); + + if (is != NULL) { + g_object_unref(is); + is = NULL; + } + g_main_loop_quit(mainloop); return FALSE; } @@ -20,6 +27,12 @@ shutdown (void) { g_debug("Shutdown"); passed = TRUE; + + if (is != NULL) { + g_object_unref(is); + is = NULL; + } + g_main_loop_quit(mainloop); return; } @@ -29,7 +42,7 @@ main (int argc, char ** argv) { g_type_init(); - IndicatorService * is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); + is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); g_timeout_add_seconds(1, timeout, NULL); |