[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r881 - gnunet-gtk/src
From: |
grothoff |
Subject: |
[GNUnet-SVN] r881 - gnunet-gtk/src |
Date: |
Tue, 7 Jun 2005 06:32:40 -0700 (PDT) |
Author: grothoff
Date: 2005-06-07 06:32:36 -0700 (Tue, 07 Jun 2005)
New Revision: 881
Modified:
gnunet-gtk/src/search.c
gnunet-gtk/src/upload.c
Log:
bugs
Modified: gnunet-gtk/src/search.c
===================================================================
--- gnunet-gtk/src/search.c 2005-06-07 13:31:37 UTC (rev 880)
+++ gnunet-gtk/src/search.c 2005-06-07 13:32:36 UTC (rev 881)
@@ -578,8 +578,9 @@
"searchNamespaceComboBoxEntry");
gtk_combo_box_set_model(GTK_COMBO_BOX(searchNamespaceCB),
GTK_TREE_MODEL(model));
- gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(searchNamespaceCB),
- 0);
+ if
(gtk_combo_box_entry_get_text_column(GTK_COMBO_BOX_ENTRY(searchNamespaceCB)) ==
-1)
+ gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(searchNamespaceCB),
+ 0);
if (-1 == gtk_combo_box_get_active(GTK_COMBO_BOX(searchNamespaceCB)))
gtk_combo_box_set_active(GTK_COMBO_BOX(searchNamespaceCB),
0);
Modified: gnunet-gtk/src/upload.c
===================================================================
--- gnunet-gtk/src/upload.c 2005-06-07 13:31:37 UTC (rev 880)
+++ gnunet-gtk/src/upload.c 2005-06-07 13:32:36 UTC (rev 881)
@@ -376,6 +376,7 @@
EXTRACTOR_KeywordType type;
char * config;
struct ECRS_URI * keywordURI;
+ struct ECRS_URI * gkeywordURI;
const char * stype;
GdkPixbuf * pixbuf;
GdkPixbufLoader * loader;
@@ -385,6 +386,7 @@
char ** keywords;
unsigned int kpos;
unsigned int ksize;
+ const char * filenamerest;
extractors = EXTRACTOR_loadDefaultLibraries();
config = getConfigurationString("FS",
@@ -450,6 +452,13 @@
ECRS_extractMetaData(meta,
filename,
extractors);
+ filenamerest = &filename[strlen(filename)-1];
+ while ( (filenamerest > filename) &&
+ (filenamerest[-1] != DIR_SEPARATOR) )
+ filenamerest--;
+ ECRS_addToMetaData(meta,
+ EXTRACTOR_FILENAME,
+ filenamerest);
ECRS_getMetaData(meta,
(ECRS_MetaDataIterator) &publishMetaData,
metamodel);
@@ -580,13 +589,12 @@
marker++;
GNUNET_ASSERT(marker != 0);
}
+ /* recode */
+ binary[wpos++] = marker;
+ for (i=pos;i<end;i++)
+ binary[wpos++] = thumb[i] == 0 ? marker : thumb[i];
+ pos = end;
}
- /* recode */
- binary[wpos++] = marker;
- for (i=pos;i<end;i++)
- binary[wpos++] = thumb[i] == 0 ? marker : thumb[i];
- pos = end;
-
binary[wpos++] = 0; /* 0-termination! */
free(thumb);
ECRS_addToMetaData(meta,
@@ -594,7 +602,6 @@
binary);
FREE(binary);
}
- g_object_unref(pixbuf);
}
}
keywords = NULL;
@@ -628,13 +635,15 @@
0);
if (doRec) {
+ gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX
+ ECRS_SEARCH_INFIX);
FSUI_uploadAll(ctx,
filename,
getConfigurationInt("FS",
"ANONYMITY"), /* FIXME */
doIndex,
meta,
- keywordURI,
+ gkeywordURI,
keywordURI);
} else {
FSUI_upload(ctx,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r881 - gnunet-gtk/src,
grothoff <=