[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7043 - in gnunet-gtk/src/plugins: chat fs fs/extensions
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7043 - in gnunet-gtk/src/plugins: chat fs fs/extensions |
|
Date: |
Tue, 3 Jun 2008 23:56:31 -0600 (MDT) |
Author: grothoff
Date: 2008-06-03 23:56:31 -0600 (Tue, 03 Jun 2008)
New Revision: 7043
Modified:
gnunet-gtk/src/plugins/chat/chat.c
gnunet-gtk/src/plugins/fs/content_tracking.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_search.c
gnunet-gtk/src/plugins/fs/namespace_search.h
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/upload.c
gnunet-gtk/src/plugins/fs/upload.h
Log:
re-indenting
Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c 2008-06-04 05:56:20 UTC (rev 7042)
+++ gnunet-gtk/src/plugins/chat/chat.c 2008-06-04 05:56:31 UTC (rev 7043)
@@ -187,8 +187,8 @@
sndr =
sender == NULL ? _("anonymous") : GNUNET_pseudonym_id_to_name (chat_ectx,
- chat_cfg,
- sender);
+ chat_cfg,
+ sender);
writearg.text_view = client->text_view;
writearg.message = message;
writearg.sender = sndr;
Modified: gnunet-gtk/src/plugins/fs/content_tracking.c
===================================================================
--- gnunet-gtk/src/plugins/fs/content_tracking.c 2008-06-04 05:56:20 UTC
(rev 7042)
+++ gnunet-gtk/src/plugins/fs/content_tracking.c 2008-06-04 05:56:31 UTC
(rev 7043)
@@ -122,16 +122,16 @@
"availableContentList");
model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
filename = GNUNET_meta_data_get_first_by_types (fi->meta,
- EXTRACTOR_FILENAME,
- EXTRACTOR_TITLE,
- EXTRACTOR_DESCRIPTION,
- EXTRACTOR_SUBJECT,
- EXTRACTOR_ARTIST,
- EXTRACTOR_AUTHOR,
- EXTRACTOR_PUBLISHER,
- EXTRACTOR_CREATOR,
- EXTRACTOR_PRODUCER,
- EXTRACTOR_UNKNOWN, -1);
+ EXTRACTOR_FILENAME,
+ EXTRACTOR_TITLE,
+ EXTRACTOR_DESCRIPTION,
+ EXTRACTOR_SUBJECT,
+ EXTRACTOR_ARTIST,
+ EXTRACTOR_AUTHOR,
+ EXTRACTOR_PUBLISHER,
+ EXTRACTOR_CREATOR,
+ EXTRACTOR_PRODUCER,
+ EXTRACTOR_UNKNOWN, -1);
if (filename == NULL)
{
filename = GNUNET_strdup (_("no name given"));
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2008-06-04 05:56:20 UTC (rev
7042)
+++ gnunet-gtk/src/plugins/fs/download.c 2008-06-04 05:56:31 UTC (rev
7043)
@@ -723,9 +723,8 @@
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)
+ (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);
@@ -824,9 +823,8 @@
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)] !=
- DIR_SEPARATOR)
+ (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/extensions/musicinsert.c
===================================================================
--- gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2008-06-04 05:56:20 UTC
(rev 7042)
+++ gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2008-06-04 05:56:31 UTC
(rev 7043)
@@ -518,13 +518,12 @@
while (dirkeywords[n])
{
GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
- dirkeywords[n]);
+ dirkeywords[n]);
n++;
}
/* Add a standard keyword to allow finding all available music albums
* on AFS in one search */
- GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
- "music album");
+ GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS, "music album");
/* Manage files metadatas */
@@ -548,8 +547,7 @@
useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
filesmetadatas =
- g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_MetaData *),
- 20);
+ g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_MetaData *), 20);
files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
i = 0;
do
@@ -572,28 +570,25 @@
if (tempmetas[1])
GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
- tempmetas[1]);
+ tempmetas[1]);
if ((useforallflags & 0x1) && dirmetas[0])
GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
- dirmetas[0]);
+ dirmetas[0]);
else if (!(useforallflags & 0x1) && tempmetas[2])
- GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_TITLE,
- tempmetas[2]);
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_TITLE, tempmetas[2]);
if ((useforallflags & 0x2) && dirmetas[1])
- GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST,
- dirmetas[1]);
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST, dirmetas[1]);
else if (!(useforallflags & 0x2) && tempmetas[3])
GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
- tempmetas[3]);
+ tempmetas[3]);
if (tempmetas[4])
- GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM,
- tempmetas[4]);
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM, tempmetas[4]);
if (tempmetas[5])
GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE,
- tempmetas[5]);
+ tempmetas[5]);
if (tempmetas[6])
GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT,
- tempmetas[6]);
+ tempmetas[6]);
if (!(useforallflags & 0x1))
{
@@ -601,7 +596,7 @@
while (dirkeywords[n])
{
GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
- dirkeywords[n]);
+ dirkeywords[n]);
n++;
}
}
@@ -612,15 +607,13 @@
while (tempkeywords[n])
{
GNUNET_meta_data_insert (tempmetadata,
- EXTRACTOR_KEYWORDS,
- tempkeywords[n]);
+ EXTRACTOR_KEYWORDS, tempkeywords[n]);
n++;
}
g_strfreev (tempkeywords);
/* Add a standard keyword to allow finding all available music files
* on AFS in one search */
- GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
- "music");
+ GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS, "music");
}
GNUNET_free (tempmetas);
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2008-06-04 05:56:20 UTC (rev 7042)
+++ gnunet-gtk/src/plugins/fs/fs.c 2008-06-04 05:56:31 UTC (rev 7043)
@@ -232,7 +232,7 @@
break;
case GNUNET_FSUI_upload_error:
fs_upload_error (event->data.UploadError.uc.cctx,
- event->data.UploadError.message);
+ event->data.UploadError.message);
break;
case GNUNET_FSUI_upload_aborted:
fs_upload_aborted (event->data.UploadAborted.uc.cctx);
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2008-06-04 05:56:20 UTC (rev 7042)
+++ gnunet-gtk/src/plugins/fs/meta.c 2008-06-04 05:56:31 UTC (rev 7043)
@@ -359,7 +359,7 @@
length);
free (thumb);
GNUNET_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA,
- binary);
+ binary);
GNUNET_free (binary);
}
}
@@ -471,14 +471,14 @@
char *name;
name = GNUNET_meta_data_get_first_by_types (meta,
- EXTRACTOR_FILENAME,
- EXTRACTOR_TITLE,
- EXTRACTOR_ARTIST,
- EXTRACTOR_AUTHOR,
- EXTRACTOR_PUBLISHER,
- EXTRACTOR_CREATOR,
- EXTRACTOR_PRODUCER,
- EXTRACTOR_UNKNOWN, -1);
+ EXTRACTOR_FILENAME,
+ EXTRACTOR_TITLE,
+ EXTRACTOR_ARTIST,
+ EXTRACTOR_AUTHOR,
+ EXTRACTOR_PUBLISHER,
+ EXTRACTOR_CREATOR,
+ EXTRACTOR_PRODUCER,
+ EXTRACTOR_UNKNOWN, -1);
if (name == NULL)
{
name = GNUNET_strdup (_("no name given"));
@@ -499,14 +499,14 @@
char *desc;
desc = GNUNET_meta_data_get_first_by_types (meta,
- EXTRACTOR_DESCRIPTION,
- EXTRACTOR_GENRE,
- EXTRACTOR_ALBUM,
- EXTRACTOR_COMMENT,
- EXTRACTOR_SUBJECT,
- EXTRACTOR_FORMAT,
- EXTRACTOR_SIZE,
- EXTRACTOR_KEYWORDS, -1);
+ EXTRACTOR_DESCRIPTION,
+ EXTRACTOR_GENRE,
+ EXTRACTOR_ALBUM,
+ EXTRACTOR_COMMENT,
+ EXTRACTOR_SUBJECT,
+ EXTRACTOR_FORMAT,
+ EXTRACTOR_SIZE,
+ EXTRACTOR_KEYWORDS, -1);
if (desc == NULL)
desc = GNUNET_strdup ("");
return GNUNET_GTK_validate_utf8 (desc);
Modified: gnunet-gtk/src/plugins/fs/meta.h
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.h 2008-06-04 05:56:20 UTC (rev 7042)
+++ gnunet-gtk/src/plugins/fs/meta.h 2008-06-04 05:56:31 UTC (rev 7043)
@@ -53,8 +53,8 @@
void handleListRemove (GladeXML * xml, const char *listName);
struct GNUNET_MetaData *getMetaDataFromList (GladeXML * xml,
- const char *name,
- const char *preview);
+ const char *name,
+ const char *preview);
struct GNUNET_ECRS_URI *getKeywordURIFromList (GladeXML * xml,
const char *name);
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2008-06-04 05:56:20 UTC (rev
7042)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2008-06-04 05:56:31 UTC (rev
7043)
@@ -321,14 +321,14 @@
GNUNET_GTK_DEBUG_BEGIN ();
filename = GNUNET_meta_data_get_first_by_types (fi->meta,
- EXTRACTOR_FILENAME,
- EXTRACTOR_TITLE,
- EXTRACTOR_ARTIST,
- EXTRACTOR_AUTHOR,
- EXTRACTOR_PUBLISHER,
- EXTRACTOR_CREATOR,
- EXTRACTOR_PRODUCER,
- EXTRACTOR_UNKNOWN, -1);
+ EXTRACTOR_FILENAME,
+ EXTRACTOR_TITLE,
+ EXTRACTOR_ARTIST,
+ EXTRACTOR_AUTHOR,
+ EXTRACTOR_PUBLISHER,
+ EXTRACTOR_CREATOR,
+ EXTRACTOR_PRODUCER,
+ EXTRACTOR_UNKNOWN, -1);
if (filename == NULL)
filename = GNUNET_strdup (_("no name given"));
else
@@ -339,14 +339,14 @@
dotdot[0] = dotdot[1] = '_';
}
desc = GNUNET_meta_data_get_first_by_types (fi->meta,
- EXTRACTOR_DESCRIPTION,
- EXTRACTOR_GENRE,
- EXTRACTOR_ALBUM,
- EXTRACTOR_COMMENT,
- EXTRACTOR_SUBJECT,
- EXTRACTOR_FORMAT,
- EXTRACTOR_SIZE,
- EXTRACTOR_KEYWORDS, -1);
+ EXTRACTOR_DESCRIPTION,
+ EXTRACTOR_GENRE,
+ EXTRACTOR_ALBUM,
+ EXTRACTOR_COMMENT,
+ EXTRACTOR_SUBJECT,
+ EXTRACTOR_FORMAT,
+ EXTRACTOR_SIZE,
+ EXTRACTOR_KEYWORDS, -1);
if (desc == NULL)
desc = GNUNET_strdup ("");
mime = GNUNET_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
@@ -994,7 +994,8 @@
GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
GNUNET_pseudonym_list_all (ectx, cfg, &addTabForNamespace, NULL);
GNUNET_pseudonym_register_discovery_callback (ectx, cfg,
- &namespace_discovered_cb, NULL);
+ &namespace_discovered_cb,
+ NULL);
GNUNET_GTK_DEBUG_END ();
}
@@ -1003,7 +1004,7 @@
fs_namespace_stop ()
{
GNUNET_pseudonym_unregister_discovery_callback (&namespace_discovered_cb,
- NULL);
+ NULL);
while (head != NULL)
frame_destroy (head->treeview);
GNUNET_URITRACK_unregister_track_callback (&updateViewSave, NULL);
Modified: gnunet-gtk/src/plugins/fs/namespace_search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.c 2008-06-04 05:56:20 UTC
(rev 7042)
+++ gnunet-gtk/src/plugins/fs/namespace_search.c 2008-06-04 05:56:31 UTC
(rev 7043)
@@ -83,7 +83,7 @@
GNUNET_enc_to_hash (encStr, &nsid);
newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
rating = GNUNET_pseudonym_rank (ectx,
- cfg, &nsid, newrating - rating);
+ cfg, &nsid, newrating - rating);
if (rating != newrating)
{
/* concurrent modification? */
@@ -228,17 +228,17 @@
{
dmd = GNUNET_meta_data_duplicate (nni->md);
desc = GNUNET_meta_data_get_first_by_types (dmd,
- EXTRACTOR_DESCRIPTION,
- EXTRACTOR_TITLE,
- EXTRACTOR_AUTHOR,
- EXTRACTOR_GENRE,
- EXTRACTOR_SUBJECT,
- EXTRACTOR_CREATOR,
- EXTRACTOR_PRODUCER,
- EXTRACTOR_GROUP,
- EXTRACTOR_CREATED_FOR,
- EXTRACTOR_SUMMARY,
- EXTRACTOR_OWNER, -1);
+ EXTRACTOR_DESCRIPTION,
+ EXTRACTOR_TITLE,
+ EXTRACTOR_AUTHOR,
+ EXTRACTOR_GENRE,
+ EXTRACTOR_SUBJECT,
+ EXTRACTOR_CREATOR,
+ EXTRACTOR_PRODUCER,
+ EXTRACTOR_GROUP,
+ EXTRACTOR_CREATED_FOR,
+ EXTRACTOR_SUMMARY,
+ EXTRACTOR_OWNER, -1);
if (desc == NULL)
desc = GNUNET_strdup ("");
}
Modified: gnunet-gtk/src/plugins/fs/namespace_search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.h 2008-06-04 05:56:20 UTC
(rev 7042)
+++ gnunet-gtk/src/plugins/fs/namespace_search.h 2008-06-04 05:56:31 UTC
(rev 7043)
@@ -38,8 +38,7 @@
*/
int namespace_discovered_cb (void *cls,
const GNUNET_HashCode * namespaceId,
- const struct GNUNET_MetaData *md,
- int rating);
+ 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:56:20 UTC (rev 7042)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-04 05:56:31 UTC (rev 7043)
@@ -512,7 +512,7 @@
meta = GNUNET_meta_data_create ();
GNUNET_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
GNUNET_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
- _("Saved search results"));
+ _("Saved search results"));
GNUNET_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
&directory, &dir_len,
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2008-06-04 05:56:20 UTC (rev 7042)
+++ gnunet-gtk/src/plugins/fs/upload.c 2008-06-04 05:56:31 UTC (rev 7043)
@@ -97,13 +97,12 @@
gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
gtk_tree_path_free (path);
gtk_tree_store_set (upload_summary, &iter,
- UPLOAD_URISTRING, _("Aborted."),
- UPLOAD_PROGRESS, 0,
- -1);
+ UPLOAD_URISTRING, _("Aborted."),
+ UPLOAD_PROGRESS, 0, -1);
}
void
-fs_upload_error (UploadList * list, const char * emsg)
+fs_upload_error (UploadList * list, const char *emsg)
{
GtkTreeIter iter;
GtkTreePath *path;
@@ -112,17 +111,14 @@
list->has_terminated = GNUNET_YES;
list->uri = NULL;
- len = strlen(_("Error uploading file: `%s'")) + strlen(emsg) + 2;
- us = GNUNET_malloc(len);
- GNUNET_snprintf(us, len,
- _("Error uploading file: `%s'"),
- emsg);
+ len = strlen (_("Error uploading file: `%s'")) + strlen (emsg) + 2;
+ us = GNUNET_malloc (len);
+ GNUNET_snprintf (us, len, _("Error uploading file: `%s'"), emsg);
path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
gtk_tree_path_free (path);
gtk_tree_store_set (upload_summary, &iter,
- UPLOAD_URISTRING, us,
- UPLOAD_PROGRESS, 0, -1);
+ UPLOAD_URISTRING, us, UPLOAD_PROGRESS, 0, -1);
GNUNET_free (us);
}
Modified: gnunet-gtk/src/plugins/fs/upload.h
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.h 2008-06-04 05:56:20 UTC (rev 7042)
+++ gnunet-gtk/src/plugins/fs/upload.h 2008-06-04 05:56:31 UTC (rev 7043)
@@ -34,8 +34,7 @@
void fs_upload_complete (UploadList * list, struct GNUNET_ECRS_URI *uri);
-void fs_upload_error (UploadList * list,
- const char * emsg);
+void fs_upload_error (UploadList * list, const char *emsg);
void fs_upload_aborted (UploadList * list);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7043 - in gnunet-gtk/src/plugins: chat fs fs/extensions,
gnunet <=