aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-08-20 20:48:52 -0500
committerTed Gould <ted@canonical.com>2009-08-20 20:48:52 -0500
commit33f40e13838d18687507145c98c1cae48c0bc033 (patch)
tree1bf7711b674bccdd7379c443aa91ee49dbeafd73 /src
parentf41d2527cb53f8a5ca091e860b6fd5f25f6ce87a (diff)
downloadayatana-indicator-messages-33f40e13838d18687507145c98c1cae48c0bc033.tar.gz
ayatana-indicator-messages-33f40e13838d18687507145c98c1cae48c0bc033.tar.bz2
ayatana-indicator-messages-33f40e13838d18687507145c98c1cae48c0bc033.zip
Switching the build to take the directory as a parameter
Diffstat (limited to 'src')
-rw-r--r--src/messages-service.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/messages-service.c b/src/messages-service.c
index a4e8870..0e4c296 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -756,12 +756,14 @@ build_launcher (gpointer data)
static gboolean
build_launchers (gpointer data)
{
- if (!g_file_test(SYSTEM_APPS_DIR, G_FILE_TEST_IS_DIR)) {
+ gchar * directory = (gchar *)data;
+
+ if (!g_file_test(directory, G_FILE_TEST_IS_DIR)) {
return FALSE;
}
GError * error = NULL;
- GDir * dir = g_dir_open(SYSTEM_APPS_DIR, 0, &error);
+ GDir * dir = g_dir_open(directory, 0, &error);
if (dir == NULL) {
g_warning("Unable to open system apps directory: %s", error->message);
g_error_free(error);
@@ -771,7 +773,7 @@ build_launchers (gpointer data)
const gchar * filename = NULL;
while ((filename = g_dir_read_name(dir)) != NULL) {
g_debug("Found file: %s", filename);
- gchar * path = g_build_filename(SYSTEM_APPS_DIR, filename, NULL);
+ gchar * path = g_build_filename(directory, filename, NULL);
g_idle_add(build_launcher, path);
}
@@ -815,7 +817,7 @@ main (int argc, char ** argv)
g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_SERVER_REMOVED, G_CALLBACK(server_removed), root_menuitem);
g_idle_add(blacklist_init, NULL);
- g_idle_add(build_launchers, NULL);
+ g_idle_add(build_launchers, SYSTEM_APPS_DIR);
mainloop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(mainloop);