[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7069 - gnunet-gtk/src/plugins/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7069 - gnunet-gtk/src/plugins/fs |
Date: |
Sat, 7 Jun 2008 01:41:31 -0600 (MDT) |
Author: grothoff
Date: 2008-06-07 01:41:31 -0600 (Sat, 07 Jun 2008)
New Revision: 7069
Modified:
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/fs.h
gnunet-gtk/src/plugins/fs/search.c
Log:
fix
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2008-06-07 07:36:51 UTC (rev
7068)
+++ gnunet-gtk/src/plugins/fs/download.c 2008-06-07 07:41:31 UTC (rev
7069)
@@ -25,10 +25,10 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "fs.h"
#include "search.h"
#include "meta.h"
-#include "platform.h"
/* ****************** FSUI download events ****************** */
Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h 2008-06-07 07:36:51 UTC (rev 7068)
+++ gnunet-gtk/src/plugins/fs/fs.h 2008-06-07 07:41:31 UTC (rev 7069)
@@ -27,6 +27,7 @@
#ifndef GTK_FS_H
#define GTK_FS_H
+#include "platform.h"
#include <GNUnet/gnunet_ecrs_lib.h>
#include <GNUnet/gnunet_fsui_lib.h>
#include <GNUnet/gnunet_uritrack_lib.h>
@@ -52,9 +53,6 @@
enum
{
SEARCH_NAME = 0,
-#ifdef HAVE_GIO
- SEARCH_ICON,
-#endif
SEARCH_SIZE,
SEARCH_HSIZE,
SEARCH_MIME,
@@ -73,6 +71,9 @@
SEARCH_APPLICABILITY_RANK,
SEARCH_RANK_PIXBUF,
SEARCH_RANK_SORT,
+#ifdef HAVE_GIO
+ SEARCH_ICON,
+#endif
SEARCH_NUM,
};
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-07 07:36:51 UTC (rev 7068)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-07 07:41:31 UTC (rev 7069)
@@ -258,9 +258,6 @@
#endif
gtk_tree_store_set (searchContext->tree, iter,
-#ifdef HAVE_GIO
- SEARCH_ICON, icon,
-#endif
SEARCH_NAME, name, SEARCH_SIZE, size, SEARCH_HSIZE,
size_h, SEARCH_MIME, mime,
SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc,
@@ -272,7 +269,11 @@
searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
SEARCH_STATUS, getStatusName (state),
SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT,
- (long long) 1, SEARCH_RANK_PIXBUF, rankbuf, -1);
+ (long long) 1, SEARCH_RANK_PIXBUF, rankbuf,
+#ifdef HAVE_GIO
+ SEARCH_ICON, icon,
+#endif
+ -1);
g_object_unref (rankbuf);
if (pixbuf != NULL)
g_object_unref (pixbuf);
@@ -718,9 +719,6 @@
G_CALLBACK (search_click_handler), list);
list->tree = gtk_tree_store_new (SEARCH_NUM,
G_TYPE_STRING, /* name */
-#ifdef HAVE_GIO
- GDK_TYPE_PIXBUF, /* icon */
-#endif
G_TYPE_UINT64, /* size */
G_TYPE_STRING, /* human-readable size
*/
G_TYPE_STRING, /* mime-type */
@@ -739,6 +737,9 @@
G_TYPE_UINT, /* applicability rank */
GDK_TYPE_PIXBUF, /* ranking
visualization */
G_TYPE_INT64 /* numeric sort */
+#ifdef HAVE_GIO
+ , GDK_TYPE_PIXBUF /* icon */
+#endif
);
gtk_tree_view_set_model (list->treeview, GTK_TREE_MODEL (list->tree));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7069 - gnunet-gtk/src/plugins/fs,
gnunet <=