Refetch queue on pause/resume so that start times are always right (or

[disorder] / disobedience / choose.c

diff --git a/disobedience/choose.c b/disobedience/choose.c
index 8e3a576deb8f9d990c19faa72327de1f66c58a21..ff5e72b52eabd4bfc4f605f225f3e5e24f1da226 100644 (file)
--- a/disobedience/choose.c
+++ b/disobedience/choose.c
@@ -1,3 +1,4 @@
+
 /*
  * This file is part of DisOrder
  * Copyright (C) 2006-2008 Richard Kettlewell
@@ -501,8 +502,6 @@ static void got_dirs(void *v, const char *error, int nvec, char **vec) {
   
 /** @brief Fill a child node */
 static void fill_directory_node(struct choosenode *cn) {
-  struct callbackdata *cbd;
-
   D(("fill_directory_node %s", cn->path));
   /* TODO: caching */
   if(cn->flags & CN_GETTING_ANY)
@@ -510,12 +509,8 @@ static void fill_directory_node(struct choosenode *cn) {
   assert(report_label != 0);
   gtk_label_set_text(GTK_LABEL(report_label), "getting files");
   clear_children(cn);
-  cbd = xmalloc(sizeof *cbd);
-  cbd->u.choosenode = cn;
-  disorder_eclient_dirs(client, got_dirs, cn->path, 0, cbd);
-  cbd = xmalloc(sizeof *cbd);
-  cbd->u.choosenode = cn;
-  disorder_eclient_files(client, got_files, cn->path, 0, cbd);
+  disorder_eclient_dirs(client, got_dirs, cn->path, 0, cn);
+  disorder_eclient_files(client, got_files, cn->path, 0, cn);
   cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS;
   gets_in_flight += 2;
 }
@@ -790,6 +785,8 @@ static void initiate_search(void) {
 static void clearsearch_clicked(GtkButton attribute((unused)) *button,
                                 gpointer attribute((unused)) userdata) {
   gtk_entry_set_text(GTK_ENTRY(searchentry), "");
+  /* Put the input focus back */
+  gtk_widget_grab_focus(searchentry);
 }
 
 /** @brief Called when the 'next search result' button is clicked */
@@ -1268,12 +1265,15 @@ static void activate_track_properties(GtkMenuItem attribute((unused)) *menuitem,
 /** @brief Determine whether the menu's play option should be sensitive */
 static gboolean sensitive_track_play(struct choosenode attribute((unused)) *cn) {
   return (!!files_selected
-          && (disorder_eclient_state(client) & DISORDER_CONNECTED));
+          && (disorder_eclient_state(client) & DISORDER_CONNECTED)
+          && (last_rights & RIGHT_PLAY));
 }
 
 /** @brief Determine whether the menu's properties option should be sensitive */
 static gboolean sensitive_track_properties(struct choosenode attribute((unused)) *cn) {
-  return !!files_selected && (disorder_eclient_state(client) & DISORDER_CONNECTED);
+  return (!!files_selected
+          && (disorder_eclient_state(client) & DISORDER_CONNECTED)
+          && (last_rights & RIGHT_PREFS));
 }
 
 /* Directory menu items ---------------------------------------------------- */
@@ -1378,62 +1378,44 @@ static gboolean sensitive_dir_select(struct choosenode attribute((unused)) *cn)
   return TRUE;
 }
 
-
-
 /* Main menu plumbing ------------------------------------------------------ */
 
 /** @brief Determine whether the edit menu's properties option should be sensitive */
-static int choose_properties_sensitive(GtkWidget attribute((unused)) *w) {
+static int choose_properties_sensitive(void attribute((unused)) *extra) {
   return !!files_selected && (disorder_eclient_state(client) & DISORDER_CONNECTED);
 }
 
-/** @brief Determine whether the edit menu's select all option should be sensitive
- *
- * TODO not implemented,  see also choose_selectall_activate()
- */
-static int choose_selectall_sensitive(GtkWidget attribute((unused)) *w) {
-  return FALSE;
-}
-
-/** @brief Determine whether the edit menu's select none option should be sensitive
- *
- * TODO not implemented,  see also choose_selectnone_activate()
- */
-static int choose_selectnone_sensitive(GtkWidget attribute((unused)) *w) {
-  return FALSE;
-}
-
 /** @brief Called when the edit menu's properties option is activated */
-static void choose_properties_activate(GtkWidget attribute((unused)) *w) {
+static void choose_properties_activate(void attribute((unused)) *extra) {
   activate_track_properties(0, 0);
 }
 
-/** @brief Called when the edit menu's select all option is activated
- *
- * TODO not implemented, see choose_selectall_sensitive() */
-static void choose_selectall_activate(GtkWidget attribute((unused)) *w) {
-}
-
-/** @brief Called when the edit menu's select none option is activated
- *
- * TODO not implemented, see choose_selectnone_sensitive() */
-static void choose_selectnone_activate(GtkWidget attribute((unused)) *w) {
+/** @brief Called when the choose tab is selected */
+static void choose_tab_selected(void) {
+  gtk_widget_grab_focus(searchentry);
 }
 
 /** @brief Main menu callbacks for Choose screen */
 static const struct tabtype tabtype_choose = {
   choose_properties_sensitive,
-  choose_selectall_sensitive,
-  choose_selectnone_sensitive,
+  NULL/*choose_selectall_sensitive*/,
+  NULL/*choose_selectnone_sensitive*/,
   choose_properties_activate,
-  choose_selectall_activate,
-  choose_selectnone_activate,
+  NULL/*choose_selectall_activate*/,
+  NULL/*choose_selectnone_activate*/,
+  choose_tab_selected,
+  0
 };
 
 /* Public entry points ----------------------------------------------------- */
 
-/** @brief Called to entirely reset the choose screen */
-static void choose_reset(void) {
+/** @brief Called when we have just logged in
+ *
+ * Entirely resets the choose tab.
+ */
+static void choose_logged_in(const char attribute((unused)) *event,
+                             void attribute((unused)) *eventdata,
+                             void attribute((unused)) *callbackdata) {
   if(root)
     undisplay_tree(root);
   root = newnode(0/*parent*/, "<root>", "All files", "",
@@ -1512,8 +1494,8 @@ GtkWidget *choose_widget(void) {
   NW(layout);
   chooselayout = gtk_layout_new(0, 0);
   gtk_widget_set_style(chooselayout, layout_style);
-  choose_reset();
-  register_reset(choose_reset);
+  choose_logged_in(0, 0, 0);
+  event_register("logged-in", choose_logged_in, 0);
   /* Create the popup menus */
   NW(menu);
   track_menu = gtk_menu_new();