[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7042 - in gnunet-gtk/src/plugins: chat fs fs/extensions
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7042 - in gnunet-gtk/src/plugins: chat fs fs/extensions |
|
Date: |
Tue, 3 Jun 2008 23:56:20 -0600 (MDT) |
Author: grothoff
Date: 2008-06-03 23:56:20 -0600 (Tue, 03 Jun 2008)
New Revision: 7042
Modified:
gnunet-gtk/src/plugins/chat/chat.c
gnunet-gtk/src/plugins/fs/collection.c
gnunet-gtk/src/plugins/fs/content_tracking.c
gnunet-gtk/src/plugins/fs/directory.c
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/extensions/musicinsert.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/meta.c
gnunet-gtk/src/plugins/fs/meta.h
gnunet-gtk/src/plugins/fs/namespace.c
gnunet-gtk/src/plugins/fs/namespace.h
gnunet-gtk/src/plugins/fs/namespace_create.c
gnunet-gtk/src/plugins/fs/namespace_search.c
gnunet-gtk/src/plugins/fs/namespace_search.h
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/upload.c
Log:
update to match new API
Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c 2008-06-04 05:53:36 UTC (rev 7041)
+++ gnunet-gtk/src/plugins/chat/chat.c 2008-06-04 05:56:20 UTC (rev 7042)
@@ -41,7 +41,7 @@
{
GtkListStore *model;
GdkPixbuf *icon;
- const struct GNUNET_ECRS_MetaData *meta;
+ const struct GNUNET_MetaData *meta;
const char *nick;
GNUNET_HashCode pid;
};
@@ -119,7 +119,7 @@
&iter,
CHAT_PID, pid,
CHAT_METADATA,
- GNUNET_ECRS_meta_data_duplicate (cls->meta), CHAT_ICON,
+ GNUNET_meta_data_duplicate (cls->meta), CHAT_ICON,
cls->icon, CHAT_NICKNAME, cls->nick, -1);
return NULL;
}
@@ -134,7 +134,7 @@
GtkListStore *model;
GtkTreeIter iter;
GNUNET_HashCode *pid;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
model = GTK_LIST_STORE (cls->model);
/* find and remove existing entry */
@@ -149,7 +149,7 @@
if ((pid != NULL) &&
(0 == memcmp (pid, &cls->pid, sizeof (GNUNET_HashCode))))
{
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
GNUNET_free (pid);
gtk_list_store_remove (model, &iter);
return NULL; /* done! */
@@ -178,7 +178,7 @@
receive_callback (void *cls,
struct GNUNET_CHAT_Room *room,
const GNUNET_HashCode * sender,
- const struct GNUNET_ECRS_MetaData *member_info,
+ const struct GNUNET_MetaData *member_info,
const char *message, GNUNET_CHAT_MSG_OPTIONS options)
{
struct GNUNET_CHAT_gui_chat_client *client = cls;
@@ -186,7 +186,7 @@
char *sndr;
sndr =
- sender == NULL ? _("anonymous") : GNUNET_PSEUDO_id_to_name (chat_ectx,
+ sender == NULL ? _("anonymous") : GNUNET_pseudonym_id_to_name (chat_ectx,
chat_cfg,
sender);
writearg.text_view = client->text_view;
@@ -199,7 +199,7 @@
static int
member_list_callback (void *cls,
- const struct GNUNET_ECRS_MetaData *member_info,
+ const struct GNUNET_MetaData *member_info,
const GNUNET_RSA_PublicKey * pkey,
GNUNET_CHAT_MSG_OPTIONS opt)
{
@@ -208,7 +208,7 @@
char *nick;
GNUNET_hash (pkey, sizeof (GNUNET_RSA_PublicKey), &writearg.pid);
- nick = GNUNET_PSEUDO_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
+ nick = GNUNET_pseudonym_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
writearg.model = client->nick_model;
/* FIXME: set icon if pid == ours */
writearg.icon = NULL;
@@ -264,7 +264,7 @@
GtkWidget *chatnotebook;
GtkTreeView *treeview;
struct GNUNET_CHAT_gui_chat_client *client;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
int col;
@@ -329,8 +329,8 @@
list = client;
GNUNET_mutex_unlock (lock);
- meta = GNUNET_ECRS_meta_data_create ();
- GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_TITLE, nick);
+ meta = GNUNET_meta_data_create ();
+ GNUNET_meta_data_insert (meta, EXTRACTOR_TITLE, nick);
client->room =
GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick,
meta,
@@ -338,7 +338,7 @@
-1,
&receive_callback, client, &member_list_callback,
client, NULL, NULL, &client->mypid);
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
}
void
Modified: gnunet-gtk/src/plugins/fs/collection.c
===================================================================
--- gnunet-gtk/src/plugins/fs/collection.c 2008-06-04 05:53:36 UTC (rev
7041)
+++ gnunet-gtk/src/plugins/fs/collection.c 2008-06-04 05:56:20 UTC (rev
7042)
@@ -69,7 +69,7 @@
GtkWidget *w;
GtkWidget *dialog;
GtkWidget *spin;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
struct GNUNET_ECRS_URI *root;
GNUNET_Int32Time updateInterval;
@@ -134,7 +134,7 @@
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
}
gtk_widget_destroy (dialog);
UNREF (metaXML);
@@ -170,7 +170,7 @@
fs_collection_start ()
{
GtkWidget *w;
- struct GNUNET_ECRS_MetaData *h;
+ struct GNUNET_MetaData *h;
h = GNUNET_CO_collection_get_name ();
if (NULL != h)
@@ -178,7 +178,7 @@
w =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"createCollection");
- GNUNET_ECRS_meta_data_destroy (h);
+ GNUNET_meta_data_destroy (h);
}
else
w =
Modified: gnunet-gtk/src/plugins/fs/content_tracking.c
===================================================================
--- gnunet-gtk/src/plugins/fs/content_tracking.c 2008-06-04 05:53:36 UTC
(rev 7041)
+++ gnunet-gtk/src/plugins/fs/content_tracking.c 2008-06-04 05:56:20 UTC
(rev 7042)
@@ -42,7 +42,7 @@
{
GtkTreeModel *model = GTK_TREE_MODEL (mdl);
struct GNUNET_ECRS_URI *uri;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
GtkTreeIter iter;
GNUNET_GTK_DEBUG_BEGIN ();
@@ -54,7 +54,7 @@
&iter,
NAMESPACE_URI, &uri, NAMESPACE_META, &meta, -1);
GNUNET_ECRS_uri_destroy (uri);
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
gtk_list_store_set (GTK_LIST_STORE (model),
&iter,
NAMESPACE_URI, NULL, NAMESPACE_META, NULL, -1);
@@ -121,7 +121,7 @@
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"availableContentList");
model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
- filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
+ filename = GNUNET_meta_data_get_first_by_types (fi->meta,
EXTRACTOR_FILENAME,
EXTRACTOR_TITLE,
EXTRACTOR_DESCRIPTION,
@@ -160,7 +160,7 @@
NAMESPACE_URISTRING, uriString,
NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
NAMESPACE_META,
- GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
+ GNUNET_meta_data_duplicate (fi->meta), -1);
GNUNET_free (size_h);
GNUNET_free (filename);
GNUNET_free (uriString);
Modified: gnunet-gtk/src/plugins/fs/directory.c
===================================================================
--- gnunet-gtk/src/plugins/fs/directory.c 2008-06-04 05:53:36 UTC (rev
7041)
+++ gnunet-gtk/src/plugins/fs/directory.c 2008-06-04 05:56:20 UTC (rev
7042)
@@ -83,7 +83,7 @@
char *directory_data;
unsigned long long directory_data_len;
size_t dlen;
- struct GNUNET_ECRS_MetaData *md;
+ struct GNUNET_MetaData *md;
int fd;
SearchList *list;
struct GNUNET_ECRS_URI *uri;
@@ -126,7 +126,7 @@
directory_data, directory_data_len,
&md, &spcb, list);
if (md != NULL)
- GNUNET_ECRS_meta_data_destroy (md);
+ GNUNET_meta_data_destroy (md);
MUNMAP (directory_data, dlen);
CLOSE (fd);
GNUNET_free (dn);
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2008-06-04 05:53:36 UTC (rev
7041)
+++ gnunet-gtk/src/plugins/fs/download.c 2008-06-04 05:56:20 UTC (rev
7042)
@@ -87,7 +87,7 @@
const char *data;
int fd;
char *fn;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
struct stat buf;
const char *f;
@@ -149,7 +149,7 @@
MUNMAP ((void *) data, size);
CLOSE (fd);
if (meta != NULL)
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
}
/**
@@ -306,7 +306,7 @@
}
list->fsui_list = fsui_dl;
list->total = total;
- list->is_directory = GNUNET_ECRS_meta_data_test_for_directory (fi->meta);
+ list->is_directory = GNUNET_meta_data_test_for_directory (fi->meta);
list->has_terminated = ((state != GNUNET_FSUI_ACTIVE)
&& (state != GNUNET_FSUI_PENDING));
list->next = download_head;
@@ -329,7 +329,7 @@
GtkTreeIter iter;
GtkTreePath *path;
unsigned int val;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
if (path == NULL)
@@ -352,7 +352,7 @@
data, size, &meta,
&addFilesToDirectory, list);
if (meta != NULL)
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
}
}
@@ -532,7 +532,7 @@
{
char *uri_name;
struct GNUNET_ECRS_URI *idc_uri;
- struct GNUNET_ECRS_MetaData *idc_meta;
+ struct GNUNET_MetaData *idc_meta;
char *idc_final_download_destination;
SearchList *searchContext;
DownloadList *parentContext;
@@ -831,7 +831,7 @@
strcat (sdc.idc_final_download_destination, dname);
GNUNET_GTK_add_log_entry (_("Downloading `%s'\n"), uris);
- sdc.idc_meta = GNUNET_ECRS_meta_data_create ();
+ sdc.idc_meta = GNUNET_meta_data_create ();
sdc.anonymity =
getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
"fsstatusAnonymitySpin");
@@ -839,7 +839,7 @@
sdc.searchContext = NULL;
sdc.parentContext = NULL;
GNUNET_GTK_run_with_save_calls (&init_download_helper, &sdc);
- GNUNET_ECRS_meta_data_destroy (sdc.idc_meta);
+ GNUNET_meta_data_destroy (sdc.idc_meta);
GNUNET_free (sdc.idc_final_download_destination);
GNUNET_free (urid);
}
Modified: gnunet-gtk/src/plugins/fs/extensions/musicinsert.c
===================================================================
--- gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2008-06-04 05:53:36 UTC
(rev 7041)
+++ gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2008-06-04 05:56:20 UTC
(rev 7042)
@@ -459,8 +459,8 @@
gboolean
insertfiles ()
{
- struct GNUNET_ECRS_MetaData *dirmetadata;
- struct GNUNET_ECRS_MetaData *tempmetadata;
+ struct GNUNET_MetaData *dirmetadata;
+ struct GNUNET_MetaData *tempmetadata;
GArray *filesmetadatas, *files;
gchar *temptext;
gchar **dirkeywords;
@@ -498,16 +498,16 @@
/* Manage album metadatas */
- dirmetadata = GNUNET_ECRS_meta_data_create ();
+ dirmetadata = GNUNET_meta_data_create ();
dirmetas[0] =
gtk_combo_box_get_active_text (GTK_COMBO_BOX (artistcombobox));
if (dirmetas[0])
- GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
+ GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
dirmetas[1] = gtk_combo_box_get_active_text (GTK_COMBO_BOX (albumcombobox));
if (dirmetas[1])
- GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
+ GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
keywordsentry = glade_xml_get_widget (musicinsertXML, "keywordsentry");
temptext = (gchar *) gtk_entry_get_text (GTK_ENTRY (keywordsentry));
@@ -517,13 +517,13 @@
n = 0;
while (dirkeywords[n])
{
- GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
+ GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
dirkeywords[n]);
n++;
}
/* Add a standard keyword to allow finding all available music albums
* on AFS in one search */
- GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
+ GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
"music album");
@@ -548,13 +548,13 @@
useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
filesmetadatas =
- g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_ECRS_MetaData *),
+ g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_MetaData *),
20);
files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
i = 0;
do
{
- tempmetadata = GNUNET_ECRS_meta_data_create ();
+ tempmetadata = GNUNET_meta_data_create ();
tempmetas = malloc (sizeof (gchar *) * 8);
g_array_append_val (filesmetadatas, tempmetadata);
gtk_tree_model_get (GTK_TREE_MODEL (filelist_store),
@@ -571,28 +571,28 @@
if (tempmetas[1])
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
tempmetas[1]);
if ((useforallflags & 0x1) && dirmetas[0])
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
dirmetas[0]);
else if (!(useforallflags & 0x1) && tempmetas[2])
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_TITLE,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_TITLE,
tempmetas[2]);
if ((useforallflags & 0x2) && dirmetas[1])
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST,
dirmetas[1]);
else if (!(useforallflags & 0x2) && tempmetas[3])
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
tempmetas[3]);
if (tempmetas[4])
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM,
tempmetas[4]);
if (tempmetas[5])
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE,
tempmetas[5]);
if (tempmetas[6])
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT,
tempmetas[6]);
if (!(useforallflags & 0x1))
@@ -600,7 +600,7 @@
n = 0;
while (dirkeywords[n])
{
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
dirkeywords[n]);
n++;
}
@@ -611,7 +611,7 @@
n = 0;
while (tempkeywords[n])
{
- GNUNET_ECRS_meta_data_insert (tempmetadata,
+ GNUNET_meta_data_insert (tempmetadata,
EXTRACTOR_KEYWORDS,
tempkeywords[n]);
n++;
@@ -619,7 +619,7 @@
g_strfreev (tempkeywords);
/* Add a standard keyword to allow finding all available music files
* on AFS in one search */
- GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
"music");
}
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2008-06-04 05:53:36 UTC (rev 7041)
+++ gnunet-gtk/src/plugins/fs/fs.c 2008-06-04 05:56:20 UTC (rev 7042)
@@ -652,7 +652,7 @@
static void
fs_summary_stop ()
{
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
GtkComboBox *searchCB;
GtkTreeModel *model;
GtkTreeIter iter;
@@ -669,7 +669,7 @@
gtk_list_store_set (GTK_LIST_STORE (model),
&iter, NS_SEARCH_METADATA, NULL, -1);
if (meta != NULL)
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
}
while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter));
}
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2008-06-04 05:53:36 UTC (rev 7041)
+++ gnunet-gtk/src/plugins/fs/meta.c 2008-06-04 05:56:20 UTC (rev 7042)
@@ -53,7 +53,7 @@
createMetaDataListTreeView (GladeXML * xml,
const char *name,
const char *previewName,
- const struct GNUNET_ECRS_MetaData *init)
+ const struct GNUNET_MetaData *init)
{
GtkTreeView *metaList;
GtkListStore *metamodel;
@@ -99,13 +99,13 @@
gtk_tree_view_set_model (metaList, GTK_TREE_MODEL (metamodel));
if (init != NULL)
- GNUNET_ECRS_meta_data_get_contents (init, &publishMetaData, metamodel);
+ GNUNET_meta_data_get_contents (init, &publishMetaData, metamodel);
if ((previewName == NULL) || (init == NULL))
return;
preview = glade_xml_get_widget (xml, previewName);
thumb = NULL;
- ts = GNUNET_ECRS_meta_data_get_thumbnail (init, &thumb);
+ ts = GNUNET_meta_data_get_thumbnail (init, &thumb);
preview = glade_xml_get_widget (xml, previewName);
if (ts != 0)
{
@@ -285,7 +285,7 @@
#define THUMBSIZE 128
-struct GNUNET_ECRS_MetaData *
+struct GNUNET_MetaData *
getMetaDataFromList (GladeXML * xml,
const char *name, const char *previewName)
{
@@ -293,7 +293,7 @@
GtkWidget *preview;
GtkTreeModel *metamodel;
GtkTreeIter iter;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
EXTRACTOR_KeywordType type;
GdkPixbuf *pixbuf;
GdkPixbuf *out;
@@ -305,7 +305,7 @@
metaList = glade_xml_get_widget (xml, name);
metamodel = gtk_tree_view_get_model (GTK_TREE_VIEW (metaList));
- meta = GNUNET_ECRS_meta_data_create ();
+ meta = GNUNET_meta_data_create ();
if (gtk_tree_model_get_iter_first (metamodel, &iter))
{
do
@@ -313,7 +313,7 @@
gtk_tree_model_get (metamodel,
&iter,
META_TYPE, &type, META_VALUE, &mvalue, -1);
- GNUNET_ECRS_meta_data_insert (meta, type, mvalue);
+ GNUNET_meta_data_insert (meta, type, mvalue);
GNUNET_free_non_null (mvalue);
}
while (gtk_tree_model_iter_next (metamodel, &iter));
@@ -358,7 +358,7 @@
binary = EXTRACTOR_binaryEncode ((const unsigned char *) thumb,
length);
free (thumb);
- GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA,
+ GNUNET_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA,
binary);
GNUNET_free (binary);
}
@@ -455,22 +455,22 @@
char *
-getMimeTypeFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
+getMimeTypeFromMetaData (const struct GNUNET_MetaData *meta)
{
char *mime;
- mime = GNUNET_ECRS_meta_data_get_by_type (meta, EXTRACTOR_MIMETYPE);
+ mime = GNUNET_meta_data_get_by_type (meta, EXTRACTOR_MIMETYPE);
if (mime == NULL)
mime = GNUNET_strdup (_("unknown"));
return GNUNET_GTK_validate_utf8 (mime);
}
char *
-getFileNameFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
+getFileNameFromMetaData (const struct GNUNET_MetaData *meta)
{
char *name;
- name = GNUNET_ECRS_meta_data_get_first_by_types (meta,
+ name = GNUNET_meta_data_get_first_by_types (meta,
EXTRACTOR_FILENAME,
EXTRACTOR_TITLE,
EXTRACTOR_ARTIST,
@@ -494,11 +494,11 @@
}
char *
-getDescriptionFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
+getDescriptionFromMetaData (const struct GNUNET_MetaData *meta)
{
char *desc;
- desc = GNUNET_ECRS_meta_data_get_first_by_types (meta,
+ desc = GNUNET_meta_data_get_first_by_types (meta,
EXTRACTOR_DESCRIPTION,
EXTRACTOR_GENRE,
EXTRACTOR_ALBUM,
@@ -513,7 +513,7 @@
}
GdkPixbuf *
-getThumbnailFromMetaData (const struct GNUNET_ECRS_MetaData * meta)
+getThumbnailFromMetaData (const struct GNUNET_MetaData * meta)
{
GdkPixbuf *pixbuf;
GdkPixbufLoader *loader;
@@ -521,7 +521,7 @@
unsigned char *thumb;
thumb = NULL;
- ts = GNUNET_ECRS_meta_data_get_thumbnail (meta, &thumb);
+ ts = GNUNET_meta_data_get_thumbnail (meta, &thumb);
if (ts != 0)
{
loader = gdk_pixbuf_loader_new ();
Modified: gnunet-gtk/src/plugins/fs/meta.h
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.h 2008-06-04 05:53:36 UTC (rev 7041)
+++ gnunet-gtk/src/plugins/fs/meta.h 2008-06-04 05:56:20 UTC (rev 7042)
@@ -33,7 +33,7 @@
void createMetaDataListTreeView (GladeXML * xml,
const char *name,
const char *previewName,
- const struct GNUNET_ECRS_MetaData *init);
+ const struct GNUNET_MetaData *init);
void createKeywordListTreeView (GladeXML * xml,
const char *name,
@@ -52,7 +52,7 @@
void handleListRemove (GladeXML * xml, const char *listName);
-struct GNUNET_ECRS_MetaData *getMetaDataFromList (GladeXML * xml,
+struct GNUNET_MetaData *getMetaDataFromList (GladeXML * xml,
const char *name,
const char *preview);
@@ -67,11 +67,11 @@
int parseTimeInterval (const char *frequency, GNUNET_Int32Time * interval);
-char *getMimeTypeFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
+char *getMimeTypeFromMetaData (const struct GNUNET_MetaData *meta);
-char *getFileNameFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
+char *getFileNameFromMetaData (const struct GNUNET_MetaData *meta);
-char *getDescriptionFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
+char *getDescriptionFromMetaData (const struct GNUNET_MetaData *meta);
unsigned int getSpinButtonValue (GladeXML * xml, const char *spinButtonName);
@@ -79,7 +79,7 @@
const char *getEntryLineValue (GladeXML * xml, const char *widgetName);
-GdkPixbuf *getThumbnailFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
+GdkPixbuf *getThumbnailFromMetaData (const struct GNUNET_MetaData *meta);
GtkWidget *extractMainWidgetFromWindow (GladeXML * xml,
const char *windowName);
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2008-06-04 05:53:36 UTC (rev
7041)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2008-06-04 05:56:20 UTC (rev
7042)
@@ -51,7 +51,7 @@
GtkTreeModel *model;
char *name;
GNUNET_HashCode id;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
} NamespaceList;
/**
@@ -320,7 +320,7 @@
char *size_h;
GNUNET_GTK_DEBUG_BEGIN ();
- filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
+ filename = GNUNET_meta_data_get_first_by_types (fi->meta,
EXTRACTOR_FILENAME,
EXTRACTOR_TITLE,
EXTRACTOR_ARTIST,
@@ -338,7 +338,7 @@
while (NULL != (dotdot = strstr (filename, "..")))
dotdot[0] = dotdot[1] = '_';
}
- desc = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
+ desc = GNUNET_meta_data_get_first_by_types (fi->meta,
EXTRACTOR_DESCRIPTION,
EXTRACTOR_GENRE,
EXTRACTOR_ALBUM,
@@ -349,7 +349,7 @@
EXTRACTOR_KEYWORDS, -1);
if (desc == NULL)
desc = GNUNET_strdup ("");
- mime = GNUNET_ECRS_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
+ mime = GNUNET_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
if (mime == NULL)
mime = GNUNET_strdup (_("unknown"));
if (GNUNET_ECRS_uri_test_chk (fi->uri))
@@ -387,7 +387,7 @@
IN_NAMESPACE_PUB_DATE_STRING, date,
IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
IN_NAMESPACE_META,
- GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
+ GNUNET_meta_data_duplicate (fi->meta), -1);
GNUNET_free (size_h);
GNUNET_free (filename);
GNUNET_free (uriString);
@@ -405,7 +405,7 @@
int
addTabForNamespace (void *unused,
const GNUNET_HashCode * namespaceId,
- const struct GNUNET_ECRS_MetaData *md, int rating)
+ const struct GNUNET_MetaData *md, int rating)
{
NamespaceList *list;
GtkWidget *label;
@@ -416,12 +416,12 @@
if (GNUNET_OK != GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceId))
return GNUNET_OK;
GNUNET_GTK_DEBUG_BEGIN ();
- namespaceName = GNUNET_PSEUDO_id_to_name (ectx, cfg, namespaceId);
+ namespaceName = GNUNET_pseudonym_id_to_name (ectx, cfg, namespaceId);
label = gtk_label_new (namespaceName);
list = GNUNET_malloc (sizeof (NamespaceList));
list->name = GNUNET_strdup (namespaceName);
list->id = *namespaceId;
- list->meta = GNUNET_ECRS_meta_data_duplicate (md);
+ list->meta = GNUNET_meta_data_duplicate (md);
makeNamespaceFrame (list);
list->next = head;
head = list;
@@ -452,7 +452,7 @@
{
GtkTreeIter iter;
struct GNUNET_ECRS_URI *u;
- struct GNUNET_ECRS_MetaData *m;
+ struct GNUNET_MetaData *m;
NamespaceList *prev;
NamespaceList *pos;
NamespaceList *next;
@@ -478,7 +478,7 @@
else
prev->next = pos->next;
GNUNET_free (pos->name);
- GNUNET_ECRS_meta_data_destroy (pos->meta);
+ GNUNET_meta_data_destroy (pos->meta);
if (gtk_tree_model_get_iter_first (pos->model, &iter))
{
do
@@ -494,7 +494,7 @@
if (u != NULL)
GNUNET_ECRS_uri_destroy (u);
if (m != NULL)
- GNUNET_ECRS_meta_data_destroy (m);
+ GNUNET_meta_data_destroy (m);
}
while (gtk_tree_model_iter_next (pos->model, &iter));
}
@@ -591,7 +591,7 @@
IUC *cls = data;
struct GNUNET_ECRS_URI *resultURI;
struct GNUNET_ECRS_URI *dst;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
NamespaceList *list;
GNUNET_ECRS_FileInfo fi;
@@ -992,8 +992,8 @@
(GTK_TREE_VIEW (contentList), col - 1),
TRUE);
GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
- GNUNET_PSEUDO_list_all (ectx, cfg, &addTabForNamespace, NULL);
- GNUNET_PSEUDO_register_discovery_callback (ectx, cfg,
+ GNUNET_pseudonym_list_all (ectx, cfg, &addTabForNamespace, NULL);
+ GNUNET_pseudonym_register_discovery_callback (ectx, cfg,
&namespace_discovered_cb, NULL);
GNUNET_GTK_DEBUG_END ();
}
@@ -1002,7 +1002,7 @@
void
fs_namespace_stop ()
{
- GNUNET_PSEUDO_unregister_discovery_callback (&namespace_discovered_cb,
+ GNUNET_pseudonym_unregister_discovery_callback (&namespace_discovered_cb,
NULL);
while (head != NULL)
frame_destroy (head->treeview);
Modified: gnunet-gtk/src/plugins/fs/namespace.h
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.h 2008-06-04 05:53:36 UTC (rev
7041)
+++ gnunet-gtk/src/plugins/fs/namespace.h 2008-06-04 05:56:20 UTC (rev
7042)
@@ -32,7 +32,7 @@
*/
int addTabForNamespace (void *unused,
const GNUNET_HashCode * namespaceId,
- const struct GNUNET_ECRS_MetaData *md, int rating);
+ const struct GNUNET_MetaData *md, int rating);
void fs_namespace_start (void);
Modified: gnunet-gtk/src/plugins/fs/namespace_create.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_create.c 2008-06-04 05:53:36 UTC
(rev 7041)
+++ gnunet-gtk/src/plugins/fs/namespace_create.c 2008-06-04 05:56:20 UTC
(rev 7042)
@@ -197,7 +197,7 @@
GtkWidget *nameLine;
GtkWidget *dialog;
GtkWidget *spin;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
struct GNUNET_ECRS_URI *keywordURI;
struct GNUNET_ECRS_URI *root;
GNUNET_HashCode namespaceId;
@@ -276,7 +276,7 @@
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
GNUNET_ECRS_uri_destroy (keywordURI);
}
gtk_widget_destroy (dialog);
Modified: gnunet-gtk/src/plugins/fs/namespace_search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.c 2008-06-04 05:53:36 UTC
(rev 7041)
+++ gnunet-gtk/src/plugins/fs/namespace_search.c 2008-06-04 05:56:20 UTC
(rev 7042)
@@ -82,7 +82,7 @@
{
GNUNET_enc_to_hash (encStr, &nsid);
newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
- rating = GNUNET_PSEUDO_rank (ectx,
+ rating = GNUNET_pseudonym_rank (ectx,
cfg, &nsid, newrating - rating);
if (rating != newrating)
{
@@ -193,7 +193,7 @@
{
char *namespaceName;
const GNUNET_HashCode *namespaceId;
- const struct GNUNET_ECRS_MetaData *md;
+ const struct GNUNET_MetaData *md;
int rating;
};
@@ -206,7 +206,7 @@
GtkTreeIter iter;
GNUNET_EncName enc;
char *name;
- struct GNUNET_ECRS_MetaData *dmd;
+ struct GNUNET_MetaData *dmd;
GtkWidget *ncbe;
char *desc;
size_t n;
@@ -226,8 +226,8 @@
}
else
{
- dmd = GNUNET_ECRS_meta_data_duplicate (nni->md);
- desc = GNUNET_ECRS_meta_data_get_first_by_types (dmd,
+ dmd = GNUNET_meta_data_duplicate (nni->md);
+ desc = GNUNET_meta_data_get_first_by_types (dmd,
EXTRACTOR_DESCRIPTION,
EXTRACTOR_TITLE,
EXTRACTOR_AUTHOR,
@@ -297,11 +297,11 @@
int
namespace_discovered_cb (void *cls,
const GNUNET_HashCode * namespaceId,
- const struct GNUNET_ECRS_MetaData *md, int rating)
+ const struct GNUNET_MetaData *md, int rating)
{
struct NewNamespaceInfo nni;
- nni.namespaceName = GNUNET_PSEUDO_id_to_name (ectx, cfg, namespaceId);
+ nni.namespaceName = GNUNET_pseudonym_id_to_name (ectx, cfg, namespaceId);
nni.namespaceId = namespaceId;
nni.md = md;
nni.rating = rating;
Modified: gnunet-gtk/src/plugins/fs/namespace_search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.h 2008-06-04 05:53:36 UTC
(rev 7041)
+++ gnunet-gtk/src/plugins/fs/namespace_search.h 2008-06-04 05:56:20 UTC
(rev 7042)
@@ -38,7 +38,7 @@
*/
int namespace_discovered_cb (void *cls,
const GNUNET_HashCode * namespaceId,
- const struct GNUNET_ECRS_MetaData *md,
+ const struct GNUNET_MetaData *md,
int rating);
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-04 05:53:36 UTC (rev 7041)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-04 05:56:20 UTC (rev 7042)
@@ -223,7 +223,7 @@
mime, SEARCH_DESC, desc, SEARCH_PIXBUF, pixbuf,
SEARCH_URI, GNUNET_ECRS_uri_duplicate (info->uri),
SEARCH_META,
- GNUNET_ECRS_meta_data_duplicate (info->meta),
+ GNUNET_meta_data_duplicate (info->meta),
SEARCH_CELL_BG_COLOR, getColorCode (state),
SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
@@ -356,7 +356,7 @@
GtkTreePath *path;
GtkTreeIter iter;
struct GNUNET_ECRS_URI *uri;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
char *str;
GladeXML *xml;
GtkWidget *dialog;
@@ -479,7 +479,7 @@
unsigned long long dir_len;
unsigned int fis_size;
GNUNET_ECRS_FileInfo *fis;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
GtkTreeModel *model;
GtkTreeIter iter;
unsigned int pos;
@@ -509,23 +509,23 @@
pos++;
}
while (gtk_tree_model_iter_next (model, &iter));
- meta = GNUNET_ECRS_meta_data_create ();
- GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
- GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
+ meta = GNUNET_meta_data_create ();
+ GNUNET_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
+ GNUNET_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
_("Saved search results"));
- GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
+ GNUNET_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
&directory, &dir_len,
fis_size, fis, meta))
{
GNUNET_GTK_add_log_entry (_("Internal error."));
GNUNET_GE_BREAK (NULL, 0);
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
GNUNET_array_grow (fis, fis_size, 0);
GNUNET_free (name);
return FALSE;
}
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
GNUNET_array_grow (fis, fis_size, 0);
if (GNUNET_OK !=
GNUNET_disk_file_write (NULL, name, directory, dir_len, "644"))
@@ -892,7 +892,7 @@
{
GtkTreeIter child;
struct GNUNET_ECRS_URI *uri;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
do
{
@@ -903,7 +903,7 @@
if (uri != NULL)
GNUNET_ECRS_uri_destroy (uri);
if (meta != NULL)
- GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_meta_data_destroy (meta);
gtk_tree_store_set (GTK_TREE_STORE (tree),
iter, SEARCH_URI, NULL, SEARCH_META, NULL, -1);
if (gtk_tree_model_iter_children (tree, &child, iter))
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2008-06-04 05:53:36 UTC (rev 7041)
+++ gnunet-gtk/src/plugins/fs/upload.c 2008-06-04 05:56:20 UTC (rev 7042)
@@ -397,7 +397,7 @@
int extract;
int deep_index;
GNUNET_CronTime expire;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
struct GNUNET_ECRS_URI *gkeywordURI;
struct GNUNET_ECRS_URI *keywordURI;
} FSUC;
@@ -426,7 +426,7 @@
GtkWidget *dialog;
EXTRACTOR_ExtractorList *extractors;
char *config;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
struct GNUNET_ECRS_URI *keywordURI;
extractors = EXTRACTOR_loadDefaultLibraries ();
@@ -444,18 +444,18 @@
PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "metaDataDialog");
- meta = GNUNET_ECRS_meta_data_create ();
- GNUNET_ECRS_meta_data_extract_from_file (ectx, meta, filename, extractors);
+ meta = GNUNET_meta_data_create ();
+ GNUNET_meta_data_extract_from_file (ectx, meta, filename, extractors);
EXTRACTOR_removeAll (extractors);
filenamerest = &filename[strlen (filename) - 1];
while ((filenamerest > filename) && (filenamerest[-1] != DIR_SEPARATOR))
filenamerest--;
- GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_FILENAME, filenamerest);
+ GNUNET_meta_data_insert (meta, EXTRACTOR_FILENAME, filenamerest);
createMetaDataListTreeView (metaXML,
"metaDataDialogMetaDataList",
"previewImage", meta);
- keywordURI = GNUNET_ECRS_meta_data_to_uri (meta);
- GNUNET_ECRS_meta_data_destroy (meta);
+ keywordURI = GNUNET_meta_data_to_uri (meta);
+ GNUNET_meta_data_destroy (meta);
createKeywordListTreeView (metaXML,
"metaDataDialogKeywordList", keywordURI);
GNUNET_ECRS_uri_destroy (keywordURI);
@@ -502,7 +502,7 @@
fsuc.filename = GNUNET_strdup (filename);
GNUNET_GTK_run_with_save_calls (&start_upload_helper, &fsuc);
GNUNET_free (fsuc.filename);
- GNUNET_ECRS_meta_data_destroy (fsuc.meta);
+ GNUNET_meta_data_destroy (fsuc.meta);
GNUNET_ECRS_uri_destroy (fsuc.gkeywordURI);
GNUNET_ECRS_uri_destroy (fsuc.keywordURI);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7042 - in gnunet-gtk/src/plugins: chat fs fs/extensions,
gnunet <=