[pan2/testing] properly handle postui row count for "filequeue empty" status
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2/testing] properly handle postui row count for "filequeue empty" status
- Date: Sun, 11 Dec 2011 18:04:43 +0000 (UTC)
commit 3896f1cae32f10db926695f0a33c89e1f4bdbfc5
Author: Heinrich MÃller <henmull src gnome org>
Date: Sun Dec 11 09:42:09 2011 +0100
properly handle postui row count for "filequeue empty" status
pan/gui/post-ui.cc | 12 ++++++++----
pan/gui/post-ui.h | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 2c35665..8572e7b 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -196,6 +196,8 @@ void
PostUI :: on_queue_tasks_added (UploadQueue& queue, int index, int count)
{
+ _uploads += count;
+
GtkListStore *store = GTK_LIST_STORE(
gtk_tree_view_get_model(GTK_TREE_VIEW(_filequeue_store)));
@@ -226,6 +228,10 @@ PostUI :: on_queue_tasks_added (UploadQueue& queue, int index, int count)
void
PostUI :: on_queue_task_removed (UploadQueue&, Task& task, int index)
{
+
+ --_uploads;
+ if (_uploads == 0) _file_queue_empty = true;
+
GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(_filequeue_store)));
const int list_index (find_task_index (store, &task));
@@ -2830,8 +2836,6 @@ PostUI :: remove_files (void)
{
_upload_queue.remove_tasks (get_selected_files());
GtkTreeView * view (GTK_TREE_VIEW (_filequeue_store));
- int rows = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(view), NULL);
- if (rows == 0) _file_queue_empty = true;
}
void
@@ -3047,8 +3051,8 @@ PostUI :: PostUI (GtkWindow * parent,
_body_changed_idle_tag(0),
_filequeue_eventbox (0),
_filequeue_label (0),
- _realized(false)
-
+ _realized(false),
+ _uploads(0)
{
rng.seed();
diff --git a/pan/gui/post-ui.h b/pan/gui/post-ui.h
index 8e36f16..f0e03d0 100644
--- a/pan/gui/post-ui.h
+++ b/pan/gui/post-ui.h
@@ -171,6 +171,7 @@ namespace pan
int _total_parts;
std::string _save_file;
MTRand rng;
+ int _uploads;
public:
bool _realized;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]