disobedience/disobedience.h: Declare variables as `extern'.

[disorder] / disobedience / queue-generic.c

diff --git a/disobedience/queue-generic.c b/disobedience/queue-generic.c
index de86f299894f3a9dfa5b1556dd2f592c08f70b1e..2c0ac190e221978a02d826076de4fe9ebf6c9b09 100644 (file)
--- a/disobedience/queue-generic.c
+++ b/disobedience/queue-generic.c
@@ -227,6 +227,10 @@ void ql_update_list_store(struct queuelike *ql) {
   }
 }
 
   }
 }
 

+/** @brief Old and new queue data
+ *
+ * Used when updating a @ref queuelike with new data from the server.
+ */

 struct newqueue_data {
   struct queue_entry *old, *new;
 };
 struct newqueue_data {
   struct queue_entry *old, *new;
 };


@@ -323,6 +327,8 @@ void ql_new_queue(struct queuelike *ql,
                          ql->ncolumns + QUEUEPOINTER_COLUMN, nqd->new,
                          -1);
       it = gtk_tree_model_iter_next(GTK_TREE_MODEL(ql->store), iter);
                          ql->ncolumns + QUEUEPOINTER_COLUMN, nqd->new,
                          -1);
       it = gtk_tree_model_iter_next(GTK_TREE_MODEL(ql->store), iter);

+      /* We'll need the new start time */
+      nqd->new->when = q->when;

       ++kept;
     } else {
       /* Delete this row (and move iter to the next one) */
       ++kept;
     } else {
       /* Delete this row (and move iter to the next one) */


@@ -634,7 +640,7 @@ static void ql_drag_data_get_collect(GtkTreeModel *model,
  * @param w Source widget (the tree view)
  * @param dc Drag context
  * @param data Where to put the answer
  * @param w Source widget (the tree view)
  * @param dc Drag context
  * @param data Where to put the answer

- * @param info_ Target @c info parameter
+ * @param info Target @c info parameter

  * @param time_ Time data requested (for some reason not a @c time_t)
  * @param user_data The queuelike
  *
  * @param time_ Time data requested (for some reason not a @c time_t)
  * @param user_data The queuelike
  *


@@ -806,7 +812,7 @@ GtkWidget *init_queuelike(struct queuelike *ql) {
       (ql->columns[n].name,
        r,
        "text", n,
       (ql->columns[n].name,
        r,
        "text", n,

-       "background", ql->ncolumns + BACKGROUND_COLUMN,
+       "cell-background", ql->ncolumns + BACKGROUND_COLUMN,

        "foreground", ql->ncolumns + FOREGROUND_COLUMN,
        (char *)0);
     gtk_tree_view_column_set_resizable(c, TRUE);
        "foreground", ql->ncolumns + FOREGROUND_COLUMN,
        (char *)0);
     gtk_tree_view_column_set_resizable(c, TRUE);