diff options
author | Christian Grothoff <christian@grothoff.org> | 2008-06-07 07:41:31 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2008-06-07 07:41:31 +0000 |
commit | 1dcd6d941005c55cc4735fb493c3287776d1a2ab (patch) | |
tree | ebb325c4cda7f1aa09f884fcc01c80f8d7d658ad | |
parent | f59617c7964f5738cd45087a1b3fa165082831b5 (diff) | |
download | gnunet-gtk-1dcd6d941005c55cc4735fb493c3287776d1a2ab.tar.gz gnunet-gtk-1dcd6d941005c55cc4735fb493c3287776d1a2ab.zip |
fix
-rw-r--r-- | src/plugins/fs/download.c | 2 | ||||
-rw-r--r-- | src/plugins/fs/fs.h | 7 | ||||
-rw-r--r-- | src/plugins/fs/search.c | 15 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c index 9a034b35..aa32c8f8 100644 --- a/src/plugins/fs/download.c +++ b/src/plugins/fs/download.c | |||
@@ -25,10 +25,10 @@ | |||
25 | * @author Christian Grothoff | 25 | * @author Christian Grothoff |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "platform.h" | ||
28 | #include "fs.h" | 29 | #include "fs.h" |
29 | #include "search.h" | 30 | #include "search.h" |
30 | #include "meta.h" | 31 | #include "meta.h" |
31 | #include "platform.h" | ||
32 | 32 | ||
33 | /* ****************** FSUI download events ****************** */ | 33 | /* ****************** FSUI download events ****************** */ |
34 | 34 | ||
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h index 9ab34778..2c38246d 100644 --- a/src/plugins/fs/fs.h +++ b/src/plugins/fs/fs.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #ifndef GTK_FS_H | 27 | #ifndef GTK_FS_H |
28 | #define GTK_FS_H | 28 | #define GTK_FS_H |
29 | 29 | ||
30 | #include "platform.h" | ||
30 | #include <GNUnet/gnunet_ecrs_lib.h> | 31 | #include <GNUnet/gnunet_ecrs_lib.h> |
31 | #include <GNUnet/gnunet_fsui_lib.h> | 32 | #include <GNUnet/gnunet_fsui_lib.h> |
32 | #include <GNUnet/gnunet_uritrack_lib.h> | 33 | #include <GNUnet/gnunet_uritrack_lib.h> |
@@ -52,9 +53,6 @@ enum | |||
52 | enum | 53 | enum |
53 | { | 54 | { |
54 | SEARCH_NAME = 0, | 55 | SEARCH_NAME = 0, |
55 | #ifdef HAVE_GIO | ||
56 | SEARCH_ICON, | ||
57 | #endif | ||
58 | SEARCH_SIZE, | 56 | SEARCH_SIZE, |
59 | SEARCH_HSIZE, | 57 | SEARCH_HSIZE, |
60 | SEARCH_MIME, | 58 | SEARCH_MIME, |
@@ -73,6 +71,9 @@ enum | |||
73 | SEARCH_APPLICABILITY_RANK, | 71 | SEARCH_APPLICABILITY_RANK, |
74 | SEARCH_RANK_PIXBUF, | 72 | SEARCH_RANK_PIXBUF, |
75 | SEARCH_RANK_SORT, | 73 | SEARCH_RANK_SORT, |
74 | #ifdef HAVE_GIO | ||
75 | SEARCH_ICON, | ||
76 | #endif | ||
76 | SEARCH_NUM, | 77 | SEARCH_NUM, |
77 | }; | 78 | }; |
78 | 79 | ||
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c index 0d000a60..df56d8ed 100644 --- a/src/plugins/fs/search.c +++ b/src/plugins/fs/search.c | |||
@@ -258,9 +258,6 @@ addEntryToSearchTree (SearchList * searchContext, | |||
258 | #endif | 258 | #endif |
259 | 259 | ||
260 | gtk_tree_store_set (searchContext->tree, iter, | 260 | gtk_tree_store_set (searchContext->tree, iter, |
261 | #ifdef HAVE_GIO | ||
262 | SEARCH_ICON, icon, | ||
263 | #endif | ||
264 | SEARCH_NAME, name, SEARCH_SIZE, size, SEARCH_HSIZE, | 261 | SEARCH_NAME, name, SEARCH_SIZE, size, SEARCH_HSIZE, |
265 | size_h, SEARCH_MIME, mime, | 262 | size_h, SEARCH_MIME, mime, |
266 | SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc, | 263 | SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc, |
@@ -272,7 +269,11 @@ addEntryToSearchTree (SearchList * searchContext, | |||
272 | searchContext, SEARCH_INTERNAL_PARENT, downloadParent, | 269 | searchContext, SEARCH_INTERNAL_PARENT, downloadParent, |
273 | SEARCH_STATUS, getStatusName (state), | 270 | SEARCH_STATUS, getStatusName (state), |
274 | SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT, | 271 | SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT, |
275 | (long long) 1, SEARCH_RANK_PIXBUF, rankbuf, -1); | 272 | (long long) 1, SEARCH_RANK_PIXBUF, rankbuf, |
273 | #ifdef HAVE_GIO | ||
274 | SEARCH_ICON, icon, | ||
275 | #endif | ||
276 | -1); | ||
276 | g_object_unref (rankbuf); | 277 | g_object_unref (rankbuf); |
277 | if (pixbuf != NULL) | 278 | if (pixbuf != NULL) |
278 | g_object_unref (pixbuf); | 279 | g_object_unref (pixbuf); |
@@ -718,9 +719,6 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list, | |||
718 | G_CALLBACK (search_click_handler), list); | 719 | G_CALLBACK (search_click_handler), list); |
719 | list->tree = gtk_tree_store_new (SEARCH_NUM, | 720 | list->tree = gtk_tree_store_new (SEARCH_NUM, |
720 | G_TYPE_STRING, /* name */ | 721 | G_TYPE_STRING, /* name */ |
721 | #ifdef HAVE_GIO | ||
722 | GDK_TYPE_PIXBUF, /* icon */ | ||
723 | #endif | ||
724 | G_TYPE_UINT64, /* size */ | 722 | G_TYPE_UINT64, /* size */ |
725 | G_TYPE_STRING, /* human-readable size */ | 723 | G_TYPE_STRING, /* human-readable size */ |
726 | G_TYPE_STRING, /* mime-type */ | 724 | G_TYPE_STRING, /* mime-type */ |
@@ -739,6 +737,9 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list, | |||
739 | G_TYPE_UINT, /* applicability rank */ | 737 | G_TYPE_UINT, /* applicability rank */ |
740 | GDK_TYPE_PIXBUF, /* ranking visualization */ | 738 | GDK_TYPE_PIXBUF, /* ranking visualization */ |
741 | G_TYPE_INT64 /* numeric sort */ | 739 | G_TYPE_INT64 /* numeric sort */ |
740 | #ifdef HAVE_GIO | ||
741 | , GDK_TYPE_PIXBUF /* icon */ | ||
742 | #endif | ||
742 | ); | 743 | ); |
743 | 744 | ||
744 | gtk_tree_view_set_model (list->treeview, GTK_TREE_MODEL (list->tree)); | 745 | gtk_tree_view_set_model (list->treeview, GTK_TREE_MODEL (list->tree)); |