From 0aa8119e4813f84d5c0f1a8001bce69518d1d756 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 16 Feb 2010 22:35:03 -0600 Subject: Checking to ensure the right nick is in the list --- libindicator/indicator-desktop-shortcuts.c | 2 ++ tests/test-desktop-shortcuts.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libindicator/indicator-desktop-shortcuts.c b/libindicator/indicator-desktop-shortcuts.c index 4cebbf2..22aed73 100644 --- a/libindicator/indicator-desktop-shortcuts.c +++ b/libindicator/indicator-desktop-shortcuts.c @@ -322,6 +322,7 @@ is_valid_nick (gchar ** list, const gchar * nick) { if (*list == NULL) return FALSE; + g_debug("Checking Nick: %s", list[0]); if (g_strcmp0(list[0], nick) == 0) return TRUE; return is_valid_nick(&list[1], nick); @@ -486,6 +487,7 @@ indicator_desktop_shortcuts_nick_exec (IndicatorDesktopShortcuts * ids, const gc g_free(name); g_free(exec); + g_debug("Desktop file: \n%s", desktopdata); GKeyFile * launcher = g_key_file_new(); g_key_file_load_from_data(launcher, desktopdata, -1, G_KEY_FILE_NONE, &error); diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c index a4e767a..c2344db 100644 --- a/tests/test-desktop-shortcuts.c +++ b/tests/test-desktop-shortcuts.c @@ -100,7 +100,7 @@ test_desktop_shortcuts_launch (void) g_assert(ids != NULL); const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(ids); - g_assert(nicks != NULL); + g_assert(nicks_contains(nicks, "touch")); g_assert(indicator_desktop_shortcuts_nick_exec(ids, "touch")); g_assert(g_file_test("test-desktop-shortcuts-touch-test", G_FILE_TEST_EXISTS)); -- cgit v1.2.3