[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6994 - in gnunet-gtk/src/plugins: chat fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6994 - in gnunet-gtk/src/plugins: chat fs |
|
Date: |
Sun, 1 Jun 2008 20:53:20 -0600 (MDT) |
Author: grothoff
Date: 2008-06-01 20:53:19 -0600 (Sun, 01 Jun 2008)
New Revision: 6994
Modified:
gnunet-gtk/src/plugins/chat/chat.c
gnunet-gtk/src/plugins/fs/collection.c
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/namespace.c
gnunet-gtk/src/plugins/fs/namespace_create.c
gnunet-gtk/src/plugins/fs/namespace_search.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/search.h
Log:
whitespace
Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c 2008-06-02 02:52:58 UTC (rev 6993)
+++ gnunet-gtk/src/plugins/chat/chat.c 2008-06-02 02:53:19 UTC (rev 6994)
@@ -32,7 +32,7 @@
struct GNUNET_CHAT_safe_write_struct
{
- GtkWidget * text_view;
+ GtkWidget *text_view;
const char *message;
const char *sender;
};
@@ -40,7 +40,7 @@
struct GNUNET_CHAT_safe_nick_write_struct
{
GtkListStore *model;
- GdkPixbuf * icon;
+ GdkPixbuf *icon;
const struct GNUNET_ECRS_MetaData *meta;
const char *nick;
GNUNET_HashCode pid;
@@ -49,9 +49,9 @@
struct GNUNET_CHAT_gui_chat_client
{
struct GNUNET_CHAT_gui_chat_client *next;
- GtkWidget * send_button;
- GtkWidget * text_view;
- GtkListStore * nick_model;
+ GtkWidget *send_button;
+ GtkWidget *text_view;
+ GtkListStore *nick_model;
GtkWidget *chatFrame;
GtkWidget *chat_entry;
GladeXML *chatXML;
@@ -90,59 +90,51 @@
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cls->text_view));
message_buf_size =
- snprintf (NULL, 0,
- "<%s>: %s\n",
- cls->sender,
- cls->message);
+ snprintf (NULL, 0, "<%s>: %s\n", cls->sender, cls->message);
message_buf = GNUNET_malloc (message_buf_size + 1);
- GNUNET_snprintf (message_buf,
- message_buf_size + 1,
- "<%s>: %s\n",
- cls->sender,
- cls->message);
- gtk_text_buffer_insert_at_cursor (buffer,
- message_buf,
- message_buf_size);
- GNUNET_free(message_buf);
+ GNUNET_snprintf (message_buf,
+ message_buf_size + 1,
+ "<%s>: %s\n", cls->sender, cls->message);
+ gtk_text_buffer_insert_at_cursor (buffer, message_buf, message_buf_size);
+ GNUNET_free (message_buf);
return NULL;
}
/**
- * Safe call to add a nick to the chat room view
+ * Safe call to add a nick to the chat room view
*/
static void *
add_nick_save_call (void *arg)
{
struct GNUNET_CHAT_safe_nick_write_struct *cls = arg;
- GtkListStore * model;
+ GtkListStore *model;
GtkTreeIter iter;
- GNUNET_HashCode * pid;
-
+ GNUNET_HashCode *pid;
+
model = GTK_LIST_STORE (cls->model);
gtk_list_store_append (model, &iter);
- pid = GNUNET_malloc(sizeof(GNUNET_HashCode));
+ pid = GNUNET_malloc (sizeof (GNUNET_HashCode));
*pid = cls->pid;
- gtk_list_store_set(model,
- &iter,
- CHAT_PID, pid,
- CHAT_METADATA, GNUNET_ECRS_meta_data_duplicate(cls->meta),
- CHAT_ICON, cls->icon,
- CHAT_NICKNAME, cls->nick,
- -1);
+ gtk_list_store_set (model,
+ &iter,
+ CHAT_PID, pid,
+ CHAT_METADATA,
+ GNUNET_ECRS_meta_data_duplicate (cls->meta), CHAT_ICON,
+ cls->icon, CHAT_NICKNAME, cls->nick, -1);
return NULL;
}
/**
- * Safe call to remove a nick from the chat room view
+ * Safe call to remove a nick from the chat room view
*/
static void *
remove_nick_save_call (void *arg)
{
struct GNUNET_CHAT_safe_nick_write_struct *cls = arg;
- GtkListStore * model;
+ GtkListStore *model;
GtkTreeIter iter;
- GNUNET_HashCode * pid;
- struct GNUNET_ECRS_MetaData * meta;
+ GNUNET_HashCode *pid;
+ struct GNUNET_ECRS_MetaData *meta;
model = GTK_LIST_STORE (cls->model);
/* find and remove existing entry */
@@ -153,19 +145,15 @@
pid = NULL;
gtk_tree_model_get (GTK_TREE_MODEL (model),
&iter,
- CHAT_PID, &pid,
- CHAT_METADATA, &meta,
- -1);
- if ( (pid != NULL) &&
- (0 == memcmp(pid,
- &cls->pid,
- sizeof(GNUNET_HashCode))) )
- {
- GNUNET_ECRS_meta_data_destroy(meta);
- GNUNET_free(pid);
- gtk_list_store_remove(model, &iter);
- return NULL; /* done! */
- }
+ CHAT_PID, &pid, CHAT_METADATA, &meta, -1);
+ if ((pid != NULL) &&
+ (0 == memcmp (pid, &cls->pid, sizeof (GNUNET_HashCode))))
+ {
+ GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_free (pid);
+ gtk_list_store_remove (model, &iter);
+ return NULL; /* done! */
+ }
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
}
@@ -189,40 +177,38 @@
static int
receive_callback (void *cls,
struct GNUNET_CHAT_Room *room,
- const GNUNET_HashCode *sender,
- const struct GNUNET_ECRS_MetaData * member_info,
- const char *message,
- GNUNET_CHAT_MSG_OPTIONS options)
+ const GNUNET_HashCode * sender,
+ const struct GNUNET_ECRS_MetaData *member_info,
+ const char *message, GNUNET_CHAT_MSG_OPTIONS options)
{
struct GNUNET_CHAT_gui_chat_client *client = cls;
struct GNUNET_CHAT_safe_write_struct writearg;
- char * sndr;
-
- sndr = sender == NULL ? _("anonymous") : GNUNET_PSEUDO_id_to_name(chat_ectx,
chat_cfg, sender);
+ char *sndr;
+
+ sndr =
+ sender == NULL ? _("anonymous") : GNUNET_PSEUDO_id_to_name (chat_ectx,
+ chat_cfg,
+ sender);
writearg.text_view = client->text_view;
writearg.message = message;
writearg.sender = sndr;
GNUNET_GTK_save_call (&write_save_call, &writearg);
- GNUNET_free_non_null(sndr);
+ GNUNET_free_non_null (sndr);
return GNUNET_OK;
}
static int
member_list_callback (void *cls,
- const struct GNUNET_ECRS_MetaData * member_info,
- const GNUNET_RSA_PublicKey * pkey,
- GNUNET_CHAT_MSG_OPTIONS opt)
+ const struct GNUNET_ECRS_MetaData *member_info,
+ const GNUNET_RSA_PublicKey * pkey,
+ GNUNET_CHAT_MSG_OPTIONS opt)
{
struct GNUNET_CHAT_gui_chat_client *client = cls;
struct GNUNET_CHAT_safe_nick_write_struct writearg;
char *nick;
- GNUNET_hash(pkey,
- sizeof(GNUNET_RSA_PublicKey),
- &writearg.pid);
- nick = GNUNET_PSEUDO_id_to_name(chat_ectx,
- chat_cfg,
- &writearg.pid);
+ GNUNET_hash (pkey, sizeof (GNUNET_RSA_PublicKey), &writearg.pid);
+ nick = GNUNET_PSEUDO_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
writearg.model = client->nick_model;
/* FIXME: set icon if pid == ours */
writearg.icon = NULL;
@@ -232,7 +218,7 @@
GNUNET_GTK_save_call (&add_nick_save_call, &writearg);
else
GNUNET_GTK_save_call (&remove_nick_save_call, &writearg);
- GNUNET_free(nick);
+ GNUNET_free (nick);
return GNUNET_OK;
}
@@ -243,20 +229,17 @@
const char *message;
struct GNUNET_CHAT_gui_chat_client *pos;
- GNUNET_mutex_lock(lock);
+ GNUNET_mutex_lock (lock);
pos = list;
- while ( (pos != NULL) &&
- (pos->send_button != widget) )
+ while ((pos != NULL) && (pos->send_button != widget))
pos = pos->next;
- GNUNET_GE_ASSERT(NULL, pos != NULL);
-
- message = (const char *) gtk_entry_get_text (GTK_ENTRY(pos->chat_entry));
- GNUNET_CHAT_send_message (pos->room,
- message,
- GNUNET_CHAT_MSG_OPTION_NONE,
- NULL, &seq);
- gtk_entry_set_text (GTK_ENTRY(pos->chat_entry), "");
- GNUNET_mutex_unlock(lock);
+ GNUNET_GE_ASSERT (NULL, pos != NULL);
+
+ message = (const char *) gtk_entry_get_text (GTK_ENTRY (pos->chat_entry));
+ GNUNET_CHAT_send_message (pos->room,
+ message, GNUNET_CHAT_MSG_OPTION_NONE, NULL, &seq);
+ gtk_entry_set_text (GTK_ENTRY (pos->chat_entry), "");
+ GNUNET_mutex_unlock (lock);
}
/** FIXME: move to gtkcommon! */
@@ -275,44 +258,44 @@
}
static void
-create_chat_room_tab (const char *room_name,
- const char *nick)
+create_chat_room_tab (const char *room_name, const char *nick)
{
GtkWidget *chatLabel;
GtkWidget *chatnotebook;
GtkTreeView *treeview;
struct GNUNET_CHAT_gui_chat_client *client;
- struct GNUNET_ECRS_MetaData * meta;
+ struct GNUNET_ECRS_MetaData *meta;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
int col;
-
+
chatnotebook =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "chatnotebook");
client = GNUNET_malloc (sizeof (struct GNUNET_CHAT_gui_chat_client));
client->chatXML =
glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "chatFrame",
- PACKAGE_NAME);
+ "chatFrame", PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (client->chatXML);
client->chatFrame = extractMainWidgetFromWindow (client->chatXML,
- "chatFrame");
+ "chatFrame");
chatLabel = gtk_label_new (room_name);
- gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook),
- client->chatFrame,
- chatLabel);
+ gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook),
+ client->chatFrame, chatLabel);
gtk_widget_show (chatnotebook);
- client->nick_model = gtk_list_store_new (CHAT_NUM,
- G_TYPE_STRING, /* nickname */
- G_TYPE_POINTER, /* metadata */
- GDK_TYPE_PIXBUF, /* icon */
- G_TYPE_POINTER); /* pid */
- client->send_button = glade_xml_get_widget (client->chatXML,
"chatSendButton");
+ client->nick_model = gtk_list_store_new (CHAT_NUM, G_TYPE_STRING, /*
nickname */
+ G_TYPE_POINTER, /* metadata */
+ GDK_TYPE_PIXBUF, /* icon */
+ G_TYPE_POINTER); /* pid */
+ client->send_button =
+ glade_xml_get_widget (client->chatXML, "chatSendButton");
client->text_view = glade_xml_get_widget (client->chatXML, "chatLogViewer");
- client->chat_entry = glade_xml_get_widget (client->chatXML,
"chatLineTextEntry");
- treeview = GTK_TREE_VIEW(glade_xml_get_widget (client->chatXML,
"roomMembersTreeView"));
+ client->chat_entry =
+ glade_xml_get_widget (client->chatXML, "chatLineTextEntry");
+ treeview =
+ GTK_TREE_VIEW (glade_xml_get_widget
+ (client->chatXML, "roomMembersTreeView"));
gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (client->nick_model));
renderer = gtk_cell_renderer_text_new ();
@@ -328,7 +311,7 @@
gtk_tree_view_column_set_reorderable (column, TRUE);
gtk_tree_view_column_set_sort_column_id (column, CHAT_NICKNAME);
gtk_tree_view_column_set_min_width (column, 0);
-
+
renderer = gtk_cell_renderer_pixbuf_new ();
col = gtk_tree_view_insert_column_with_attributes (treeview,
-1,
@@ -341,25 +324,21 @@
gtk_tree_view_column_set_clickable (column, FALSE);
gtk_tree_view_column_set_reorderable (column, FALSE);
- GNUNET_mutex_lock(lock);
+ GNUNET_mutex_lock (lock);
client->next = list;
list = client;
- GNUNET_mutex_unlock(lock);
+ GNUNET_mutex_unlock (lock);
- meta = GNUNET_ECRS_meta_data_create();
- GNUNET_ECRS_meta_data_insert(meta,
- EXTRACTOR_TITLE,
- nick);
+ meta = GNUNET_ECRS_meta_data_create ();
+ GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_TITLE, nick);
client->room =
GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick,
- meta,
- room_name,
- -1,
+ meta,
+ room_name,
+ -1,
&receive_callback, client, &member_list_callback,
- client,
- NULL, NULL,
- &client->mypid);
- GNUNET_ECRS_meta_data_destroy(meta);
+ client, NULL, NULL, &client->mypid);
+ GNUNET_ECRS_meta_data_destroy (meta);
}
void
Modified: gnunet-gtk/src/plugins/fs/collection.c
===================================================================
--- gnunet-gtk/src/plugins/fs/collection.c 2008-06-02 02:52:58 UTC (rev
6993)
+++ gnunet-gtk/src/plugins/fs/collection.c 2008-06-02 02:53:19 UTC (rev
6994)
@@ -118,7 +118,7 @@
gtk_widget_set_sensitive (w, FALSE);
w =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "deleteCollection");
+ "deleteCollection");
gtk_widget_set_sensitive (w, TRUE);
}
else
@@ -171,7 +171,7 @@
{
GtkWidget *w;
struct GNUNET_ECRS_MetaData *h;
-
+
h = GNUNET_CO_collection_get_name ();
if (NULL != h)
{
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2008-06-02 02:52:58 UTC (rev
6993)
+++ gnunet-gtk/src/plugins/fs/download.c 2008-06-02 02:53:19 UTC (rev
6994)
@@ -146,7 +146,7 @@
meta = NULL;
GNUNET_ECRS_directory_list_contents (ectx, data, size, &meta,
&addFilesToDirectory, list);
- MUNMAP ((void*)data, size);
+ MUNMAP ((void *) data, size);
CLOSE (fd);
if (meta != NULL)
GNUNET_ECRS_meta_data_destroy (meta);
@@ -189,8 +189,8 @@
if ((dl_parent != NULL) &&
(NULL !=
(path =
- gtk_tree_row_reference_get_path (dl_parent->
- summaryViewRowReference))))
+ gtk_tree_row_reference_get_path
+ (dl_parent->summaryViewRowReference))))
{
valid = gtk_tree_model_get_iter (GTK_TREE_MODEL (download_summary),
&piter, path);
@@ -246,13 +246,12 @@
solution is to #ifndef it */
#ifndef MINGW
GNUNET_GE_BREAK (ectx,
- gtk_tree_row_reference_get_model (dl_parent->
-
searchViewRowReference)
- == model);
+ gtk_tree_row_reference_get_model
+ (dl_parent->searchViewRowReference) == model);
#endif
path =
- gtk_tree_row_reference_get_path (dl_parent->
- searchViewRowReference);
+ gtk_tree_row_reference_get_path
+ (dl_parent->searchViewRowReference);
if (path != NULL)
{
valid = gtk_tree_model_get_iter (model, &piter, path);
@@ -370,8 +369,8 @@
if (downloadContext->searchViewRowReference != NULL)
{
path =
- gtk_tree_row_reference_get_path (downloadContext->
- searchViewRowReference);
+ gtk_tree_row_reference_get_path
+ (downloadContext->searchViewRowReference);
gtk_tree_model_get_iter (GTK_TREE_MODEL
(downloadContext->searchList->tree), &iter,
path);
@@ -401,8 +400,8 @@
if (downloadContext->searchViewRowReference != NULL)
{
path =
- gtk_tree_row_reference_get_path (downloadContext->
- searchViewRowReference);
+ gtk_tree_row_reference_get_path
+ (downloadContext->searchViewRowReference);
gtk_tree_model_get_iter (GTK_TREE_MODEL
(downloadContext->searchList->tree), &iter,
path);
@@ -633,9 +632,8 @@
strlen (GNUNET_ECRS_FILE_INFIX));
GNUNET_free_non_null (idc_name);
filehash =
- GNUNET_strdup (&sdc.
- uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
- strlen (GNUNET_ECRS_FILE_INFIX)]);
+ GNUNET_strdup (&sdc.uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX)]);
filehash[16] = 0;
idc_name = GNUNET_strdup (filehash);
GNUNET_free_non_null (filehash);
@@ -646,9 +644,8 @@
strlen (GNUNET_ECRS_FILE_INFIX));
GNUNET_free_non_null (idc_name);
idc_name =
- GNUNET_strdup (&sdc.
- uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
- strlen (GNUNET_ECRS_FILE_INFIX)]);
+ GNUNET_strdup (&sdc.uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX)]);
#endif
}
@@ -725,10 +722,10 @@
GNUNET_malloc (strlen (final_download_dir) + 2 + strlen (idc_name) +
strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath));
strcpy (sdc.idc_final_download_destination, final_download_dir);
- if (sdc.
- idc_final_download_destination[strlen
- (sdc.idc_final_download_destination) -
- 1] != DIR_SEPARATOR)
+ if (sdc.idc_final_download_destination[strlen
+ (sdc.
+ idc_final_download_destination) -
+ 1] != DIR_SEPARATOR)
strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR);
strcat (sdc.idc_final_download_destination, dirPath);
strcat (sdc.idc_final_download_destination, idc_name);
@@ -826,9 +823,9 @@
GNUNET_malloc (strlen (final_download_dir) + strlen (dname) + 2);
strcpy (sdc.idc_final_download_destination, final_download_dir);
GNUNET_free (final_download_dir);
- if (sdc.
- idc_final_download_destination[strlen
- (sdc.idc_final_download_destination)] !=
+ if (sdc.idc_final_download_destination[strlen
+ (sdc.
+ idc_final_download_destination)] !=
DIR_SEPARATOR)
strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR);
strcat (sdc.idc_final_download_destination, dname);
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2008-06-02 02:52:58 UTC (rev 6993)
+++ gnunet-gtk/src/plugins/fs/fs.c 2008-06-02 02:53:19 UTC (rev 6994)
@@ -158,22 +158,22 @@
event->data.SearchResumed.fisSize,
event->data.SearchResumed.fis,
event->data.SearchResumed.state);
- for (i=0;i<event->data.SearchResumed.fisSize;i++)
- fs_search_update(ret,
- &event->data.SearchResumed.fis[i],
- event->data.SearchResumed.availability_rank[i],
- event->data.SearchResumed.availability_certainty[i],
- event->data.SearchResumed.applicability_rank[i]);
+ for (i = 0; i < event->data.SearchResumed.fisSize; i++)
+ fs_search_update (ret,
+ &event->data.SearchResumed.fis[i],
+ event->data.SearchResumed.availability_rank[i],
+ event->data.SearchResumed.availability_certainty[i],
+ event->data.SearchResumed.applicability_rank[i]);
break;
case GNUNET_FSUI_search_stopped:
fs_search_stopped (event->data.SearchStopped.sc.cctx);
break;
case GNUNET_FSUI_search_update:
fs_search_update (event->data.SearchUpdate.sc.cctx,
- &event->data.SearchUpdate.fi,
- event->data.SearchUpdate.availability_rank,
- event->data.SearchUpdate.availability_certainty,
- event->data.SearchUpdate.applicability_rank);
+ &event->data.SearchUpdate.fi,
+ event->data.SearchUpdate.availability_rank,
+ event->data.SearchUpdate.availability_certainty,
+ event->data.SearchUpdate.applicability_rank);
break;
/* download events */
case GNUNET_FSUI_download_aborted:
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2008-06-02 02:52:58 UTC (rev
6993)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2008-06-02 02:53:19 UTC (rev
6994)
@@ -410,14 +410,12 @@
GtkWidget *label;
GtkWidget *notebook;
GtkWidget *del_menu;
- char * namespaceName;
+ char *namespaceName;
- if (GNUNET_OK !=
- GNUNET_ECRS_namespace_test_exists (NULL, cfg,
- namespaceId))
+ 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_PSEUDO_id_to_name (ectx, cfg, namespaceId);
label = gtk_label_new (namespaceName);
list = GNUNET_malloc (sizeof (NamespaceList));
list->name = GNUNET_strdup (namespaceName);
@@ -443,7 +441,7 @@
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"namespaceDelete");
gtk_widget_set_sensitive (del_menu, TRUE);
- GNUNET_free(namespaceName);
+ GNUNET_free (namespaceName);
return GNUNET_OK;
}
@@ -994,8 +992,8 @@
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,
&namespace_discovered_cb,
- NULL);
+ GNUNET_PSEUDO_register_discovery_callback (ectx, cfg,
+ &namespace_discovered_cb, NULL);
GNUNET_GTK_DEBUG_END ();
}
@@ -1003,7 +1001,8 @@
void
fs_namespace_stop ()
{
- GNUNET_PSEUDO_unregister_discovery_callback (&namespace_discovered_cb, NULL);
+ GNUNET_PSEUDO_unregister_discovery_callback (&namespace_discovered_cb,
+ NULL);
while (head != NULL)
frame_destroy (head->treeview);
GNUNET_URITRACK_unregister_track_callback (&updateViewSave, NULL);
Modified: gnunet-gtk/src/plugins/fs/namespace_create.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_create.c 2008-06-02 02:52:58 UTC
(rev 6993)
+++ gnunet-gtk/src/plugins/fs/namespace_create.c 2008-06-02 02:53:19 UTC
(rev 6994)
@@ -249,8 +249,7 @@
namespaceName = gtk_entry_get_text (GTK_ENTRY (nameLine));
root = GNUNET_NS_namespace_create (ectx, cfg,
gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000, /* FIXME:
priority */
GNUNET_get_time () + 2 *
GNUNET_CRON_YEARS, /* FIXME: expiration */
- meta, keywordURI,
- &rootEntry);
+ meta, keywordURI, &rootEntry);
if (root != NULL)
{
GNUNET_ECRS_uri_get_namespace_from_sks (root, &namespaceId);
Modified: gnunet-gtk/src/plugins/fs/namespace_search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.c 2008-06-02 02:52:58 UTC
(rev 6993)
+++ gnunet-gtk/src/plugins/fs/namespace_search.c 2008-06-02 02:53:19 UTC
(rev 6994)
@@ -80,12 +80,10 @@
{
if (encStr != NULL)
{
- GNUNET_enc_to_hash(encStr,
- &nsid);
+ GNUNET_enc_to_hash (encStr, &nsid);
newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
rating = GNUNET_PSEUDO_rank (ectx,
- cfg, &nsid,
- newrating - rating);
+ cfg, &nsid, newrating - rating);
if (rating != newrating)
{
/* concurrent modification? */
@@ -302,11 +300,11 @@
{
struct NewNamespaceInfo nni;
- nni.namespaceName = GNUNET_PSEUDO_id_to_name(ectx, cfg, namespaceId);
+ nni.namespaceName = GNUNET_PSEUDO_id_to_name (ectx, cfg, namespaceId);
nni.namespaceId = namespaceId;
nni.md = md;
nni.rating = rating;
GNUNET_GTK_save_call (&saveDiscovery, &nni);
- GNUNET_free(nni.namespaceName);
+ GNUNET_free (nni.namespaceName);
return GNUNET_OK;
}
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-02 02:52:58 UTC (rev 6993)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-02 02:53:19 UTC (rev 6994)
@@ -98,93 +98,93 @@
}
static GdkPixbuf *
-make_ranking_pixbuf(int availability_rank,
- unsigned int availability_certainty,
- unsigned int applicability_rank,
- unsigned int kwords)
+make_ranking_pixbuf (int availability_rank,
+ unsigned int availability_certainty,
+ unsigned int applicability_rank, unsigned int kwords)
{
GdkPixbuf *pixbuf;
- guchar * pixels;
- guchar * pixel;
+ guchar *pixels;
+ guchar *pixel;
int n_channels;
int rowstride;
unsigned int x;
unsigned int y;
#define P_HEIGHT 21
-#define P_WIDTH 60
- pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- TRUE, /* alpha */
- 8, /* bits per sample */
- P_WIDTH, /* width */
- P_HEIGHT /* height */
- );
+#define P_WIDTH 60
+ pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, /* alpha */
+ 8, /* bits per sample */
+ P_WIDTH, /* width */
+ P_HEIGHT /* height */
+ );
n_channels = gdk_pixbuf_get_n_channels (pixbuf);
- pixels = gdk_pixbuf_get_pixels(pixbuf);
- rowstride = gdk_pixbuf_get_rowstride(pixbuf);
- for (x=0;x<P_WIDTH;x++)
- for (y=0;y<P_HEIGHT;y++)
+ pixels = gdk_pixbuf_get_pixels (pixbuf);
+ rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+ for (x = 0; x < P_WIDTH; x++)
+ for (y = 0; y < P_HEIGHT; y++)
{
- pixel = pixels + y * rowstride + x * n_channels;
+ pixel = pixels + y * rowstride + x * n_channels;
#define PX_RED 0
#define PX_GREEN 1
#define PX_BLUE 2
#define PX_ALPHA 3
- pixel[PX_RED] = 0;
- pixel[PX_GREEN] = 0;
- pixel[PX_BLUE] = 0;
- pixel[PX_ALPHA] = 0;
- if (y < P_HEIGHT / 2)
- {
- /* applicability */
- if (x * kwords < applicability_rank * P_WIDTH)
- {
- pixel[PX_RED] = 0;
- pixel[PX_GREEN] = 0;
- pixel[PX_BLUE] = 255;
- pixel[PX_ALPHA] = 255;
- }
- }
- else if ( (y > P_HEIGHT / 2) &&
- ( (y-P_HEIGHT/2) * GNUNET_FSUI_MAX_PROBES
- < availability_certainty * P_HEIGHT / 2) )
- {
- /* availability */
- if (availability_rank < 0)
- {
- if ( (x * GNUNET_FSUI_MAX_PROBES >
(GNUNET_FSUI_MAX_PROBES+availability_rank) * P_WIDTH/2) &&
- (x <= P_WIDTH/2) )
- {
- pixel[PX_RED] = 255;
- pixel[PX_GREEN] = 0;
- pixel[PX_BLUE] = 0;
- pixel[PX_ALPHA] = 255;
- }
- }
- else if (availability_rank > 0)
- {
- if ( (x >= P_WIDTH/2) &&
- ( (x - (P_WIDTH/2)) * GNUNET_FSUI_MAX_PROBES <
availability_rank * P_WIDTH/2) )
- {
- pixel[PX_RED] = 0;
- pixel[PX_GREEN] = 255;
- pixel[PX_BLUE] = 0;
- pixel[PX_ALPHA] = 255;
- }
- }
- else
- {
- if (x == P_WIDTH / 2)
- {
- /* yellow */
- pixel[PX_RED] = 255;
- pixel[PX_GREEN] = 255;
- pixel[PX_BLUE] = 0;
- pixel[PX_ALPHA] = 255;
- }
- }
- }
- }
+ pixel[PX_RED] = 0;
+ pixel[PX_GREEN] = 0;
+ pixel[PX_BLUE] = 0;
+ pixel[PX_ALPHA] = 0;
+ if (y < P_HEIGHT / 2)
+ {
+ /* applicability */
+ if (x * kwords < applicability_rank * P_WIDTH)
+ {
+ pixel[PX_RED] = 0;
+ pixel[PX_GREEN] = 0;
+ pixel[PX_BLUE] = 255;
+ pixel[PX_ALPHA] = 255;
+ }
+ }
+ else if ((y > P_HEIGHT / 2) &&
+ ((y - P_HEIGHT / 2) * GNUNET_FSUI_MAX_PROBES
+ < availability_certainty * P_HEIGHT / 2))
+ {
+ /* availability */
+ if (availability_rank < 0)
+ {
+ if ((x * GNUNET_FSUI_MAX_PROBES >
+ (GNUNET_FSUI_MAX_PROBES +
+ availability_rank) * P_WIDTH / 2) && (x <= P_WIDTH / 2))
+ {
+ pixel[PX_RED] = 255;
+ pixel[PX_GREEN] = 0;
+ pixel[PX_BLUE] = 0;
+ pixel[PX_ALPHA] = 255;
+ }
+ }
+ else if (availability_rank > 0)
+ {
+ if ((x >= P_WIDTH / 2) &&
+ ((x - (P_WIDTH / 2)) * GNUNET_FSUI_MAX_PROBES <
+ availability_rank * P_WIDTH / 2))
+ {
+ pixel[PX_RED] = 0;
+ pixel[PX_GREEN] = 255;
+ pixel[PX_BLUE] = 0;
+ pixel[PX_ALPHA] = 255;
+ }
+ }
+ else
+ {
+ if (x == P_WIDTH / 2)
+ {
+ /* yellow */
+ pixel[PX_RED] = 255;
+ pixel[PX_GREEN] = 255;
+ pixel[PX_BLUE] = 0;
+ pixel[PX_ALPHA] = 255;
+ }
+ }
+ }
+ }
return pixbuf;
}
@@ -211,34 +211,26 @@
desc = getDescriptionFromMetaData (info->meta);
name = getFileNameFromMetaData (info->meta);
size = GNUNET_ECRS_uri_test_chk (info->uri)
- || GNUNET_ECRS_uri_test_loc (info->
- uri) ? GNUNET_ECRS_uri_get_file_size (info->
- uri) :
- 0;
+ || GNUNET_ECRS_uri_test_loc (info->uri) ?
+ GNUNET_ECRS_uri_get_file_size (info->uri) : 0;
pixbuf = getThumbnailFromMetaData (info->meta);
size_h = GNUNET_get_byte_size_as_fancy_string (size);
- rankbuf = make_ranking_pixbuf(0, 0, 1,
-
GNUNET_ECRS_uri_get_keyword_count_from_ksk(searchContext->uri));
- gtk_tree_store_set (searchContext->tree,
- iter,
- SEARCH_NAME, name,
- SEARCH_SIZE, size,
- SEARCH_HSIZE, size_h,
- SEARCH_MIME, mime,
- SEARCH_DESC, desc,
- SEARCH_PIXBUF, pixbuf,
+ rankbuf = make_ranking_pixbuf (0, 0, 1,
+ GNUNET_ECRS_uri_get_keyword_count_from_ksk
+ (searchContext->uri));
+ gtk_tree_store_set (searchContext->tree, iter, SEARCH_NAME, name,
+ SEARCH_SIZE, size, SEARCH_HSIZE, size_h, SEARCH_MIME,
+ mime, SEARCH_DESC, desc, SEARCH_PIXBUF, pixbuf,
SEARCH_URI, GNUNET_ECRS_uri_duplicate (info->uri),
- SEARCH_META, GNUNET_ECRS_meta_data_duplicate
(info->meta),
+ SEARCH_META,
+ GNUNET_ECRS_meta_data_duplicate (info->meta),
SEARCH_CELL_BG_COLOR, getColorCode (state),
- SEARCH_CELL_FG_COLOR, "black",
- SEARCH_INTERNAL, searchContext,
- SEARCH_INTERNAL_PARENT, downloadParent,
- SEARCH_STATUS, getStatusName (state),
- SEARCH_APPLICABILITY_RANK, 1,
- SEARCH_RANK_SORT, (long long) 1,
- SEARCH_RANK_PIXBUF, rankbuf,
- -1);
- g_object_unref(rankbuf);
+ SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
+ searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
+ SEARCH_STATUS, getStatusName (state),
+ SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT,
+ (long long) 1, SEARCH_RANK_PIXBUF, rankbuf, -1);
+ g_object_unref (rankbuf);
if (pixbuf != NULL)
g_object_unref (pixbuf);
GNUNET_free (size_h);
@@ -301,11 +293,12 @@
* @param availability_rank availability estimate
* @param applicability_rank relevance
*/
-void fs_search_update (SearchList * searchContext,
- const GNUNET_ECRS_FileInfo * info,
- int availability_rank,
- unsigned int availability_certainty,
- unsigned int applicability_rank)
+void
+fs_search_update (SearchList * searchContext,
+ const GNUNET_ECRS_FileInfo * info,
+ int availability_rank,
+ unsigned int availability_certainty,
+ unsigned int applicability_rank)
{
GtkTreeStore *model;
GtkTreeIter iter;
@@ -314,7 +307,7 @@
long long rank;
unsigned int kwords;
- kwords = GNUNET_ECRS_uri_get_keyword_count_from_ksk(searchContext->uri);
+ kwords = GNUNET_ECRS_uri_get_keyword_count_from_ksk (searchContext->uri);
model = GTK_TREE_STORE (gtk_tree_view_get_model (searchContext->treeview));
/* find existing entry */
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
@@ -324,31 +317,33 @@
have = NULL;
gtk_tree_model_get (GTK_TREE_MODEL (model),
&iter, SEARCH_URI, &have, -1);
- if ( (have != NULL) &&
- (GNUNET_ECRS_uri_test_equal (have, info->uri)) )
- {
- /* gotcha, create pixbuf and rank info! */
- rank = (int) applicability_rank + (int) (availability_rank *
(int) availability_certainty * 65536);
- pixbuf = make_ranking_pixbuf(availability_rank,
- availability_certainty,
- applicability_rank,
- kwords);
- gtk_tree_store_set(searchContext->tree,
- &iter,
- SEARCH_AVAILABILITY_RANK, availability_rank,
- SEARCH_AVAILABILITY_CERTAINTY,
availability_certainty,
- SEARCH_APPLICABILITY_RANK, applicability_rank,
- SEARCH_RANK_PIXBUF, pixbuf,
- SEARCH_RANK_SORT, rank,
- -1);
- g_object_unref (pixbuf);
- return; /* done! */
- }
+ if ((have != NULL) &&
+ (GNUNET_ECRS_uri_test_equal (have, info->uri)))
+ {
+ /* gotcha, create pixbuf and rank info! */
+ rank =
+ (int) applicability_rank +
+ (int) (availability_rank * (int) availability_certainty *
+ 65536);
+ pixbuf =
+ make_ranking_pixbuf (availability_rank,
+ availability_certainty,
+ applicability_rank, kwords);
+ gtk_tree_store_set (searchContext->tree, &iter,
+ SEARCH_AVAILABILITY_RANK, availability_rank,
+ SEARCH_AVAILABILITY_CERTAINTY,
+ availability_certainty,
+ SEARCH_APPLICABILITY_RANK,
+ applicability_rank, SEARCH_RANK_PIXBUF,
+ pixbuf, SEARCH_RANK_SORT, rank, -1);
+ g_object_unref (pixbuf);
+ return; /* done! */
+ }
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
}
/* not found!? */
- GNUNET_GE_BREAK(NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
}
@@ -361,10 +356,10 @@
GtkTreePath *path;
GtkTreeIter iter;
struct GNUNET_ECRS_URI *uri;
- struct GNUNET_ECRS_MetaData * meta;
+ struct GNUNET_ECRS_MetaData *meta;
char *str;
- GladeXML * xml;
- GtkWidget * dialog;
+ GladeXML *xml;
+ GtkWidget *dialog;
path = NULL;
if (FALSE == gtk_tree_view_get_path_at_pos (list->treeview,
@@ -386,21 +381,14 @@
uri = NULL;
meta = NULL;
gtk_tree_model_get (GTK_TREE_MODEL (list->tree),
- &iter,
- SEARCH_URI, &uri,
- SEARCH_META, &meta,
- -1);
+ &iter, SEARCH_URI, &uri, SEARCH_META, &meta, -1);
str = GNUNET_ECRS_uri_to_string (uri);
- xml = glade_xml_new(GNUNET_GTK_get_glade_filename (),
- "metaDisplayDialog",
- PACKAGE_NAME);
+ xml = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "metaDisplayDialog", PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (xml);
- dialog = glade_xml_get_widget (xml, "metaDisplayDialog");
- gtk_window_set_title(GTK_WINDOW(dialog), str);
- createMetaDataListTreeView(xml,
- "metaDisplayDialogTreeView",
- NULL,
- meta);
+ dialog = glade_xml_get_widget (xml, "metaDisplayDialog");
+ gtk_window_set_title (GTK_WINDOW (dialog), str);
+ createMetaDataListTreeView (xml, "metaDisplayDialogTreeView", NULL, meta);
gtk_dialog_run (GTK_DIALOG (dialog));
GNUNET_free_non_null (str);
gtk_widget_destroy (dialog);
@@ -571,7 +559,8 @@
entry = gtk_menu_item_new_with_label (_("_Display metadata"));
g_signal_connect_swapped (entry,
"activate",
- G_CALLBACK (on_search_display_metadata_activate),
list);
+ G_CALLBACK (on_search_display_metadata_activate),
+ list);
gtk_label_set_use_underline (GTK_LABEL
(gtk_bin_get_child (GTK_BIN (entry))), TRUE);
gtk_widget_show (entry);
@@ -626,7 +615,7 @@
int i;
/* check that search does not already exist
- with fsui_list == NULL;
+ with fsui_list == NULL;
(and if so, hijack!) */
list = search_head;
while (list != NULL)
@@ -646,7 +635,7 @@
}
/* build new entry */
- if (GNUNET_ECRS_uri_test_ksk(uri))
+ if (GNUNET_ECRS_uri_test_ksk (uri))
description = GNUNET_ECRS_ksk_uri_to_human_readable_string (uri);
else
description = GNUNET_NS_sks_uri_to_human_readable_string (ectx, cfg, uri);
@@ -677,8 +666,7 @@
g_signal_connect_swapped (list->treeview,
"button-press-event",
G_CALLBACK (search_click_handler), list);
- list->tree = gtk_tree_store_new (SEARCH_NUM,
- G_TYPE_STRING, /* name */
+ list->tree = gtk_tree_store_new (SEARCH_NUM, G_TYPE_STRING, /* name */
G_TYPE_UINT64, /* size */
G_TYPE_STRING, /* human-readable size
*/
G_TYPE_STRING, /* mime-type */
@@ -691,12 +679,12 @@
G_TYPE_POINTER, /* internal: search
list */
G_TYPE_POINTER, /* internal: download
parent list */
G_TYPE_STRING, /* status */
- G_TYPE_INT, /* availability rank */
- G_TYPE_UINT, /* availability
certainty */
- G_TYPE_UINT, /* applicability rank */
- GDK_TYPE_PIXBUF, /* ranking
visualization */
- G_TYPE_INT64 /* numeric sort */
- );
+ G_TYPE_INT, /* availability rank */
+ G_TYPE_UINT, /* availability certainty */
+ G_TYPE_UINT, /* applicability rank */
+ GDK_TYPE_PIXBUF, /* ranking
visualization */
+ G_TYPE_INT64 /* numeric sort */
+ );
gtk_tree_view_set_model (list->treeview, GTK_TREE_MODEL (list->tree));
gtk_tree_selection_set_mode (gtk_tree_view_get_selection (list->treeview),
@@ -770,36 +758,39 @@
gtk_tree_view_column_set_reorderable (column, TRUE);
gtk_tree_view_column_set_sort_column_id (column, SEARCH_MIME);
-#if 0
+#if 0
/* colums for data visualized graphically */
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (list->treeview,
- -1,
- _("Availability"),
- renderer,
- "text", SEARCH_AVAILABILITY_RANK,
- NULL);
+ -1,
+ _("Availability"),
+ renderer,
+ "text",
+ SEARCH_AVAILABILITY_RANK,
+ NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (list->treeview,
- -1,
- _("Certainty"),
- renderer,
- "text",
SEARCH_AVAILABILITY_CERTAINTY,
- NULL);
+ -1,
+ _("Certainty"),
+ renderer,
+ "text",
+ SEARCH_AVAILABILITY_CERTAINTY,
+ NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (list->treeview,
- -1,
- _("Applicability"),
- renderer,
- "text",
SEARCH_APPLICABILITY_RANK,
- NULL);
+ -1,
+ _("Applicability"),
+ renderer,
+ "text",
+ SEARCH_APPLICABILITY_RANK,
+ NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (list->treeview,
- -1,
- _("Sort"),
- renderer,
- "text", SEARCH_RANK_SORT,
- NULL);
+ -1,
+ _("Sort"),
+ renderer,
+ "text", SEARCH_RANK_SORT,
+ NULL);
#endif
renderer = gtk_cell_renderer_pixbuf_new ();
@@ -807,7 +798,8 @@
-1,
_("Ranking"),
renderer,
- "pixbuf",
SEARCH_RANK_PIXBUF,
+ "pixbuf",
+ SEARCH_RANK_PIXBUF,
NULL);
column = gtk_tree_view_get_column (list->treeview, col - 1);
gtk_tree_view_column_set_resizable (column, FALSE);
@@ -913,10 +905,7 @@
if (meta != NULL)
GNUNET_ECRS_meta_data_destroy (meta);
gtk_tree_store_set (GTK_TREE_STORE (tree),
- iter,
- SEARCH_URI, NULL,
- SEARCH_META, NULL,
- -1);
+ iter, SEARCH_URI, NULL, SEARCH_META, NULL, -1);
if (gtk_tree_model_iter_children (tree, &child, iter))
freeIterSubtree (tree, &child);
}
@@ -1229,7 +1218,7 @@
GNUNET_GE_ASSERT (ectx, list != NULL);
if (list->fsui_list == NULL)
{
- /* open directory or paused search;
+ /* open directory or paused search;
close directly */
fs_search_stopped (list);
}
Modified: gnunet-gtk/src/plugins/fs/search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/search.h 2008-06-02 02:52:58 UTC (rev 6993)
+++ gnunet-gtk/src/plugins/fs/search.h 2008-06-02 02:53:19 UTC (rev 6994)
@@ -62,10 +62,10 @@
* @param applicability_rank relevance
*/
void fs_search_update (SearchList * searchContext,
- const GNUNET_ECRS_FileInfo * info,
- int availability_rank,
- unsigned int availability_certainty,
- unsigned int applicability_rank);
+ const GNUNET_ECRS_FileInfo * info,
+ int availability_rank,
+ unsigned int availability_certainty,
+ unsigned int applicability_rank);
/**
* A search has been started. Open tab.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6994 - in gnunet-gtk/src/plugins: chat fs,
gnunet <=