static void fill_root_node(struct choosenode *cn);
static void fill_directory_node(struct choosenode *cn);
static void got_files(void *v, int nvec, char **vec);
-static void got_resolved_file(void *v, const char *track);
+static void got_resolved_file(void *v, const char *error, const char *track);
static void got_dirs(void *v, int nvec, char **vec);
static void expand_node(struct choosenode *cn, int contingent);
int n;
D(("got_files %d files for %s %s", nvec, cn->path, cnflags(cn)));
- /* Complicated by the need to resolve aliases. We can save a bit of effort
- * by re-using cbd though. */
+ /* Complicated by the need to resolve aliases. */
cn->flags &= ~CN_GETTING_FILES;
--gets_in_flight;
if((cn->pending = nvec)) {
cn->flags |= CN_RESOLVING_FILES;
for(n = 0; n < nvec; ++n) {
- disorder_eclient_resolve(client, got_resolved_file, vec[n], cbd);
+ disorder_eclient_resolve(client, got_resolved_file, vec[n], cn);
++gets_in_flight;
}
}
}
/** @brief Called with an alias resolved filename */
-static void got_resolved_file(void *v, const char *track) {
- struct callbackdata *cbd = v;
- struct choosenode *cn = cbd->u.choosenode, *file_cn;
-
- D(("resolved %s %s %d left", cn->path, cnflags(cn), cn->pending - 1));
- /* TODO as below */
- file_cn = newnode(cn, track,
- trackname_transform("track", track, "display"),
- trackname_transform("track", track, "sort"),
- 0/*flags*/, 0/*fill*/);
- --gets_in_flight;
- /* Only bother updating when we've got the lot */
- if(--cn->pending == 0) {
- cn->flags &= ~CN_RESOLVING_FILES;
- updated_node(cn, gets_in_flight == 0, "got_resolved_file");
- if(!(cn->flags & CN_GETTING_ANY))
- filled(cn);
+static void got_resolved_file(void *v, const char *error, const char *track) {
+ struct choosenode *const cn = v, *file_cn;
+
+ if(error) {
+ popup_protocol_error(0, error);
+ } else {
+ D(("resolved %s %s %d left", cn->path, cnflags(cn), cn->pending - 1));
+ /* TODO as below */
+ file_cn = newnode(cn, track,
+ trackname_transform("track", track, "display"),
+ trackname_transform("track", track, "sort"),
+ 0/*flags*/, 0/*fill*/);
+ --gets_in_flight;
+ /* Only bother updating when we've got the lot */
+ if(--cn->pending == 0) {
+ cn->flags &= ~CN_RESOLVING_FILES;
+ updated_node(cn, gets_in_flight == 0, "got_resolved_file");
+ if(!(cn->flags & CN_GETTING_ANY))
+ filled(cn);
+ }
}
}
/* Create the popup menus */
NW(menu);
track_menu = gtk_menu_new();
- gtk_widget_set_style(track_menu, tool_style);
g_signal_connect(track_menu, "destroy", G_CALLBACK(gtk_widget_destroyed),
&track_menu);
for(n = 0; track_menuitems[n].name; ++n) {
NW(menu_item);
track_menuitems[n].w =
gtk_menu_item_new_with_label(track_menuitems[n].name);
- gtk_widget_set_style(track_menuitems[n].w, tool_style);
gtk_menu_attach(GTK_MENU(track_menu), track_menuitems[n].w,
0, 1, n, n + 1);
}
NW(menu);
dir_menu = gtk_menu_new();
- gtk_widget_set_style(dir_menu, tool_style);
g_signal_connect(dir_menu, "destroy", G_CALLBACK(gtk_widget_destroyed),
&dir_menu);
for(n = 0; dir_menuitems[n].name; ++n) {
NW(menu_item);
dir_menuitems[n].w =
gtk_menu_item_new_with_label(dir_menuitems[n].name);
- gtk_widget_set_style(dir_menuitems[n].w, tool_style);
gtk_menu_attach(GTK_MENU(dir_menu), dir_menuitems[n].w,
0, 1, n, n + 1);
}