[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29268 - gnunet-gtk/src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29268 - gnunet-gtk/src/fs |
|
Date: |
Sun, 15 Sep 2013 20:31:10 +0200 |
Author: grothoff
Date: 2013-09-15 20:31:10 +0200 (Sun, 15 Sep 2013)
New Revision: 29268
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
Log:
fix bad MC item in varargs, reformatting to make this easier to detect in
general
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2013-09-15 18:23:27 UTC
(rev 29267)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2013-09-15 18:31:10 UTC
(rev 29268)
@@ -582,7 +582,9 @@
finished_chain = GNUNET_NO;
build_relative_name (tm, iter, &finished_chain, &downloaddir, &relname,
&downloaded_anonymity);
- gtk_tree_model_get (tm, iter, SEARCH_TAB_MC_METADATA, &meta, -1);
+ gtk_tree_model_get (tm, iter,
+ SEARCH_TAB_MC_METADATA, &meta,
+ -1);
filename = GNUNET_FS_meta_data_suggest_filename (meta);
/* Don't trust metadata */
@@ -979,7 +981,8 @@
return;
}
gtk_tree_model_get (tm, &iter,
- SEARCH_TAB_MC_URI, &uri, -1);
+ SEARCH_TAB_MC_URI, &uri,
+ -1);
gtk_tree_path_free (path);
if (uri == NULL)
{
@@ -1502,23 +1505,19 @@
SEARCH_TAB_MC_FILESIZE, &filesize,
SEARCH_TAB_MC_PREVIEW, &preview,
SEARCH_TAB_MC_PERCENT_PROGRESS, &percent_progress,
- SEARCH_TAB_MC_PERCENT_AVAILABILITY,
- &percent_availability,
- SEARCH_TAB_MC_UNKNOWN_AVAILABILITY,
- &unknown_availability,
+ SEARCH_TAB_MC_PERCENT_AVAILABILITY,
&percent_availability,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY,
&unknown_availability,
SEARCH_TAB_MC_FILENAME, &filename,
SEARCH_TAB_MC_URI_AS_STRING, &uri_as_string,
SEARCH_TAB_MC_STATUS_COLOUR, &status_colour,
SEARCH_TAB_MC_SEARCH_RESULT, &search_result_old,
SEARCH_TAB_MC_MIMETYPE, &mimetype,
SEARCH_TAB_MC_APPLICABILITY_RANK, &applicability_rank,
- SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
- &availability_certainty,
+ SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
&availability_certainty,
SEARCH_TAB_MC_AVAILABILITY_RANK, &availability_rank,
SEARCH_TAB_MC_COMPLETED, &completed,
SEARCH_TAB_MC_DOWNLOADED_FILENAME,
&downloaded_filename,
- SEARCH_TAB_MC_DOWNLOADED_ANONYMITY,
- &downloaded_anonymity,
+ SEARCH_TAB_MC_DOWNLOADED_ANONYMITY,
&downloaded_anonymity,
SEARCH_TAB_MC_SHOW_NS_ASSOCIATION,
&show_ns_association,
-1);
search_result_new = GNUNET_new (struct SearchResult);
@@ -1533,39 +1532,25 @@
}
gtk_tree_store_insert_with_values (dst_tab->ts, &dst_child,
dst_iter, G_MAXINT,
- SEARCH_TAB_MC_METADATA,
- GNUNET_CONTAINER_meta_data_duplicate
(meta),
- SEARCH_TAB_MC_URI,
- GNUNET_FS_uri_dup (uri),
+ SEARCH_TAB_MC_METADATA,
GNUNET_CONTAINER_meta_data_duplicate (meta),
+ SEARCH_TAB_MC_URI, GNUNET_FS_uri_dup
(uri),
SEARCH_TAB_MC_FILESIZE, filesize,
SEARCH_TAB_MC_PREVIEW, preview,
- SEARCH_TAB_MC_PERCENT_PROGRESS,
- percent_progress,
- SEARCH_TAB_MC_PERCENT_AVAILABILITY,
- percent_availability,
- SEARCH_TAB_MC_UNKNOWN_AVAILABILITY,
- unknown_availability,
+ SEARCH_TAB_MC_PERCENT_PROGRESS,
percent_progress,
+ SEARCH_TAB_MC_PERCENT_AVAILABILITY,
percent_availability,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY,
unknown_availability,
SEARCH_TAB_MC_FILENAME, filename,
- SEARCH_TAB_MC_URI_AS_STRING,
- uri_as_string,
- SEARCH_TAB_MC_STATUS_COLOUR,
- status_colour,
- SEARCH_TAB_MC_SEARCH_RESULT,
- search_result_new,
+ SEARCH_TAB_MC_URI_AS_STRING,
uri_as_string,
+ SEARCH_TAB_MC_STATUS_COLOUR,
status_colour,
+ SEARCH_TAB_MC_SEARCH_RESULT,
search_result_new,
SEARCH_TAB_MC_MIMETYPE, mimetype,
- SEARCH_TAB_MC_APPLICABILITY_RANK,
- applicability_rank,
- SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
- availability_certainty,
- SEARCH_TAB_MC_AVAILABILITY_RANK,
- availability_rank,
+ SEARCH_TAB_MC_APPLICABILITY_RANK,
applicability_rank,
+ SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
availability_certainty,
+ SEARCH_TAB_MC_AVAILABILITY_RANK,
availability_rank,
SEARCH_TAB_MC_COMPLETED, completed,
- SEARCH_TAB_MC_DOWNLOADED_FILENAME,
- downloaded_filename,
- SEARCH_TAB_MC_DOWNLOADED_ANONYMITY,
- downloaded_anonymity,
- SEARCH_TAB_MC_SHOW_NS_ASSOCIATION,
- show_ns_association,
+ SEARCH_TAB_MC_DOWNLOADED_FILENAME,
downloaded_filename,
+ SEARCH_TAB_MC_DOWNLOADED_ANONYMITY,
downloaded_anonymity,
+ SEARCH_TAB_MC_SHOW_NS_ASSOCIATION,
show_ns_association,
-1);
g_free (filename);
g_free (downloaded_filename);
@@ -1634,8 +1619,7 @@
SEARCH_TAB_MC_FILENAME, &filename,
SEARCH_TAB_MC_STATUS_COLOUR, &status_colour,
SEARCH_TAB_MC_APPLICABILITY_RANK, &applicability_rank,
- SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
- &availability_certainty,
+ SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
&availability_certainty,
SEARCH_TAB_MC_AVAILABILITY_RANK, &availability_rank,
SEARCH_TAB_MC_COMPLETED, &completed,
SEARCH_TAB_MC_DOWNLOADED_FILENAME, &downloaded_filename,
@@ -1673,8 +1657,7 @@
SEARCH_TAB_MC_FILENAME, filename,
SEARCH_TAB_MC_STATUS_COLOUR, status_colour,
SEARCH_TAB_MC_APPLICABILITY_RANK, applicability_rank,
- SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
- availability_certainty,
+ SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
availability_certainty,
SEARCH_TAB_MC_AVAILABILITY_RANK, availability_rank,
SEARCH_TAB_MC_COMPLETED, completed,
SEARCH_TAB_MC_DOWNLOADED_FILENAME, downloaded_filename,
@@ -2201,17 +2184,14 @@
else
percent_avail = 50;
gtk_tree_store_set (ts, &iter,
- SEARCH_TAB_MC_METADATA,
- GNUNET_CONTAINER_meta_data_duplicate (meta),
+ SEARCH_TAB_MC_METADATA,
GNUNET_CONTAINER_meta_data_duplicate (meta),
SEARCH_TAB_MC_PREVIEW, pixbuf,
SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint)
percent_avail,
SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (0 ==
availability_certainty) ? (gint) (probe_time.rel_value_us /
GNUNET_FS_PROBE_UPDATE_FREQUENCY.rel_value_us) : -1,
SEARCH_TAB_MC_FILENAME, desc,
SEARCH_TAB_MC_MIMETYPE, mime,
- SEARCH_TAB_MC_APPLICABILITY_RANK,
- (guint) applicability_rank,
- SEARCH_TAB_MC_AVAILABILITY_CERTAINTY,
- (guint) availability_certainty,
+ SEARCH_TAB_MC_APPLICABILITY_RANK, (guint)
applicability_rank,
+ SEARCH_TAB_MC_AVAILABILITY_CERTAINTY, (guint)
availability_certainty,
SEARCH_TAB_MC_AVAILABILITY_RANK, (gint)
availability_rank,
-1);
if (pixbuf != NULL)
@@ -2371,24 +2351,19 @@
ts = tab->ts;
}
gtk_tree_store_insert_with_values (ts, &iter, pitr, G_MAXINT,
- SEARCH_TAB_MC_METADATA,
- GNUNET_CONTAINER_meta_data_duplicate
(meta),
- SEARCH_TAB_MC_URI,
- (uri == NULL) ? NULL : GNUNET_FS_uri_dup
(uri),
+ SEARCH_TAB_MC_METADATA,
GNUNET_CONTAINER_meta_data_duplicate (meta),
+ SEARCH_TAB_MC_URI, (uri == NULL) ? NULL :
GNUNET_FS_uri_dup (uri),
SEARCH_TAB_MC_FILESIZE, fsize,
SEARCH_TAB_MC_PREVIEW, pixbuf,
SEARCH_TAB_MC_PERCENT_PROGRESS, 0,
- SEARCH_TAB_MC_PERCENT_AVAILABILITY,
- (fsize == 0) ? 100 : 50,
- SEARCH_TAB_MC_UNKNOWN_AVAILABILITY,
- (fsize == 0) ? -1 : 0,
+ SEARCH_TAB_MC_PERCENT_AVAILABILITY, (0 ==
fsize) ? 100 : 50,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (0 ==
fsize) ? -1 : 0,
SEARCH_TAB_MC_FILENAME, desc,
SEARCH_TAB_MC_URI_AS_STRING, uris,
SEARCH_TAB_MC_STATUS_COLOUR,
status_colour,
SEARCH_TAB_MC_SEARCH_RESULT, sr,
SEARCH_TAB_MC_MIMETYPE, mime,
- SEARCH_TAB_MC_APPLICABILITY_RANK,
- applicability_rank,
+ SEARCH_TAB_MC_APPLICABILITY_RANK,
applicability_rank,
SEARCH_TAB_MC_AVAILABILITY_CERTAINTY, 0,
SEARCH_TAB_MC_AVAILABILITY_RANK, 0,
SEARCH_TAB_MC_COMPLETED, (guint64) 0,
@@ -2452,7 +2427,9 @@
char *suggested_filename;
int anonymity = -1;
- gtk_tree_store_set (ts, &iter, SEARCH_TAB_MC_DOWNLOADED_FILENAME,
filename, -1);
+ gtk_tree_store_set (ts, &iter,
+ SEARCH_TAB_MC_DOWNLOADED_FILENAME, filename,
+ -1);
download_directory = NULL;
suggested_filename = get_suggested_filename_anonymity2 (GTK_TREE_MODEL
(ts), &iter,
@@ -2883,7 +2860,9 @@
{
do
{
- gtk_tree_model_get (tm, &iter, SEARCH_TAB_MC_URI, &xuri, -1);
+ gtk_tree_model_get (tm, &iter,
+ SEARCH_TAB_MC_URI, &xuri,
+ -1);
if (GNUNET_YES == GNUNET_FS_uri_test_equal (xuri, uri))
return; /* already present */
}
@@ -2940,8 +2919,7 @@
space in the display? Probably yes, at least once we have
a custom CellRenderer... */
gtk_tree_store_set (de->sr->tab->ts, &iter,
- SEARCH_TAB_MC_PERCENT_PROGRESS,
- (guint) ((size > 0) ? (100 * completed / size) : 100),
+ SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ?
(100 * completed / size) : 100),
SEARCH_TAB_MC_COMPLETED, completed,
-1);
if (completed < size)
@@ -2965,7 +2943,8 @@
/* Mime type was wrong, this is not a directory, update model! */
de->is_directory = GNUNET_SYSERR;
gtk_tree_store_set (de->sr->tab->ts, &iter,
- SEARCH_TAB_MC_MIMETYPE, "", -1);
+ SEARCH_TAB_MC_MIMETYPE, "",
+ -1);
}
}
}
@@ -3019,8 +2998,7 @@
gtk_tree_store_set (de->sr->tab->ts, &iter,
SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 0,
SEARCH_TAB_MC_URI_AS_STRING, emsg,
- SEARCH_TAB_MC_STATUS_ICON,
- GNUNET_GTK_animation_context_get_pixbuf (animation_error),
+ SEARCH_TAB_MC_STATUS_ICON,
GNUNET_GTK_animation_context_get_pixbuf (animation_error),
-1);
}
@@ -3052,8 +3030,7 @@
SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 100,
SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) 100,
SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, -1,
- SEARCH_TAB_MC_STATUS_ICON,
- GNUNET_GTK_animation_context_get_pixbuf
(animation_downloaded),
+ SEARCH_TAB_MC_STATUS_ICON,
GNUNET_GTK_animation_context_get_pixbuf (animation_downloaded),
-1);
}
@@ -3193,16 +3170,14 @@
}
gtk_tree_path_free (path);
gtk_tree_store_set (de->sr->tab->ts, &iter,
- SEARCH_TAB_MC_PERCENT_PROGRESS,
- (guint) ((size > 0) ? (100 * completed / size) : 100),
+ SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ?
(100 * completed / size) : 100),
SEARCH_TAB_MC_FILENAME, filename,
SEARCH_TAB_MC_STATUS_COLOUR, "blue",
SEARCH_TAB_MC_SEARCH_RESULT, de->sr,
SEARCH_TAB_MC_COMPLETED, (guint64) completed,
SEARCH_TAB_MC_DOWNLOADED_FILENAME, de->filename,
SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, de->anonymity,
- SEARCH_TAB_MC_STATUS_ICON,
- GNUNET_GTK_animation_context_get_pixbuf
(animation_download_stalled),
+ SEARCH_TAB_MC_STATUS_ICON,
GNUNET_GTK_animation_context_get_pixbuf (animation_download_stalled),
-1);
return de;
}
@@ -3237,7 +3212,9 @@
return;
}
gtk_tree_path_free (path);
- gtk_tree_store_set (pe->tab->ts, &iter, PUBLISH_TAB_MC_BGCOLOUR, color, -1);
+ gtk_tree_store_set (pe->tab->ts, &iter,
+ PUBLISH_TAB_MC_BGCOLOUR, color,
+ -1);
}
@@ -3265,8 +3242,7 @@
}
gtk_tree_path_free (path);
gtk_tree_store_set (pe->tab->ts, &iter,
- PUBLISH_TAB_MC_PROGRESS,
- (guint) ((size > 0) ? (100 * completed / size) : 100),
+ PUBLISH_TAB_MC_PROGRESS, (guint) ((size > 0) ? (100 *
completed / size) : 100),
-1);
}
@@ -3299,8 +3275,7 @@
gtk_tree_store_set (pe->tab->ts, &iter,
PUBLISH_TAB_MC_RESULT_STRING, uris,
PUBLISH_TAB_MC_PROGRESS, 100,
- PUBLISH_TAB_MC_STATUS_ICON,
- GNUNET_GTK_animation_context_get_pixbuf
(animation_published),
+ PUBLISH_TAB_MC_STATUS_ICON,
GNUNET_GTK_animation_context_get_pixbuf (animation_published),
-1);
GNUNET_free (uris);
change_publish_color (pe, "green");
@@ -3334,9 +3309,7 @@
gtk_tree_store_set (pe->tab->ts, &iter,
PUBLISH_TAB_MC_RESULT_STRING, emsg,
PUBLISH_TAB_MC_PROGRESS, 100,
- PUBLISH_TAB_MC_STATUS_ICON,
- SEARCH_TAB_MC_STATUS_ICON,
- GNUNET_GTK_animation_context_get_pixbuf (animation_error),
+ PUBLISH_TAB_MC_STATUS_ICON,
GNUNET_GTK_animation_context_get_pixbuf (animation_error),
-1);
change_publish_color (pe, "red");
}
@@ -3431,7 +3404,9 @@
tm = GTK_TREE_MODEL (publish_tab->ts);
while (gtk_tree_model_iter_children (tm, &iter, NULL))
{
- gtk_tree_model_get (tm, &iter, PUBLISH_TAB_MC_ENT, &pe, -1);
+ gtk_tree_model_get (tm, &iter,
+ PUBLISH_TAB_MC_ENT, &pe,
+ -1);
GNUNET_FS_publish_stop (pe->pc);
}
clear_metadata_display ();
@@ -3539,8 +3514,7 @@
PUBLISH_TAB_MC_BGCOLOUR, "white",
PUBLISH_TAB_MC_PROGRESS, (guint) 0,
PUBLISH_TAB_MC_ENT, ent,
- PUBLISH_TAB_MC_STATUS_ICON,
- GNUNET_GTK_animation_context_get_pixbuf
(animation_publishing),
+ PUBLISH_TAB_MC_STATUS_ICON,
GNUNET_GTK_animation_context_get_pixbuf (animation_publishing),
-1);
GNUNET_free (size_fancy);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (publish_tab->ts), &iter);
@@ -3664,7 +3638,9 @@
struct PublishEntry *pe;
struct PublishListPopupContext *ppc;
- gtk_tree_model_get (tm, iter, PUBLISH_TAB_MC_ENT, &pe, -1);
+ gtk_tree_model_get (tm, iter,
+ PUBLISH_TAB_MC_ENT, &pe,
+ -1);
if ( (NULL == pe->uri) &&
( (NULL == pe->pc) ||
(GNUNET_NO == pe->is_top) ) )
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29268 - gnunet-gtk/src/fs,
gnunet <=