[Xfce4-commits] [apps/xfce4-taskmanager] 08/08: Merge branch 'peter/tree-model'

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

landry pushed a commit to branch master
in repository apps/xfce4-taskmanager.

commit 32443defff5a14c7cb46d0d1eac1bdbd81792fcc
Merge: c6c74cd dbd10ae
Author: Landry Breuil <landry at xfce.org>
Date:   Thu Dec 4 20:57:16 2014 +0100

    Merge branch 'peter/tree-model'

 src/Makefile.am          |    1 +
 src/process-tree-model.c |  828 ++++++++++++++++++++++++++++++++++++++++++++++
 src/process-tree-model.h |   31 ++
 src/process-tree-view.c  |   27 +-
 src/process-tree-view.h  |    1 +
 src/process-window.c     |    4 +-
 src/settings-dialog.c    |    1 +
 src/settings-dialog.ui   |   16 +-
 src/settings.c           |    3 +
 9 files changed, 907 insertions(+), 5 deletions(-)

diff --cc src/settings-dialog.c
index c8eaf22,5b5b9d4..800881d
--- a/src/settings-dialog.c
+++ b/src/settings-dialog.c
@@@ -108,7 -108,7 +108,8 @@@ xtm_settings_dialog_init (XtmSettingsDi
  	builder_bind_toggle_button (builder, "button-monitor-paint-box", dialog->settings, "monitor-paint-box");
  	builder_bind_toggle_button (builder, "button-prompt-terminate-task", dialog->settings, "prompt-terminate-task");
  	builder_bind_toggle_button (builder, "button-show-status-icon", dialog->settings, "show-status-icon");
 +	builder_bind_toggle_button (builder, "button-show-memory-in-xbytes", dialog->settings, "show-memory-in-xbytes");
+ 	builder_bind_toggle_button (builder, "button-process-tree", dialog->settings, "process-tree");
  
  	{
  		guint n;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.