[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19154 - in gnunet-gtk: contrib src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19154 - in gnunet-gtk: contrib src/fs |
Date: |
Sun, 15 Jan 2012 13:13:44 +0100 |
Author: grothoff
Date: 2012-01-15 13:13:44 +0100 (Sun, 15 Jan 2012)
New Revision: 19154
Modified:
gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
Log:
-LRN: Harmonize dirmetascanner
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade 2012-01-15
12:13:17 UTC (rev 19153)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade 2012-01-15
12:13:44 UTC (rev 19154)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
+ <requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog">
<property name="can_focus">False</property>
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2012-01-15
12:13:17 UTC (rev 19153)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2012-01-15
12:13:44 UTC (rev 19154)
@@ -82,13 +82,13 @@
*/
int keep;
- struct ProcessMetadataContext *pmc;
+ struct GNUNET_FS_ProcessMetadataContext *pmc;
struct MainPublishingDialogContext *ctx;
struct GNUNET_FS_DirScanner *ds;
- struct ShareTreeItem *directory_scan_result;
- struct ShareTreeItem *directory_scan_intermediary_result;
+ struct GNUNET_FS_ShareTreeItem *directory_scan_result;
+ struct GNUNET_FS_ShareTreeItem *directory_scan_intermediary_result;
struct GNUNET_FS_BlockOptions directory_scan_bo;
int directory_scan_do_index;
@@ -891,7 +891,7 @@
* without doing anything else
*/
void
-discard_item (struct ShareTreeItem *item)
+discard_item (struct GNUNET_FS_ShareTreeItem *item)
{
GNUNET_CONTAINER_meta_data_destroy (item->meta);
GNUNET_FS_uri_destroy (item->ksk_uri);
@@ -901,7 +901,7 @@
void
add_item (struct AddDirClientContext *adcc, GtkTreeStore *ts,
- struct ShareTreeItem *item, GtkTreeIter *parent, GtkTreeIter *sibling,
+ struct GNUNET_FS_ShareTreeItem *item, GtkTreeIter *parent, GtkTreeIter
*sibling,
GtkTreeIter *item_iter)
{
char *file_size_fancy;
@@ -966,13 +966,13 @@
*/
void
add_share_items_to_treestore (struct AddDirClientContext *adcc,
- struct ShareTreeItem *toplevel, int discard)
+ struct GNUNET_FS_ShareTreeItem *toplevel, int discard)
{
struct MainPublishingDialogContext *ctx = adcc->ctx;
GtkTreeStore *ts = GTK_TREE_STORE (ctx->file_info_treemodel);
GtkTreeIter *parent_iter;
GtkTreeIter *sibling_iter;
- struct ShareTreeItem *item, *next;
+ struct GNUNET_FS_ShareTreeItem *item, *next;
struct AddShareItemsStack *stack;
if (!discard)
@@ -1124,7 +1124,7 @@
static int
directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
const char *filename, char is_directory,
- enum GNUNET_DirScannerProgressUpdateReason reason)
+ enum GNUNET_FS_DirScannerProgressUpdateReason reason)
{
struct AddDirClientContext *adcc = cls;
char *s;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19154 - in gnunet-gtk: contrib src/fs,
gnunet <=