issue 167

4 files changed, 182 insertions, 3 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f1fc213..88ee777 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,7 @@ man_MANS = transmission-remote-gtk.1
 
 desktopdir = $(datadir)/applications
 desktop_DATA = transmission-remote-gtk.desktop
+
 endif
 
 bin_PROGRAMS = transmission-remote-gtk
@@ -40,6 +41,7 @@ transmission_remote_gtk_SOURCES = main.c \
 	  trg-torrent-tree-view.c \
 	  trg-tree-view.c \
 	  trg-torrent-model.c \
+	  trg-sortable-filtered-model.c \
 	  trg-peers-model.c \
 	  trg-peers-tree-view.c \
 	  trg-model.c \
@@ -87,7 +89,7 @@ AM_CFLAGS = -mms-bitfields -mwin32 -mwindows
 transmission_remote_gtk_LDFLAGS += -Wl,--subsystem,windows
 transmission_remote_gtk_SOURCES += win32.rc
 INCLUDES += -O2
-
+else
 %.1: %.pod
 	        pod2man --release="" --center="Transmission Remote GTK" $< > $@
 endif
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 9788763..3147170 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -52,6 +52,7 @@
 #include "trg-about-window.h"
 #include "trg-tree-view.h"
 #include "trg-prefs.h"
+#include "trg-sortable-filtered-model.h"
 #include "trg-torrent-model.h"
 #include "trg-torrent-tree-view.h"
 #include "trg-peers-model.h"
@@ -1984,8 +1985,8 @@ static GObject *trg_main_window_constructor(GType type,
     priv->sortedTorrentModel = gtk_tree_model_sort_new_with_model(
             GTK_TREE_MODEL(priv->torrentModel));
 
-    priv->filteredTorrentModel = gtk_tree_model_filter_new(
-            GTK_TREE_MODEL(priv->sortedTorrentModel), NULL);
+    priv->filteredTorrentModel = trg_sortable_filtered_model_new(
+            GTK_TREE_SORTABLE(priv->sortedTorrentModel), NULL);
     gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER
     (priv->filteredTorrentModel), trg_torrent_tree_view_visible_func,
             self, NULL);
diff --git a/src/trg-sortable-filtered-model.c b/src/trg-sortable-filtered-model.c
new file mode 100644
index 0000000..c03776a
--- /dev/null
+++ b/src/trg-sortable-filtered-model.c
@@ -0,0 +1,114 @@
+/*
+ * transmission-remote-gtk - Transmission RPC client for GTK
+ * Copyright (C) 2011  Alan Fitton
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <gtk/gtk.h>
+
+#include "trg-sortable-filtered-model.h"
+
+static void
+trg_sortable_filtered_model_tree_sortable_init(GtkTreeSortableIface *iface);
+
+/* TreeSortable interface */
+static gboolean trg_sortable_filtered_model_sort_get_sort_column_id(
+        GtkTreeSortable *sortable, gint *sort_column_id, GtkSortType *order);
+static void trg_sortable_filtered_model_sort_set_sort_column_id(
+        GtkTreeSortable *sortable, gint sort_column_id, GtkSortType order);
+static void trg_sortable_filtered_model_sort_set_sort_func(
+        GtkTreeSortable *sortable, gint sort_column_id,
+        GtkTreeIterCompareFunc func, gpointer data, GDestroyNotify destroy);
+static void trg_sortable_filtered_model_sort_set_default_sort_func(
+        GtkTreeSortable *sortable, GtkTreeIterCompareFunc func, gpointer data,
+        GDestroyNotify destroy);
+static gboolean trg_sortable_filtered_model_sort_has_default_sort_func(
+        GtkTreeSortable *sortable);
+
+G_DEFINE_TYPE_WITH_CODE(
+        TrgSortableFilteredModel,
+        trg_sortable_filtered_model,
+        GTK_TYPE_TREE_MODEL_FILTER,
+        G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_SORTABLE, trg_sortable_filtered_model_tree_sortable_init))
+
+static void trg_sortable_filtered_model_class_init(
+        TrgSortableFilteredModelClass *klass) {
+}
+
+static void trg_sortable_filtered_model_init(TrgSortableFilteredModel *self) {
+}
+
+static void trg_sortable_filtered_model_tree_sortable_init(
+        GtkTreeSortableIface *iface) {
+    iface->get_sort_column_id =
+            trg_sortable_filtered_model_sort_get_sort_column_id;
+    iface->set_sort_column_id =
+            trg_sortable_filtered_model_sort_set_sort_column_id;
+    iface->set_sort_func = trg_sortable_filtered_model_sort_set_sort_func;
+    iface->set_default_sort_func =
+            trg_sortable_filtered_model_sort_set_default_sort_func;
+    iface->has_default_sort_func =
+            trg_sortable_filtered_model_sort_has_default_sort_func;
+}
+
+GtkTreeModel *
+trg_sortable_filtered_model_new (GtkTreeSortable *child_model,
+                           GtkTreePath  *root)
+{
+  g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL);
+  g_return_val_if_fail (GTK_IS_TREE_SORTABLE (child_model), NULL);
+
+  return g_object_new (TRG_TYPE_SORTABLE_FILTERED_MODEL,
+                         "child-model", GTK_TREE_MODEL(child_model),
+                         "virtual-root", root,
+                         NULL);
+}
+
+static gboolean trg_sortable_filtered_model_sort_get_sort_column_id(
+        GtkTreeSortable *sortable, gint *sort_column_id, GtkSortType *order) {
+    GtkTreeSortable *realSortable = GTK_TREE_SORTABLE(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(sortable)));
+    return gtk_tree_sortable_get_sort_column_id(realSortable, sort_column_id, order);
+}
+
+static void trg_sortable_filtered_model_sort_set_sort_column_id(
+        GtkTreeSortable *sortable, gint sort_column_id, GtkSortType order)
+{
+    GtkTreeSortable *realSortable = GTK_TREE_SORTABLE(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(sortable)));
+    gtk_tree_sortable_set_sort_column_id(realSortable, sort_column_id, order);
+}
+
+static void trg_sortable_filtered_model_sort_set_sort_func(
+        GtkTreeSortable *sortable, gint sort_column_id,
+        GtkTreeIterCompareFunc func, gpointer data, GDestroyNotify destroy)
+{
+    GtkTreeSortable *realSortable = GTK_TREE_SORTABLE(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(sortable)));
+    gtk_tree_sortable_set_sort_func(realSortable, sort_column_id, func, data, destroy);
+}
+
+static void trg_sortable_filtered_model_sort_set_default_sort_func(
+        GtkTreeSortable *sortable, GtkTreeIterCompareFunc func, gpointer data,
+        GDestroyNotify destroy)
+{
+    GtkTreeSortable *realSortable = GTK_TREE_SORTABLE(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(sortable)));
+    gtk_tree_sortable_set_default_sort_func(realSortable, func, data, destroy);
+}
+
+static gboolean trg_sortable_filtered_model_sort_has_default_sort_func(
+        GtkTreeSortable *sortable)
+{
+    GtkTreeSortable *realSortable = GTK_TREE_SORTABLE(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(sortable)));
+    return gtk_tree_sortable_has_default_sort_func(realSortable);
+}
diff --git a/src/trg-sortable-filtered-model.h b/src/trg-sortable-filtered-model.h
new file mode 100644
index 0000000..50782c8
--- /dev/null
+++ b/src/trg-sortable-filtered-model.h
@@ -0,0 +1,62 @@
+/*
+ * transmission-remote-gtk - Transmission RPC client for GTK
+ * Copyright (C) 2011  Alan Fitton
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _TRG_SORTABLE_FILTERED_MODEL
+#define _TRG_SORTABLE_FILTERED_MODEL
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define TRG_TYPE_SORTABLE_FILTERED_MODEL trg_sortable_filtered_model_get_type()
+
+#define TRG_SORTABLE_FILTERED_MODEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRG_TYPE_SORTABLE_FILTERED_MODEL, TrgSortableFilteredModel))
+
+#define TRG_SORTABLE_FILTERED_MODEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), TRG_TYPE_SORTABLE_FILTERED_MODEL, TrgSortableFilteredModelClass))
+
+#define TRG_IS_SORTABLE_FILTERED_MODEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRG_TYPE_SORTABLE_FILTERED_MODEL))
+
+#define TRG_IS_SORTABLE_FILTERED_MODEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_SORTABLE_FILTERED_MODEL))
+
+#define TRG_SORTABLE_FILTERED_MODEL_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_SORTABLE_FILTERED_MODEL, TrgSortableFilteredModelClass))
+
+typedef struct {
+  GtkTreeModelFilter parent;
+} TrgSortableFilteredModel;
+
+typedef struct {
+  GtkTreeModelFilterClass parent_class;
+} TrgSortableFilteredModelClass;
+
+GType trg_sortable_filtered_model_get_type (void);
+
+GtkTreeModel *
+trg_sortable_filtered_model_new (GtkTreeSortable *child_model,
+                           GtkTreePath  *root);
+
+
+G_END_DECLS
+
+#endif /* _TRG_SORTABLE_FILTERED_MODEL */