aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-16 22:35:03 -0600
committerTed Gould <ted@gould.cx>2010-02-16 22:35:03 -0600
commit0aa8119e4813f84d5c0f1a8001bce69518d1d756 (patch)
tree1ce2bc5c5fcd2edbb71fd6f5117acbd2089a0d91
parentb10dd199a267842284f9baaf9e6e065ed9bad109 (diff)
downloadlibayatana-indicator-0aa8119e4813f84d5c0f1a8001bce69518d1d756.tar.gz
libayatana-indicator-0aa8119e4813f84d5c0f1a8001bce69518d1d756.tar.bz2
libayatana-indicator-0aa8119e4813f84d5c0f1a8001bce69518d1d756.zip
Checking to ensure the right nick is in the list
-rw-r--r--libindicator/indicator-desktop-shortcuts.c2
-rw-r--r--tests/test-desktop-shortcuts.c2
2 files changed, 3 insertions, 1 deletions
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));