[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18836 - in gnunet-gtk/src: fs include lib peerinfo setup s
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18836 - in gnunet-gtk/src: fs include lib peerinfo setup statistics |
|
Date: |
Mon, 26 Dec 2011 21:04:58 +0100 |
Author: grothoff
Date: 2011-12-26 21:04:58 +0100 (Mon, 26 Dec 2011)
New Revision: 18836
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
gnunet-gtk/src/fs/gnunet-fs-gtk-common.h
gnunet-gtk/src/fs/gnunet-fs-gtk-download.c
gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
gnunet-gtk/src/fs/gnunet-fs-gtk.c
gnunet-gtk/src/fs/gnunet-fs-gtk.h
gnunet-gtk/src/fs/metatypes.c
gnunet-gtk/src/include/gnunet_gtk.h
gnunet-gtk/src/lib/about.c
gnunet-gtk/src/lib/eventloop.c
gnunet-gtk/src/lib/nls.c
gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
gnunet-gtk/src/setup/gnunet-setup-options.c
gnunet-gtk/src/setup/gnunet-setup-transport.c
gnunet-gtk/src/setup/gnunet-setup.c
gnunet-gtk/src/statistics/functions.c
gnunet-gtk/src/statistics/functions.h
gnunet-gtk/src/statistics/gnunet-statistics-gtk-about.c
gnunet-gtk/src/statistics/gnunet-statistics-gtk.c
gnunet-gtk/src/statistics/gtk_statistics.c
gnunet-gtk/src/statistics/gtk_statistics.h
gnunet-gtk/src/statistics/gtk_statistics_demo.c
gnunet-gtk/src/statistics/statistics.c
Log:
-indentation
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-common.c 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-common.c 2011-12-26 20:04:58 UTC (rev
18836)
@@ -39,7 +39,8 @@
* freeable with GNUNET_free* ().
*/
char *
-GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format, const
char *data, size_t data_len)
+GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
+ const char *data, size_t data_len)
{
gchar *result = NULL;
@@ -51,18 +52,19 @@
else
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Failed to validate supposedly utf-8 string `%s' of length %u,
assuming it to be a C string\n",
- data, data_len);
+ "Failed to validate supposedly utf-8 string `%s' of length
%u, assuming it to be a C string\n",
+ data, data_len);
format = EXTRACTOR_METAFORMAT_C_STRING;
}
}
if (format == EXTRACTOR_METAFORMAT_C_STRING)
{
if (data_len > 0)
- { /* There are no guarantees that data is NULL-terminated, AFAIU,
- * so let's play it safe, shall we?
- */
+ { /* There are no guarantees that data is
NULL-terminated, AFAIU,
+ * so let's play it safe, shall we?
+ */
char *data_copy = GNUNET_malloc (data_len + 1);
+
memcpy (data_copy, data, data_len);
data_copy[data_len] = '\0';
result = GNUNET_GTK_from_loc_to_utf8 (data_copy);
@@ -100,7 +102,7 @@
data_to_insert = GNUNET_FS_GTK_dubious_meta_to_utf8 (format, data, data_len);
- if (NULL != data_to_insert)
+ if (NULL != data_to_insert)
{
gtk_list_store_insert_with_values (ls, NULL, G_MAXINT, 0, type, 1, format,
2, EXTRACTOR_metatype_to_string (type),
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-common.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-common.h 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-common.h 2011-12-26 20:04:58 UTC (rev
18836)
@@ -116,7 +116,7 @@
*/
char *
GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
- const char *data, size_t data_len);
+ const char *data, size_t data_len);
#endif
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-download.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-download.c 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-download.c 2011-12-26 20:04:58 UTC (rev
18836)
@@ -37,8 +37,8 @@
gboolean
-GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget *widget, GdkEvent *event,
- gpointer user_data)
+GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent *
event,
+ gpointer user_data)
{
GtkBuilder *builder;
struct dialog_context *dlc;
@@ -73,7 +73,8 @@
return FALSE;
}
GNUNET_free_non_null (dc->filename);
- dc->filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER
(dlc->dialog));
+ dc->filename =
+ GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (dlc->dialog));
dc->is_recursive =
(TRUE ==
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cb))) ? GNUNET_YES :
@@ -122,17 +123,19 @@
}
void
-GNUNET_GTK_save_as_dialog_response_cb (GtkDialog *dialog,
- gint response_id, gpointer user_data)
+GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog, gint response_id,
+ gpointer user_data)
{
struct dialog_context *dlc;
+
dlc = g_object_get_data (G_OBJECT (dialog), "dialog-context");
if (dlc != NULL)
dlc->response = response_id;
/* dialogs don't get delete-event the way normal windows do,
* call the handler manually
*/
- GNUNET_GTK_save_as_dialog_delete_event_cb (GTK_WIDGET (dialog), NULL,
user_data);
+ GNUNET_GTK_save_as_dialog_delete_event_cb (GTK_WIDGET (dialog), NULL,
+ user_data);
gtk_widget_destroy (GTK_WIDGET (dialog));
}
@@ -183,6 +186,7 @@
}
}
dlc = g_new0 (struct dialog_context, 1);
+
dlc->builder = builder;
dlc->dialog = ad;
dlc->response = 0;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c 2011-12-26
20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c 2011-12-26
20:04:58 UTC (rev 18836)
@@ -32,16 +32,20 @@
#include "metatypes.c"
-void change_metatypes (GtkBuilder *builder, gint code)
+void
+change_metatypes (GtkBuilder * builder, gint code)
{
GtkListStore *metatypes_list;
gint pub_type = 0, i;
gint pubtype_count = 0;
gint max_type;
GtkTreeIter iter;
- metatypes_list = GTK_LIST_STORE (gtk_builder_get_object (builder,
- "GNUNET_GTK_publication_metadata_types_liststore"));
+ metatypes_list =
+ GTK_LIST_STORE (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_publication_metadata_types_liststore"));
+
for (pub_type = 0; types[pub_type] != NULL; pub_type++)
pubtype_count += 1;
@@ -55,17 +59,20 @@
for (i = 0; types[pub_type][i] != EXTRACTOR_METATYPE_RESERVED; i++)
{
if (types[pub_type][i] < max_type && types[pub_type][i] > 0)
- gtk_list_store_insert_with_values (metatypes_list, &iter, G_MAXINT,
- 0, types[pub_type][i],
- 1, EXTRACTOR_METAFORMAT_UTF8,
- 2, EXTRACTOR_metatype_to_string (types[pub_type][i]),
- 3, EXTRACTOR_metatype_to_description (types[pub_type][i]), -1);
+ gtk_list_store_insert_with_values (metatypes_list, &iter, G_MAXINT, 0,
+ types[pub_type][i], 1,
+ EXTRACTOR_METAFORMAT_UTF8, 2,
+ EXTRACTOR_metatype_to_string (types
+
[pub_type]
+ [i]), 3,
+ EXTRACTOR_metatype_to_description
+ (types[pub_type][i]), -1);
}
}
void
-GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox *widget,
- gpointer user_data)
+GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox * widget,
+ gpointer user_data)
{
GtkTreeIter iter;
GtkBuilder *builder;
@@ -76,8 +83,9 @@
return;
builder = GTK_BUILDER (user_data);
- pubtypes_list = GTK_LIST_STORE (gtk_builder_get_object (builder,
- "GNUNET_GTK_publication_types_liststore"));
+ pubtypes_list =
+ GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_publication_types_liststore"));
gtk_tree_model_get (GTK_TREE_MODEL (pubtypes_list), &iter, 0, &code, -1);
@@ -116,8 +124,7 @@
sel = gtk_tree_view_get_selection (tv);
button =
GTK_WIDGET (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_edit_publication_delete_button"));
+ (builder, "GNUNET_GTK_edit_publication_delete_button"));
gtk_widget_set_sensitive (button,
gtk_tree_selection_get_selected (sel, NULL, NULL));
}
@@ -149,8 +156,8 @@
void
-GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkTreeView *tv;
@@ -158,14 +165,16 @@
builder = GTK_BUILDER (user_data);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_metadata_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_publication_metadata_tree_view"));
sel = gtk_tree_view_get_selection (tv);
g_signal_connect (G_OBJECT (sel), "changed",
G_CALLBACK (metadata_selection_changed_cb), builder);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_keyword_list_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_publication_keyword_list_tree_view"));
sel = gtk_tree_view_get_selection (tv);
g_signal_connect (G_OBJECT (sel), "changed",
G_CALLBACK (keywords_selection_changed_cb), builder);
@@ -173,8 +182,8 @@
void
-GNUNET_GTK_edit_publication_add_button_clicked_cb (GtkButton *button,
- gpointer user_data)
+GNUNET_GTK_edit_publication_add_button_clicked_cb (GtkButton * button,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkTreeView *meta_tree;
@@ -182,29 +191,37 @@
GtkTreeIter iter;
builder = GTK_BUILDER (user_data);
- meta_tree = GTK_TREE_VIEW (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_metadata_tree_view"));
+ meta_tree =
+ GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_publication_metadata_tree_view"));
meta_list = GTK_LIST_STORE (gtk_tree_view_get_model (meta_tree));
-
- gtk_list_store_insert (meta_list, &iter, 0);
+
+ gtk_list_store_insert (meta_list, &iter, 0);
/* type == 0 means "not set" */
- gtk_list_store_set (meta_list, &iter, 0, 0, 1, EXTRACTOR_METAFORMAT_UTF8,
- 2, _("Select a type"), 3, _("Specify a value"), 4, NULL, -1);
+ gtk_list_store_set (meta_list, &iter, 0, 0, 1, EXTRACTOR_METAFORMAT_UTF8, 2,
+ _("Select a type"), 3, _("Specify a value"), 4, NULL,
-1);
}
gboolean
-GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb (GtkWidget
*widget,
- GdkEventKey
*event, gpointer user_data)
+GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb (GtkWidget *
+ widget,
+ GdkEventKey *
+ event,
+ gpointer
+ user_data)
{
GtkBuilder *builder;
GtkButton *add_button;
+
builder = GTK_BUILDER (user_data);
if (event->keyval == GDK_KEY_Return)
{
- add_button = GTK_BUTTON (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_add_button"));
+ add_button =
+ GTK_BUTTON (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_add_button"));
GNUNET_GTK_edit_publication_add_button_clicked_cb (add_button, user_data);
return TRUE;
}
@@ -212,10 +229,9 @@
}
-void
-GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb
(GtkCellRendererText *renderer,
- gchar
*path, gchar *new_text,
-
gpointer user_data)
+void GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb
+ (GtkCellRendererText * renderer, gchar * path, gchar * new_text,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkTreeView *meta_tree;
@@ -228,14 +244,19 @@
GtkTreeIter *pass_data = NULL;
builder = GTK_BUILDER (user_data);
- meta_tree = GTK_TREE_VIEW (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_metadata_tree_view"));
+ meta_tree =
+ GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_publication_metadata_tree_view"));
meta_list = GTK_LIST_STORE (gtk_tree_view_get_model (meta_tree));
- if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (meta_list), &iter,
path))
+ if (!gtk_tree_model_get_iter_from_string
+ (GTK_TREE_MODEL (meta_list), &iter, path))
return;
- combo = GTK_CELL_RENDERER_COMBO (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer"));
+ combo =
+ GTK_CELL_RENDERER_COMBO (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer"));
pass_data = g_object_get_data (G_OBJECT (combo), "selected-type");
if (!pass_data)
@@ -247,15 +268,15 @@
g_object_set_data (G_OBJECT (combo), "selected-type", NULL);
gtk_list_store_set (meta_list, &iter, 0, type_id, 1,
- EXTRACTOR_METAFORMAT_UTF8, 2, new_text, 4, description, -1);
+ EXTRACTOR_METAFORMAT_UTF8, 2, new_text, 4, description,
+ -1);
g_free (description);
}
-void
-GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb (
- GtkCellRendererCombo *combo, gchar *path_string, GtkTreeIter *new_iter,
- gpointer user_data)
+void GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb
+ (GtkCellRendererCombo * combo, gchar * path_string, GtkTreeIter * new_iter,
+ gpointer user_data)
{
GtkTreeIter *pass_data;
@@ -268,10 +289,9 @@
}
-void
-GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (
- GtkCellRendererText *renderer, gchar *path, gchar *new_text,
- gpointer user_data)
+void GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb
+ (GtkCellRendererText * renderer, gchar * path, gchar * new_text,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkTreeView *meta_tree;
@@ -287,14 +307,17 @@
struct EditPublicationState *state = NULL;
builder = GTK_BUILDER (user_data);
- meta_tree = GTK_TREE_VIEW (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_metadata_tree_view"));
+ meta_tree =
+ GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_publication_metadata_tree_view"));
meta_list = GTK_LIST_STORE (gtk_tree_view_get_model (meta_tree));
- if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (meta_list), &iter,
path))
+ if (!gtk_tree_model_get_iter_from_string
+ (GTK_TREE_MODEL (meta_list), &iter, path))
return;
- pubwindow = gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_window");
+ pubwindow =
+ gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
state = g_object_get_data (pubwindow, PUBSTATE);
if (!state)
{
@@ -303,9 +326,8 @@
}
gtk_tree_model_get (GTK_TREE_MODEL (meta_list), &iter, 0, &metatype, -1);
- if (metatype == EXTRACTOR_METATYPE_FILENAME
- && new_text[strlen (new_text) - 1] != '/'
- && state->is_directory)
+ if (metatype == EXTRACTOR_METATYPE_FILENAME &&
+ new_text[strlen (new_text) - 1] != '/' && state->is_directory)
{
GNUNET_asprintf (&avalue, "%s/", new_text);
/* if user typed '\' instead of '/', change it! */
@@ -318,7 +340,7 @@
}
while (NULL != (pos = strstr (avalue, "\\")))
*pos = '/';
- // remove '../' everywhere
+ // remove '../' everywhere
while (NULL != (pos = strstr (avalue, "../")))
{
pos[0] = '_';
@@ -339,8 +361,8 @@
void
-GNUNET_GTK_edit_publication_delete_button_clicked_cb (GtkButton *button,
- gpointer user_data)
+GNUNET_GTK_edit_publication_delete_button_clicked_cb (GtkButton * button,
+ gpointer user_data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
@@ -363,8 +385,10 @@
void
-GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb (
- GtkButton
*button, gpointer user_data)
+GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb (GtkButton *
+ button,
+ gpointer
+ user_data)
{
const char *keyword;
GtkEntry *entry;
@@ -383,9 +407,10 @@
keyword = gtk_entry_get_text (entry);
if (strlen (keyword) > 0)
{
- gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, 1,
TRUE, -1);
- ok = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_confirm_button"));
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, 1,
TRUE,
+ -1);
+ ok = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_confirm_button"));
gtk_widget_set_sensitive (ok, TRUE);
}
gtk_entry_set_text (entry, "");
@@ -393,27 +418,29 @@
static gboolean
-gtk_tree_model_has_items_cb (GtkTreeModel *model, GtkTreePath *path,
- GtkTreeIter *iter, gpointer data)
+gtk_tree_model_has_items_cb (GtkTreeModel * model, GtkTreePath * path,
+ GtkTreeIter * iter, gpointer data)
{
gboolean *val = (gboolean *) data;
+
*val = TRUE;
return TRUE;
}
static gboolean
-gtk_tree_model_has_items (GtkTreeModel *model)
+gtk_tree_model_has_items (GtkTreeModel * model)
{
gboolean b = FALSE;
+
gtk_tree_model_foreach (model, >k_tree_model_has_items_cb, &b);
return b;
}
void
-GNUNET_GTK_edit_publication_keyword_entry_changed_cb (GtkEditable *editable,
- gpointer user_data)
+GNUNET_GTK_edit_publication_keyword_entry_changed_cb (GtkEditable * editable,
+ gpointer user_data)
{
const char *keyword;
GtkEntry *entry;
@@ -435,8 +462,10 @@
void
-GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (
- GtkButton *button, gpointer user_data)
+GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (GtkButton *
+ button,
+ gpointer
+ user_data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
@@ -446,6 +475,7 @@
GtkWidget *ok;
GObject *pubwindow;
struct EditPublicationState *state = NULL;
+
builder = GTK_BUILDER (user_data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -461,11 +491,11 @@
if (gtk_list_store_remove (GTK_LIST_STORE (tm), &iter))
gtk_tree_selection_select_iter (sel, &iter);
- ok = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_confirm_button"));
+ ok = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_confirm_button"));
- pubwindow = gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_window");
+ pubwindow =
+ gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
state = g_object_get_data (pubwindow, PUBSTATE);
if (!state)
{
@@ -478,9 +508,7 @@
}
-void
-GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (
- GtkFileChooserButton *widget, gpointer user_data)
+void
GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb
(GtkFileChooserButton * widget, gpointer user_data)
{
gchar *fn;
GtkImage *image;
@@ -488,8 +516,8 @@
GtkBuilder *builder = GTK_BUILDER (user_data);
struct EditPublicationState *state = NULL;
- pubwindow = gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_window");
+ pubwindow =
+ gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
state = g_object_get_data (pubwindow, PUBSTATE);
if (!state)
{
@@ -555,8 +583,8 @@
GObject *pubwindow;
struct EditPublicationState *state = NULL;
- pubwindow = gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_window");
+ pubwindow =
+ gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
state = g_object_get_data (pubwindow, PUBSTATE);
if (!state)
{
@@ -570,7 +598,8 @@
case EXTRACTOR_METAFORMAT_UTF8:
case EXTRACTOR_METAFORMAT_C_STRING:
tm = GTK_TREE_MODEL (gtk_builder_get_object
- (builder,
"GNUNET_GTK_publication_metadata_liststore"));
+ (builder,
+ "GNUNET_GTK_publication_metadata_liststore"));
if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
{
do
@@ -650,8 +679,8 @@
GObject *pubwindow;
struct EditPublicationState *state = NULL;
- pubwindow = gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_window");
+ pubwindow =
+ gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
state = g_object_get_data (pubwindow, PUBSTATE);
if (!state)
{
@@ -659,8 +688,9 @@
return GNUNET_SYSERR;
}
- if (!GNUNET_GTK_get_selected_anonymity_level (builder,
- "GNUNET_GTK_edit_publication_anonymity_combobox", &bo->anonymity_level))
+ if (!GNUNET_GTK_get_selected_anonymity_level
+ (builder, "GNUNET_GTK_edit_publication_anonymity_combobox",
+ &bo->anonymity_level))
return GNUNET_SYSERR;
bo->content_priority =
gtk_spin_button_get_value (GTK_SPIN_BUTTON
@@ -677,14 +707,14 @@
"GNUNET_GTK_edit_publication_expiration_year_spin_button"));
bo->expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
- if (! context->allow_no_keywords)
+ if (!context->allow_no_keywords)
{
g_free (context->root);
context->root =
- g_strdup (gtk_entry_get_text (GTK_ENTRY
- (gtk_builder_get_object
- (builder,
-
"GNUNET_GTK_edit_publication_root_entry"))));
+ g_strdup (gtk_entry_get_text
+ (GTK_ENTRY
+ (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_root_entry"))));
}
/* update URI */
if (NULL != (*uri))
@@ -726,7 +756,8 @@
gtk_tree_model_get (tm, &iter, 0, &ntype, 1, &nformat, 3, &value, -1);
if (ntype > 0)
GNUNET_CONTAINER_meta_data_insert (nm, "<user>", ntype, nformat,
- "text/plain", value, strlen (value) + 1);
+ "text/plain", value,
+ strlen (value) + 1);
g_free (value);
}
while (TRUE == gtk_tree_model_iter_next (tm, &iter));
@@ -775,8 +806,8 @@
void
-GNUNET_GTK_edit_publication_cancel_button_clicked_cb (
- GtkButton *button, gpointer user_data)
+GNUNET_GTK_edit_publication_cancel_button_clicked_cb (GtkButton * button,
+ gpointer user_data)
{
GtkBuilder *builder;
GObject *pubwindow;
@@ -784,8 +815,8 @@
builder = GTK_BUILDER (user_data);
- pubwindow = gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_window");
+ pubwindow =
+ gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
state = g_object_get_data (pubwindow, PUBSTATE);
if (!state)
{
@@ -794,7 +825,8 @@
}
state->cb (state->cls, state->do_index, state->short_fn,
- state->anonymity_level, state->priority, NULL,
GTK_RESPONSE_CANCEL);
+ state->anonymity_level, state->priority, NULL,
+ GTK_RESPONSE_CANCEL);
g_free (state);
g_object_set_data (pubwindow, PUBSTATE, NULL);
gtk_widget_hide (GTK_WIDGET (pubwindow));
@@ -802,7 +834,8 @@
void
-GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton *button,
gpointer user_data)
+GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
+ gpointer user_data)
{
GtkBuilder *builder;
GObject *pubwindow;
@@ -811,8 +844,8 @@
builder = GTK_BUILDER (user_data);
- pubwindow = gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_window");
+ pubwindow =
+ gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
state = g_object_get_data (pubwindow, PUBSTATE);
if (!state)
{
@@ -826,29 +859,27 @@
ctx.md = NULL;
ctx.allow_no_keywords = state->allow_no_keywords;
- GNUNET_FS_file_information_inspect (state->fip, &file_information_update,
&ctx);
+ GNUNET_FS_file_information_inspect (state->fip, &file_information_update,
+ &ctx);
state->short_fn = ctx.short_fn;
- if (!GNUNET_GTK_get_selected_anonymity_level (builder,
-
"GNUNET_GTK_edit_publication_anonymity_combobox",
- &state->anonymity_level))
+ if (!GNUNET_GTK_get_selected_anonymity_level
+ (builder, "GNUNET_GTK_edit_publication_anonymity_combobox",
+ &state->anonymity_level))
state->priority =
- gtk_spin_button_get_value (GTK_SPIN_BUTTON
- (gtk_builder_get_object
- (builder,
-
"GNUNET_GTK_edit_publication_priority_spin_button")));
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_publication_priority_spin_button")));
state->do_index =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
- (gtk_builder_get_object
- (builder,
-
"GNUNET_GTK_edit_publication_index_checkbutton")));
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_publication_index_checkbutton")));
- state->cb (state->cls,
- state->do_index,
- state->short_fn,
- state->anonymity_level,
- state->priority, ctx.root,
- GTK_RESPONSE_OK);
+ state->cb (state->cls, state->do_index, state->short_fn,
+ state->anonymity_level, state->priority, ctx.root,
+ GTK_RESPONSE_OK);
GNUNET_free_non_null (state->short_fn);
GNUNET_free (state);
g_object_set_data (pubwindow, PUBSTATE, NULL);
@@ -856,15 +887,18 @@
}
gboolean
-GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget *widget,
- GdkEvent *event, gpointer user_data)
+GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkButton *button;
+
builder = GTK_BUILDER (user_data);
- button = GTK_BUTTON (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_cancel_button"));
+ button =
+ GTK_BUTTON (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_cancel_button"));
GNUNET_GTK_edit_publication_cancel_button_clicked_cb (button, user_data);
return TRUE;
@@ -885,7 +919,8 @@
GtkTreeIter iter;
ls = GTK_LIST_STORE (cls);
- gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, 1,
FALSE, -1);
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, 1, FALSE,
+ -1);
return GNUNET_OK;
}
@@ -924,9 +959,12 @@
GNUNET_FS_uri_ksk_get_keywords (*uri, &add_keyword, ls);
if (NULL != meta)
{
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
- "GNUNET_GTK_publication_metadata_liststore"));
- GNUNET_CONTAINER_meta_data_iterate (meta,
&GNUNET_FS_GTK_add_meta_data_to_list_store, ls);
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_publication_metadata_liststore"));
+ GNUNET_CONTAINER_meta_data_iterate (meta,
+
&GNUNET_FS_GTK_add_meta_data_to_list_store,
+ ls);
pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
if (pixbuf != NULL)
{
@@ -944,7 +982,8 @@
"GNUNET_GTK_edit_publication_expiration_year_spin_button")),
year);
GNUNET_GTK_select_anonymity_level (builder,
-
"GNUNET_GTK_edit_publication_anonymity_combobox", bo->anonymity_level);
+
"GNUNET_GTK_edit_publication_anonymity_combobox",
+ bo->anonymity_level);
gtk_spin_button_set_value (GTK_SPIN_BUTTON
(gtk_builder_get_object
(builder,
@@ -964,15 +1003,13 @@
* short_fn MUST be UTF-8-encoded
*/
void
-GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder,
- GtkWindow *parent,
- int do_index,
- const char *short_fn,
- uint32_t anonymity_level,
- uint32_t priority,
- struct GNUNET_FS_FileInformation *fip,
- gboolean allow_no_keywords,
- GNUNET_FS_GTK_EditPublishDialogCallback cb,
gpointer cls)
+GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder * builder, GtkWindow * parent,
+ int do_index, const char *short_fn,
+ uint32_t anonymity_level, uint32_t priority,
+ struct GNUNET_FS_FileInformation *fip,
+ gboolean allow_no_keywords,
+ GNUNET_FS_GTK_EditPublishDialogCallback cb,
+ gpointer cls)
{
GtkWidget *dialog;
GObject *pubwindow;
@@ -994,32 +1031,40 @@
"GNUNET_GTK_edit_publication_index_checkbutton")));
gtk_widget_hide (GTK_WIDGET
(gtk_builder_get_object
- (builder,
- "GNUNET_GTK_edit_publication_index_label")));
+ (builder, "GNUNET_GTK_edit_publication_index_label")));
}
if (allow_no_keywords)
{
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_publication_root_entry")));
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_publication_root_label")));
+ gtk_widget_hide (GTK_WIDGET
+ (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_root_entry")));
+ gtk_widget_hide (GTK_WIDGET
+ (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_root_label")));
}
- gtk_list_store_clear (GTK_LIST_STORE (gtk_builder_get_object (
- builder, "GNUNET_GTK_publication_keywords_liststore")));
- gtk_list_store_clear (GTK_LIST_STORE (gtk_builder_get_object (
- builder, "GNUNET_GTK_publication_metadata_liststore")));
+ gtk_list_store_clear (GTK_LIST_STORE
+ (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_publication_keywords_liststore")));
+ gtk_list_store_clear (GTK_LIST_STORE
+ (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_publication_metadata_liststore")));
GNUNET_FS_file_information_inspect (fip, &file_information_extract, builder);
- dialog = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_publication_window"));
+ dialog =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_window"));
if (NULL != short_fn)
gtk_window_set_title (GTK_WINDOW (dialog), short_fn);
else
gtk_window_set_title (GTK_WINDOW (dialog), _("<unnamed>"));
- pubtypes_list = GTK_LIST_STORE (gtk_builder_get_object (builder,
- "GNUNET_GTK_publication_types_liststore"));
- pubtypes_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_type_combo"));
+ pubtypes_list =
+ GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_publication_types_liststore"));
+ pubtypes_combo =
+ GTK_COMBO_BOX (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_type_combo"));
if (gtk_combo_box_get_active_iter (pubtypes_combo, &iter))
{
@@ -1046,11 +1091,11 @@
GTK_ENTRY (gtk_builder_get_object
(builder, "GNUNET_GTK_edit_publication_keyword_entry"));
gtk_entry_set_text (entry, "");
- pubwindow = gtk_builder_get_object (builder,
- "GNUNET_GTK_edit_publication_window");
+ pubwindow =
+ gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
g_object_set_data (pubwindow, PUBSTATE, state);
- ok = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_publication_confirm_button"));
+ ok = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_publication_confirm_button"));
gtk_widget_set_sensitive (ok, allow_no_keywords ? TRUE : FALSE);
gtk_window_set_transient_for (GTK_WINDOW (pubwindow), parent);
gtk_window_present (GTK_WINDOW (dialog));
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h 2011-12-26
20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h 2011-12-26
20:04:58 UTC (rev 18836)
@@ -41,28 +41,26 @@
* @param root namespace root, NULL for file publishing
* @param ret GTK_RESPONSE_OK if the dialog was closed with "OK"
*/
-typedef void
-(*GNUNET_FS_GTK_EditPublishDialogCallback) (gpointer cls, int do_index,
- const char *short_fn,
- guint anonymity_level,
- guint priority,
- const char *root,
- int ret);
+typedef void (*GNUNET_FS_GTK_EditPublishDialogCallback) (gpointer cls,
+ int do_index,
+ const char *short_fn,
+ guint anonymity_level,
+ guint priority,
+ const char *root,
+ int ret);
/**
* Open the dialog to edit file information data.
*/
void
-GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder,
- GtkWindow *parent,
- int do_index,
- const char *short_fn,
- uint32_t anonymity_level,
- uint32_t priority,
- struct GNUNET_FS_FileInformation *fip,
- gboolean allow_no_keywords,
- GNUNET_FS_GTK_EditPublishDialogCallback cb,
gpointer cls);
+GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder * builder, GtkWindow * parent,
+ int do_index, const char *short_fn,
+ uint32_t anonymity_level, uint32_t priority,
+ struct GNUNET_FS_FileInformation *fip,
+ gboolean allow_no_keywords,
+ GNUNET_FS_GTK_EditPublishDialogCallback cb,
+ gpointer cls);
#endif
/* end of gnunet-fs-gtk-edit_publish_dialog.h */
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c 2011-12-26 20:03:46 UTC
(rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c 2011-12-26 20:04:58 UTC
(rev 18836)
@@ -161,24 +161,23 @@
GtkTreePath *path;
GtkTreeModel *tm;
struct SearchResult *search_result;
-
+
path = gtk_tree_row_reference_get_path (de->rr);
tm = gtk_tree_row_reference_get_model (de->rr);
if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
GNUNET_break (0);
else
- {
- gtk_tree_model_get (tm, &iter,
- 9, &search_result, -1);
- /*Always fails on downloads started by Download URI*/
- /*GNUNET_assert (search_result->download == de);*/
- search_result->download = NULL;
- if (NULL == search_result->result)
- (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
- else
- change_download_colour (de, "white");
- }
- gtk_tree_path_free (path);
+ {
+ gtk_tree_model_get (tm, &iter, 9, &search_result, -1);
+ /*Always fails on downloads started by Download URI */
+ /*GNUNET_assert (search_result->download == de); */
+ search_result->download = NULL;
+ if (NULL == search_result->result)
+ (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
+ else
+ change_download_colour (de, "white");
+ }
+ gtk_tree_path_free (path);
gtk_tree_row_reference_free (de->rr);
GNUNET_FS_uri_destroy (de->uri);
GNUNET_CONTAINER_meta_data_destroy (de->meta);
@@ -332,7 +331,7 @@
const char *filename)
{
struct AddDirectoryEntryContext ade;
-
+
de->is_done = GNUNET_YES;
(void) mark_download_progress (de, size, size, NULL, 0, 0, 0);
if ((GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) &&
@@ -481,7 +480,7 @@
GtkTreeModel *tm_old;
GtkTreeIter iter_old;
GtkTreeIter child;
- GtkTreeModel * model;
+ GtkTreeModel *model;
rr_old = de->rr;
tab = GNUNET_GTK_add_to_uri_tab (&iter, &de->sr, de->meta, de->uri);
@@ -498,19 +497,19 @@
if (NULL == path)
{
GNUNET_break (0);
- return NULL;
+ return NULL;
}
if (TRUE != gtk_tree_model_get_iter (tm_old, &iter_old, path))
{
GNUNET_break (0);
gtk_tree_path_free (path);
- return NULL;
+ return NULL;
}
gtk_tree_path_free (path);
move_children (tm_old, &iter_old, model, &iter);
- while (TRUE == gtk_tree_model_iter_children (model, &child, &iter))
+ while (TRUE == gtk_tree_model_iter_children (model, &child, &iter))
delete_stale_subtree (model, &child);
- if (size > completed)
+ if (size > completed)
{
if (is_active)
change_download_colour (de, "yellow");
@@ -540,8 +539,7 @@
static struct DownloadEntry *
setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
struct SearchResult *sr, struct GNUNET_FS_DownloadContext *dc,
- const struct GNUNET_FS_Uri *uri,
- const char *filename,
+ const struct GNUNET_FS_Uri *uri, const char *filename,
const struct GNUNET_CONTAINER_MetaData *meta, uint64_t size,
uint64_t completed)
{
@@ -556,12 +554,12 @@
de->uri = GNUNET_FS_uri_dup (uri);
}
de->dc = dc;
- de->sr = sr;
+ de->sr = sr;
if (NULL != sr)
{
GNUNET_assert (sr->download == NULL);
sr->download = de;
- }
+ }
de->pde = pde;
if ((meta != NULL) && (de->meta == NULL))
de->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
@@ -593,7 +591,7 @@
(guint) ((size >
0) ? (100 * completed /
size) : 100) /* progress */ ,
- 6, filename_utf8 /* filename/description */ ,
+ 6, filename_utf8 /* filename/description */ ,
8, "blue" /* status colour: pending */ ,
-1);
GNUNET_free_non_null (filename_utf8);
@@ -626,8 +624,7 @@
return;
}
gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, 9, &sr, 10, &mime, -1);
- if (! (GNUNET_FS_uri_test_chk (uri) ||
- GNUNET_FS_uri_test_loc (uri)) )
+ if (!(GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)))
{
/* can only download chk/loc URIs, ignore */
g_free (mime);
@@ -787,9 +784,9 @@
tm = gtk_tree_view_get_model (tv);
if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
{
- /* model empty? */
- current_context_search_tab = NULL;
- return FALSE;
+ /* model empty? */
+ current_context_search_tab = NULL;
+ return FALSE;
}
gtk_tree_model_get (tm, &iter, 9, &sr, -1);
current_context_row_reference = gtk_tree_row_reference_new (tm, path);
@@ -989,7 +986,7 @@
}
if (NULL != ent->pc)
{
- /* get piter from parent */
+ /* get piter from parent */
path = gtk_tree_row_reference_get_path (ent->rr);
tm = gtk_tree_row_reference_get_model (ent->rr);
if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
@@ -1046,8 +1043,8 @@
do
{
gtk_tree_model_get (tm, &iter, 9, &sr, -1);
- if ((sr->download != NULL) && (sr->download->is_done == GNUNET_YES))
- GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);
+ if ((sr->download != NULL) && (sr->download->is_done == GNUNET_YES))
+ GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);
}
while (TRUE == gtk_tree_model_iter_next (tm, &iter));
}
@@ -1281,8 +1278,8 @@
}
desc =
GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-
EXTRACTOR_METATYPE_PACKAGE_NAME,
+
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+
EXTRACTOR_METATYPE_PACKAGE_NAME,
EXTRACTOR_METATYPE_TITLE,
EXTRACTOR_METATYPE_BOOK_TITLE,
EXTRACTOR_METATYPE_FILENAME,
@@ -1298,7 +1295,10 @@
else
{
char *utf8_desc = NULL;
- utf8_desc = GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8,
desc, strlen (desc) + 1);
+
+ utf8_desc =
+ GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
+ strlen (desc) + 1);
GNUNET_free (desc);
if (utf8_desc != NULL)
desc = utf8_desc;
@@ -1485,7 +1485,10 @@
else
{
char *utf8_desc = NULL;
- utf8_desc = GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8,
desc, strlen (desc) + 1);
+
+ utf8_desc =
+ GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
+ strlen (desc) + 1);
GNUNET_free (desc);
if (utf8_desc != NULL)
desc = utf8_desc;
@@ -1590,7 +1593,7 @@
GtkNotebook *notebook;
int index;
int i;
-
+
GNUNET_assert (tab == publish_tab);
tm = GTK_TREE_MODEL (publish_tab->ts);
if (TRUE == gtk_tree_model_iter_children (tm, &iter, NULL))
@@ -1599,16 +1602,16 @@
{
gtk_tree_model_get (tm, &iter, 4, &ent, -1);
if (NULL != (pc = ent->pc))
- {
- ent->pc = NULL;
- GNUNET_FS_publish_stop (pc);
- }
+ {
+ ent->pc = NULL;
+ GNUNET_FS_publish_stop (pc);
+ }
}
while (TRUE == gtk_tree_model_iter_next (tm, &iter));
}
notebook =
- GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
- ("GNUNET_GTK_main_window_notebook"));
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
index = -1;
for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
if (publish_tab->frame == gtk_notebook_get_nth_page (notebook, i))
@@ -1643,40 +1646,40 @@
/* create new tab */
publish_tab = GNUNET_malloc (sizeof (struct PublishTab));
publish_tab->builder =
- GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_tab.glade");
+ GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_tab.glade");
df = GTK_WINDOW (gtk_builder_get_object
- (publish_tab->builder, "_publish_frame_window"));
+ (publish_tab->builder, "_publish_frame_window"));
publish_tab->frame = gtk_bin_get_child (GTK_BIN (df));
g_object_ref (publish_tab->frame);
gtk_container_remove (GTK_CONTAINER (df), publish_tab->frame);
gtk_widget_destroy (GTK_WIDGET (df));
-
+
/* load tab_label */
df = GTK_WINDOW (gtk_builder_get_object
- (publish_tab->builder, "_publish_label_window"));
+ (publish_tab->builder, "_publish_label_window"));
tab_label = gtk_bin_get_child (GTK_BIN (df));
g_object_ref (tab_label);
gtk_container_remove (GTK_CONTAINER (df), tab_label);
gtk_widget_destroy (GTK_WIDGET (df));
-
+
/* get refs to widgets */
close_button =
- GTK_WIDGET (gtk_builder_get_object
- (publish_tab->builder, "_publish_label_close_button"));
+ GTK_WIDGET (gtk_builder_get_object
+ (publish_tab->builder, "_publish_label_close_button"));
g_signal_connect (G_OBJECT (close_button), "clicked",
- G_CALLBACK (stop_publishing), publish_tab);
+ G_CALLBACK (stop_publishing), publish_tab);
/* FIXME: we don't actually need the closure anymore,
- so we could have glade connect the above signal... */
+ * so we could have glade connect the above signal... */
/* make visible */
notebook =
- GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
- ("GNUNET_GTK_main_window_notebook"));
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
gtk_notebook_insert_page (notebook, publish_tab->frame, tab_label, 0);
gtk_widget_show (GTK_WIDGET (notebook));
gtk_notebook_set_current_page (notebook, 0);
publish_tab->ts =
- GTK_TREE_STORE (gtk_builder_get_object
- (publish_tab->builder, "_publish_frame_tree_store"));
+ GTK_TREE_STORE (gtk_builder_get_object
+ (publish_tab->builder, "_publish_frame_tree_store"));
pitrptr = NULL;
}
else
@@ -1690,7 +1693,8 @@
/* create new iter from parent */
path = gtk_tree_row_reference_get_path (parent->rr);
if (TRUE !=
- gtk_tree_model_get_iter (GTK_TREE_MODEL (publish_tab->ts), &piter,
path))
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (publish_tab->ts), &piter,
+ path))
{
GNUNET_break (0);
return NULL;
@@ -1703,11 +1707,9 @@
ent->tab = publish_tab;
fn_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) fn);
gtk_tree_store_insert_with_values (publish_tab->ts, &iter, pitrptr, G_MAXINT,
- 0, fn_utf8,
- 1, size_fancy, 2, "white", 3,
+ 0, fn_utf8, 1, size_fancy, 2, "white", 3,
(guint) 0 /* progress */ ,
- 4, ent,
- -1);
+ 4, ent, -1);
GNUNET_free_non_null (fn_utf8);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (publish_tab->ts), &iter);
GNUNET_assert (NULL != path);
@@ -1786,7 +1788,7 @@
return setup_download (info->value.download.cctx,
info->value.download.pctx,
info->value.download.sctx, info->value.download.dc,
info->value.download.uri,
- info->value.download.filename,
+ info->value.download.filename,
info->value.download.specifics.start.meta,
info->value.download.size,
info->value.download.completed);
@@ -1794,8 +1796,7 @@
ret =
setup_download (info->value.download.cctx, info->value.download.pctx,
info->value.download.sctx, info->value.download.dc,
- info->value.download.uri,
- info->value.download.filename,
+ info->value.download.uri,
info->value.download.filename,
info->value.download.specifics.resume.meta,
info->value.download.size,
info->value.download.completed);
@@ -1980,8 +1981,8 @@
}
static void
-copy_metadata_to_clipboard (GtkTreeModel *model, GtkTreePath *path,
- GtkTreeIter *iter, gpointer user_data)
+copy_metadata_to_clipboard (GtkTreeModel * model, GtkTreePath * path,
+ GtkTreeIter * iter, gpointer user_data)
{
gchar *type, *value;
GList **l = (GList **) user_data;
@@ -1993,7 +1994,7 @@
}
void
-metadata_copy_selection_activated (GtkMenuItem *menuitem, gpointer user_data)
+metadata_copy_selection_activated (GtkMenuItem * menuitem, gpointer user_data)
{
GtkBuilder *builder;
GtkTreeView *tree;
@@ -2003,11 +2004,12 @@
gchar *s, *p;
builder = GTK_BUILDER (user_data);
- tree = GTK_TREE_VIEW (gtk_builder_get_object (builder,
- "GNUNET_GTK_main_window_metadata_treeview"));
+ tree =
+ GTK_TREE_VIEW (gtk_builder_get_object
+ (builder, "GNUNET_GTK_main_window_metadata_treeview"));
gtk_tree_selection_selected_foreach (gtk_tree_view_get_selection (tree),
- copy_metadata_to_clipboard, &pairs);
+ copy_metadata_to_clipboard, &pairs);
total_len = 0;
pairs = g_list_reverse (pairs);
@@ -2018,12 +2020,13 @@
if (!value)
break;
next = value->next;
- total_len += strlen ((gchar *) type->data)
- + strlen ((gchar *) value->data) + 2 /* ": " */ + (next ? 1 : 0) /*
"\n" */;
+ total_len +=
+ strlen ((gchar *) type->data) + strlen ((gchar *) value->data) +
+ 2 /* ": " */ + (next ? 1 : 0) /* "\n" */ ;
}
if (total_len > 0)
{
- total_len += 1; /* "\0" */
+ total_len += 1; /* "\0" */
s = g_new0 (gchar, total_len);
p = s;
for (l = pairs; l; l = next)
@@ -2057,8 +2060,8 @@
}
void
-metadata_menu_popup_position (GtkMenu *menu, gint *x, gint *y, gboolean
*push_in,
- gpointer user_data)
+metadata_menu_popup_position (GtkMenu * menu, gint * x, gint * y,
+ gboolean * push_in, gpointer user_data)
{
GtkBuilder *builder;
GtkTreeView *tree;
@@ -2071,8 +2074,9 @@
builder = GTK_BUILDER (user_data);
- tree = GTK_TREE_VIEW (gtk_builder_get_object (builder,
- "GNUNET_GTK_main_window_metadata_treeview"));
+ tree =
+ GTK_TREE_VIEW (gtk_builder_get_object
+ (builder, "GNUNET_GTK_main_window_metadata_treeview"));
gtk_widget_get_allocation (GTK_WIDGET (tree), &tree_allocation);
@@ -2092,6 +2096,7 @@
if (rows->data)
{
GdkRectangle r;
+
p = (GtkTreePath *) rows->data;
gtk_tree_view_get_cell_area (tree, p, NULL, &r);
popup_x += r.x;
@@ -2106,8 +2111,8 @@
}
static void
-do_metadata_popup_menu (GtkWidget *widget, GdkEventButton *event,
- gpointer user_data)
+do_metadata_popup_menu (GtkWidget * widget, GdkEventButton * event,
+ gpointer user_data)
{
GtkMenu *menu;
GtkBuilder *builder;
@@ -2119,25 +2124,28 @@
menu = GTK_MENU (gtk_builder_get_object (builder, "metadata_popup_menu"));
if (event)
- {
- button = event->button;
- event_time = event->time;
- }
+ {
+ button = event->button;
+ event_time = event->time;
+ }
else
- {
- button = 0;
- event_time = gtk_get_current_event_time ();
- }
+ {
+ button = 0;
+ event_time = gtk_get_current_event_time ();
+ }
- gtk_menu_popup (menu, NULL, NULL, mpf, user_data,
- button, event_time);
+ gtk_menu_popup (menu, NULL, NULL, mpf, user_data, button, event_time);
}
gboolean
-GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb (GtkWidget
*widget,
- GdkEventButton *event, gpointer user_data)
+GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb (GtkWidget *
+ widget,
+ GdkEventButton
*
+ event,
+ gpointer
+ user_data)
{
- /* Ignore double-clicks and triple-clicks */
+ /* Ignore double-clicks and triple-clicks */
if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
{
do_metadata_popup_menu (widget, event, user_data);
@@ -2148,8 +2156,8 @@
}
gboolean
-GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb (GtkWidget * widget,
+ gpointer user_data)
{
do_metadata_popup_menu (widget, NULL, user_data);
return TRUE;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2011-12-26
20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2011-12-26
20:04:58 UTC (rev 18836)
@@ -27,8 +27,9 @@
#include "gnunet-fs-gtk-edit_publish_dialog.h"
gboolean
-GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
- GdkEvent *event, gpointer user_Data)
+GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_Data)
{
gtk_widget_hide (widget);
return TRUE;
@@ -49,6 +50,7 @@
GtkListStore *ls = cls;
GtkTreeIter iter;
char *name_utf8;
+
name_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) name);
gtk_list_store_insert_with_values (ls, &iter, -1, 0, name_utf8, 1,
@@ -65,6 +67,7 @@
GtkTreeIter iter;
GtkWidget *ok_button;
GtkBuilder *builder;
+
builder = GTK_BUILDER (user_data);
ok_button =
@@ -105,26 +108,24 @@
*/
static int
advertise_namespace (void *cls, struct GNUNET_FS_FileInformation *fi,
- uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_Uri **uri, struct GNUNET_FS_BlockOptions
*bo,
- int *do_index, void **client_info)
+ uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_FS_Uri **uri,
+ struct GNUNET_FS_BlockOptions *bo, int *do_index,
+ void **client_info)
{
struct NamespaceAdvertisementContext *nds = cls;
- GNUNET_FS_namespace_advertise (GNUNET_FS_GTK_get_fs_handle (), *uri,
- nds->ns, meta, bo, nds->root, NULL, NULL);
+ GNUNET_FS_namespace_advertise (GNUNET_FS_GTK_get_fs_handle (), *uri, nds->ns,
+ meta, bo, nds->root, NULL, NULL);
return GNUNET_SYSERR;
}
static void
-adv_pseudonym_edit_publish_dialog_cb (gpointer cls,
- int do_index,
- const char *short_fn,
- guint anonymity_level,
- guint priority,
- const char *root,
- gint ret)
+adv_pseudonym_edit_publish_dialog_cb (gpointer cls, int do_index,
+ const char *short_fn,
+ guint anonymity_level, guint priority,
+ const char *root, gint ret)
{
struct NamespaceAdvertisementContext *nds = cls;
@@ -135,8 +136,7 @@
nds->anonymity_level = anonymity_level;
nds->priority = priority;
nds->root = root;
- GNUNET_FS_file_information_inspect (nds->fip,
- &advertise_namespace, nds);
+ GNUNET_FS_file_information_inspect (nds->fip, &advertise_namespace, nds);
}
GNUNET_FS_namespace_delete (nds->ns, GNUNET_NO);
GNUNET_FS_file_information_destroy (nds->fip, NULL, NULL);
@@ -144,8 +144,9 @@
}
void
-GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog *dialog,
- gint response_id, gpointer user_data)
+GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
+ gint response_id,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkWidget *ad;
@@ -170,8 +171,7 @@
return;
}
tv = GTK_TREE_VIEW (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_select_pseudonym_tree_view"));
+ (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
sel = gtk_tree_view_get_selection (tv);
GNUNET_assert (TRUE == gtk_tree_selection_get_selected (sel, &tm, &iter));
@@ -202,23 +202,24 @@
/* This is a bogus fileinfo. It's needed because edit_publish_dialog
* was written to work with fileinfo, and return a fileinfo.
*/
- memset (&bo, 0, sizeof (bo));
- bo.expiration_time = GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () +
2);
+ memset (&bo, 0, sizeof (bo));
+ bo.expiration_time =
+ GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
bo.anonymity_level = 1;
- nds->fip = GNUNET_FS_file_information_create_empty_directory (NULL, NULL,
- NULL, meta,
&bo);
+ nds->fip =
+ GNUNET_FS_file_information_create_empty_directory (NULL, NULL, NULL,
meta,
+ &bo);
GNUNET_CONTAINER_meta_data_destroy (meta);
- GNUNET_FS_GTK_edit_publish_dialog (builder, transient,
- nds->do_index,
- nds->short_fn,
- nds->anonymity_level,
- nds->priority,
- nds->fip, FALSE,
&adv_pseudonym_edit_publish_dialog_cb, nds);
+ GNUNET_FS_GTK_edit_publish_dialog (builder, transient, nds->do_index,
+ nds->short_fn, nds->anonymity_level,
+ nds->priority, nds->fip, FALSE,
+ &adv_pseudonym_edit_publish_dialog_cb,
+ nds);
}
void
-GNUNET_GTK_select_pseudonym_dialog_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_GTK_select_pseudonym_dialog_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
2011-12-26 20:04:58 UTC (rev 18836)
@@ -27,8 +27,9 @@
#include "gnunet-fs-gtk.h"
void
-GNUNET_GTK_create_namespace_dialog_response_cb (GtkDialog *dialog,
- gint response_id, gpointer user_data)
+GNUNET_GTK_create_namespace_dialog_response_cb (GtkDialog * dialog,
+ gint response_id,
+ gpointer user_data)
{
const char *name;
gchar *name_loc;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c 2011-12-26
20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c 2011-12-26
20:04:58 UTC (rev 18836)
@@ -41,11 +41,15 @@
builder = GTK_BUILDER (user_data);
- dialog = GTK_WIDGET (gtk_builder_get_object (builder,
"GNUNET_GTK_open_url_window"));
+ dialog =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_open_url_window"));
- tb = GTK_TEXT_BUFFER (gtk_builder_get_object (builder,
"GNUNET_GTK_open_url_dialog_url_textview_buffer"));
- gtk_text_buffer_get_iter_at_offset (tb, &ti_start, 0);
- gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
+ tb = GTK_TEXT_BUFFER (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_open_url_dialog_url_textview_buffer"));
+ gtk_text_buffer_get_iter_at_offset (tb, &ti_start, 0);
+ gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
gtk_text_buffer_delete (tb, &ti_start, &ti_end);
/* TODO: queue the clipboard, maybe there's valid URI in there?
@@ -55,8 +59,8 @@
}
void
-GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton *button,
- gpointer user_data)
+GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkWidget *dialog;
@@ -69,18 +73,22 @@
builder = GTK_BUILDER (user_data);
- dialog = GTK_WIDGET (gtk_builder_get_object (builder,
"GNUNET_GTK_open_url_window"));
+ dialog =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_open_url_window"));
gtk_widget_hide (dialog);
- tb = GTK_TEXT_BUFFER (gtk_builder_get_object (builder,
"GNUNET_GTK_open_url_dialog_url_textview_buffer"));
- gtk_text_buffer_get_iter_at_offset (tb, &ti_start, 0);
- gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
+ tb = GTK_TEXT_BUFFER (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_open_url_dialog_url_textview_buffer"));
+ gtk_text_buffer_get_iter_at_offset (tb, &ti_start, 0);
+ gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
uris = gtk_text_buffer_get_text (tb, &ti_start, &ti_end, FALSE);
- if (!GNUNET_GTK_get_selected_anonymity_level (builder,
- "main_window_search_anonymity_combobox", &anonymity_level))
+ if (!GNUNET_GTK_get_selected_anonymity_level
+ (builder, "main_window_search_anonymity_combobox", &anonymity_level))
return;
uri = GNUNET_FS_uri_parse (uris, &perr);
@@ -105,6 +113,7 @@
if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
{
struct DownloadContext *dc;
+
dc = GNUNET_malloc (sizeof (struct DownloadContext));
dc->uri = uri;
dc->anonymity = anonymity_level;
@@ -116,24 +125,31 @@
}
void
-GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton *button,
- gpointer user_data)
+GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton * button,
+ gpointer user_data)
{
GtkBuilder *builder;
+
builder = GTK_BUILDER (user_data);
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
"GNUNET_GTK_open_url_window")));
+ gtk_widget_hide (GTK_WIDGET
+ (gtk_builder_get_object
+ (builder, "GNUNET_GTK_open_url_window")));
return;
}
gboolean
-GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget *widget,
- GdkEvent *event, gpointer user_data)
+GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_data)
{
GtkBuilder *builder;
+
builder = GTK_BUILDER (user_data);
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
"GNUNET_GTK_open_url_window")));
+ gtk_widget_hide (GTK_WIDGET
+ (gtk_builder_get_object
+ (builder, "GNUNET_GTK_open_url_window")));
return TRUE;
}
@@ -142,27 +158,32 @@
#endif
gboolean
-GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb (GtkWidget *widget,
- GdkEventKey *event, gpointer user_data)
+GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb (GtkWidget * widget,
+ GdkEventKey *
event,
+ gpointer user_data)
{
GtkBuilder *builder;
+
builder = GTK_BUILDER (user_data);
if (event->keyval == GDK_KEY_Return)
{
GtkWidget *execute = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_open_url_dialog_execute_button"));
+
"GNUNET_GTK_open_url_dialog_execute_button"));
+
if (gtk_widget_get_sensitive (execute))
- GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (
- GTK_BUTTON (execute), user_data);
+ GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GTK_BUTTON
+ (execute),
+ user_data);
return TRUE;
}
return FALSE;
}
void
-GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb (
- GtkTextBuffer *textbuffer, gpointer user_data)
+GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb (GtkTextBuffer *
+ textbuffer,
+ gpointer user_data)
{
struct GNUNET_FS_Uri *uri;
GtkTextBuffer *tb;
@@ -174,9 +195,11 @@
builder = GTK_BUILDER (user_data);
perr = NULL;
- tb = GTK_TEXT_BUFFER (gtk_builder_get_object (builder,
"GNUNET_GTK_open_url_dialog_url_textview_buffer"));
- gtk_text_buffer_get_iter_at_offset (tb, &ti_start, 0);
- gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
+ tb = GTK_TEXT_BUFFER (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_open_url_dialog_url_textview_buffer"));
+ gtk_text_buffer_get_iter_at_offset (tb, &ti_start, 0);
+ gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
uris = gtk_text_buffer_get_text (tb, &ti_start, &ti_end, FALSE);
if (uris != NULL)
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2011-12-26
20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2011-12-26
20:04:58 UTC (rev 18836)
@@ -79,7 +79,7 @@
int ns_ok;
gchar *namespace_id;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -97,32 +97,25 @@
}
up_button =
GTK_WIDGET (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_master_publish_dialog_up_button"));
+ (builder, "GNUNET_GTK_master_publish_dialog_up_button"));
down_button =
GTK_WIDGET (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_master_publish_dialog_down_button"));
+ (builder, "GNUNET_GTK_master_publish_dialog_down_button"));
left_button =
GTK_WIDGET (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_master_publish_dialog_left_button"));
+ (builder, "GNUNET_GTK_master_publish_dialog_left_button"));
right_button =
GTK_WIDGET (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_master_publish_dialog_right_button"));
+ (builder, "GNUNET_GTK_master_publish_dialog_right_button"));
delete_button =
GTK_WIDGET (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_master_publish_dialog_delete_button"));
+ (builder, "GNUNET_GTK_master_publish_dialog_delete_button"));
edit_button =
GTK_WIDGET (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_master_publish_dialog_edit_button"));
+ (builder, "GNUNET_GTK_master_publish_dialog_edit_button"));
execute_button =
GTK_WIDGET (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_master_publish_dialog_execute_button"));
+ (builder,
"GNUNET_GTK_master_publish_dialog_execute_button"));
tv = GTK_TREE_VIEW (gtk_builder_get_object
(builder,
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
@@ -203,8 +196,9 @@
* @param iter parent entry, or NULL for top-level addition
*/
static void
-add_file_at_iter (gpointer data, const char *filename, const struct
GNUNET_FS_BlockOptions *bo,
- int do_index, GtkTreeIter * iter)
+add_file_at_iter (gpointer data, const char *filename,
+ const struct GNUNET_FS_BlockOptions *bo, int do_index,
+ GtkTreeIter * iter)
{
struct GNUNET_FS_FileInformation *fi;
GtkTreeRowReference *row_reference;
@@ -220,7 +214,7 @@
const char *ss;
struct stat sbuf;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
if (0 != STAT (filename, &sbuf))
@@ -287,8 +281,9 @@
* @param pos iterator to set to the location of the new element
*/
static void
-create_dir_at_iter (gpointer data, const char *name, const struct
GNUNET_FS_BlockOptions *bo,
- GtkTreeIter * iter, GtkTreeIter * pos)
+create_dir_at_iter (gpointer data, const char *name,
+ const struct GNUNET_FS_BlockOptions *bo, GtkTreeIter *
iter,
+ GtkTreeIter * pos)
{
struct GNUNET_FS_FileInformation *fi;
GtkTreeRowReference *row_reference;
@@ -296,8 +291,8 @@
struct GNUNET_CONTAINER_MetaData *meta;
GtkTreeStore *ts;
GtkBuilder *builder;
-
-
+
+
builder = GTK_BUILDER (data);
ts = GTK_TREE_STORE (gtk_builder_get_object
@@ -785,6 +780,7 @@
{
char *filename_utf8;
const char *ss, *short_fn;
+
GNUNET_assert (mcm == NULL);
/* we're top-level */
short_fn = filename;
@@ -793,8 +789,9 @@
filename_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) short_fn);
GNUNET_CONTAINER_meta_data_insert (pd->meta, "<gnunet-gtk>",
EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METAFORMAT_UTF8,
"text/plain",
- filename_utf8, strlen (filename_utf8)
+ 1);
+ EXTRACTOR_METAFORMAT_UTF8,
+ "text/plain", filename_utf8,
+ strlen (filename_utf8) + 1);
GNUNET_free_non_null (filename_utf8);
add_entry_to_ts (adc->ts, &pd->iter, filename, &adc->bo, adc->do_index,
NULL, pd->meta);
@@ -817,13 +814,13 @@
* @param do_index should we index?
*/
static void
-add_dir (gpointer data, const char *filename, const struct
GNUNET_FS_BlockOptions *bo,
- int do_index)
+add_dir (gpointer data, const char *filename,
+ const struct GNUNET_FS_BlockOptions *bo, int do_index)
{
struct stat sbuf;
struct AddDirContext scan_ctx;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
if (0 != STAT (filename, &sbuf))
@@ -870,8 +867,8 @@
* Move an entry in the tree.
*/
static void
-move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter *
newpos,
- int dsel)
+move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old,
+ GtkTreeIter * newpos, int dsel)
{
struct GNUNET_FS_FileInformation *fip;
GtkTreeView *tv;
@@ -887,7 +884,7 @@
GtkTreeRowReference *rr;
GtkTreeRowReference *rr2;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
gtk_tree_model_get (tm, old, 0, &fsf, 1, &do_index, 2, &short_fn, 3,
&anonymity_level, 4, &priority, 5, &fip, -1);
@@ -946,15 +943,14 @@
* User has changed the "current" identifier for the content in
* the GtkTreeView. Update the model.
*/
-void
-GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
(GtkCellRendererText * renderer,
- gchar *
cpath, gchar * new_text,
- gpointer
user_data)
+void GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
+ (GtkCellRendererText * renderer, gchar * cpath, gchar * new_text,
+ gpointer user_data)
{
GtkTreeIter iter;
GtkTreeStore *ts;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (user_data);
ts = GTK_TREE_STORE (gtk_builder_get_object
(builder, "GNUNET_GTK_pseudonym_tree_store"));
@@ -974,15 +970,14 @@
* User has changed the "current" identifier for the content in
* the GtkTreeView. Update the model.
*/
-void
-GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb
(GtkCellRendererText * renderer,
- gchar
* cpath, gchar * new_text,
-
gpointer user_data)
+void GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb
+ (GtkCellRendererText * renderer, gchar * cpath, gchar * new_text,
+ gpointer user_data)
{
GtkTreeIter iter;
GtkTreeStore *ts;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (user_data);
ts = GTK_TREE_STORE (gtk_builder_get_object
(builder, "GNUNET_GTK_pseudonym_tree_store"));
@@ -1011,7 +1006,7 @@
GtkTreeIter prev;
GtkTreeIter pos;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1061,7 +1056,7 @@
GtkTreeIter parent;
GtkTreeIter pos;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1103,7 +1098,7 @@
GtkTreeIter *pprev;
GtkTreeIter pos;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1158,7 +1153,7 @@
GtkTreeIter next;
GtkTreeIter pos;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1197,7 +1192,7 @@
GtkTreeIter pos;
struct GNUNET_FS_BlockOptions bo;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1230,15 +1225,16 @@
GtkWidget *ad;
GtkBuilder *builder;
GtkWindow *master_pubdialog;
-
+
builder = GTK_BUILDER (data);
ad = GTK_WIDGET (gtk_builder_get_object
(builder, "GNUNET_GTK_publish_file_dialog"));
GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
- master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
- "GNUNET_GTK_master_publish_dialog"));
+ master_pubdialog =
+ GTK_WINDOW (gtk_builder_get_object
+ (builder, "GNUNET_GTK_master_publish_dialog"));
gtk_window_set_transient_for (GTK_WINDOW (ad), master_pubdialog);
gtk_window_present (GTK_WINDOW (ad));
@@ -1264,24 +1260,19 @@
* @param ret GTK_RESPONSE_OK if the dialog was closed with "OK"
*/
static void
-master_publish_edit_publish_dialog_cb (gpointer cls,
- int do_index,
- const char *short_fn,
- uint32_t anonymity_level,
- uint32_t priority,
- const char *root,
- gint ret)
+master_publish_edit_publish_dialog_cb (gpointer cls, int do_index,
+ const char *short_fn,
+ uint32_t anonymity_level,
+ uint32_t priority, const char *root,
+ gint ret)
{
struct EditPublishContext *cbargs = cls;
-
+
GNUNET_assert (NULL == root);
if (ret == GTK_RESPONSE_OK)
- gtk_tree_store_set (GTK_TREE_STORE (cbargs->tm), &cbargs->iter,
- 1, do_index,
- 2, short_fn,
- 3, (guint) anonymity_level,
- 4, (guint) priority,
- -1);
+ gtk_tree_store_set (GTK_TREE_STORE (cbargs->tm), &cbargs->iter, 1,
do_index,
+ 2, short_fn, 3, (guint) anonymity_level, 4,
+ (guint) priority, -1);
GNUNET_free (cbargs);
}
@@ -1309,8 +1300,9 @@
cbargs = GNUNET_malloc (sizeof (struct EditPublishContext));
cbargs->tm = gtk_tree_view_get_model (tv);
- master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_master_publish_dialog"));
+ master_pubdialog =
+ GTK_WINDOW (gtk_builder_get_object
+ (builder, "GNUNET_GTK_master_publish_dialog"));
sel = gtk_tree_view_get_selection (tv);
if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &cbargs->iter))
{
@@ -1319,21 +1311,14 @@
return;
}
- gtk_tree_model_get (tm, &cbargs->iter,
- 1, &do_index,
- 2, &short_fn,
- 3, &anonymity_level,
- 4, &priority,
- 5, &fip,
- -1);
+ gtk_tree_model_get (tm, &cbargs->iter, 1, &do_index, 2, &short_fn, 3,
+ &anonymity_level, 4, &priority, 5, &fip, -1);
/* FIXME: shouldn't this use a fresh builder? */
- GNUNET_FS_GTK_edit_publish_dialog (builder, master_pubdialog,
- do_index,
- short_fn,
- (uint32_t) anonymity_level,
- (uint32_t) priority,
- fip,
- TRUE,
&master_publish_edit_publish_dialog_cb, cbargs);
+ GNUNET_FS_GTK_edit_publish_dialog (builder, master_pubdialog, do_index,
+ short_fn, (uint32_t) anonymity_level,
+ (uint32_t) priority, fip, TRUE,
+ &master_publish_edit_publish_dialog_cb,
+ cbargs);
}
@@ -1370,7 +1355,7 @@
GtkTreeIter iter;
struct GNUNET_FS_FileInformation *fip;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
(builder,
@@ -1389,8 +1374,9 @@
void
-GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog *dialog,
- gint response_id, gpointer
user_data)
+GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
+ gint response_id,
+ gpointer user_data)
{
char *filename;
int do_index;
@@ -1400,25 +1386,30 @@
GtkBuilder *builder;
builder = GTK_BUILDER (user_data);
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_directory_dialog"));
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_publish_directory_dialog"));
if (response_id == -5)
{
filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (ad));
- sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
- "GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
- if (!GNUNET_GTK_get_selected_anonymity_level (builder,
- "GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
- &bo.anonymity_level))
+ sb = GTK_SPIN_BUTTON (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
+ if (!GNUNET_GTK_get_selected_anonymity_level
+ (builder, "GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
+ &bo.anonymity_level))
bo.anonymity_level = 1;
- bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON (
- gtk_builder_get_object (builder,
- "GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
- bo.replication_level = 0; /* FIXME: replication level in GUI? */
+ bo.content_priority =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
+ bo.replication_level = 0; /* FIXME: replication level in GUI? */
bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
- do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
- gtk_builder_get_object (builder,
- "GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
+ do_index =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
/* FIXME: open progress dialog here... */
add_dir (user_data, filename, &bo, do_index);
@@ -1436,14 +1427,15 @@
GtkWidget *ad;
GtkBuilder *builder;
GtkWindow *master_pubdialog;
-
+
builder = GTK_BUILDER (data);
GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
ad = GTK_WIDGET (gtk_builder_get_object
(builder, "GNUNET_GTK_publish_directory_dialog"));
- master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
- "GNUNET_GTK_master_publish_dialog"));
+ master_pubdialog =
+ GTK_WINDOW (gtk_builder_get_object
+ (builder, "GNUNET_GTK_master_publish_dialog"));
gtk_window_set_transient_for (GTK_WINDOW (ad), master_pubdialog);
gtk_window_present (GTK_WINDOW (ad));
@@ -1564,7 +1556,10 @@
else
{
char *utf8_desc = NULL;
- utf8_desc = GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8,
desc, strlen (desc) + 1);
+
+ utf8_desc =
+ GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
+ strlen (desc) + 1);
GNUNET_free (desc);
if (utf8_desc != NULL)
desc = utf8_desc;
@@ -1689,13 +1684,13 @@
void
-GNUNET_GTK_master_publish_dialog_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_GTK_master_publish_dialog_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (user_data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1730,9 +1725,10 @@
builder = GTK_BUILDER (user_data);
ad = GTK_WIDGET (gtk_builder_get_object
(builder, "GNUNET_GTK_master_publish_dialog"));
- ptv = GTK_TREE_VIEW (gtk_builder_get_object
- (builder,
-
"GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
+ ptv =
+ GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
sel = gtk_tree_view_get_selection (ptv);
ptm = gtk_tree_view_get_model (ptv);
@@ -1740,7 +1736,7 @@
(builder,
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
tm = gtk_tree_view_get_model (tv);
-
+
if (ret == GTK_RESPONSE_OK)
{
if (TRUE == gtk_tree_selection_get_selected (sel, &ptm, &iter))
@@ -1787,29 +1783,30 @@
gtk_tree_store_clear (GTK_TREE_STORE (tm));
gtk_widget_hide (ad);
/* FIXME: doesn't this leak everything (builder + window)?
- I think we need to unref the builder here! */
+ * I think we need to unref the builder here! */
}
void
-GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton *button,
- gpointer user_data)
+GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
+ gpointer user_data)
{
hide_master_publish_dialog (user_data, GTK_RESPONSE_OK);
}
void
-GNUNET_GTK_master_publish_dialog_cancel_button_clicked_cb (GtkButton *button,
- gpointer user_data)
+GNUNET_GTK_master_publish_dialog_cancel_button_clicked_cb (GtkButton * button,
+ gpointer user_data)
{
hide_master_publish_dialog (user_data, GTK_RESPONSE_CANCEL);
}
gboolean
-GNUNET_GTK_master_publish_dialog_delete_event_cb (GtkWidget *widget,
- GdkEvent *event, gpointer
user_data)
+GNUNET_GTK_master_publish_dialog_delete_event_cb (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_data)
{
hide_master_publish_dialog (user_data, GTK_RESPONSE_CANCEL);
return TRUE;
@@ -1817,8 +1814,9 @@
void
-GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog *dialog,
- gint response_id, gpointer
user_data)
+GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
+ gint response_id,
+ gpointer user_data)
{
char *filename;
struct GNUNET_FS_BlockOptions bo;
@@ -1828,26 +1826,32 @@
GtkBuilder *builder = GTK_BUILDER (user_data);
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_publish_file_dialog"));
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_publish_file_dialog"));
if (response_id == -5)
{
/* OK */
- sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
- "GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
+ sb = GTK_SPIN_BUTTON (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
- if (!GNUNET_GTK_get_selected_anonymity_level (builder,
- "GNUNET_GTK_publish_file_dialog_anonymity_combobox",
&bo.anonymity_level))
+ if (!GNUNET_GTK_get_selected_anonymity_level
+ (builder, "GNUNET_GTK_publish_file_dialog_anonymity_combobox",
+ &bo.anonymity_level))
bo.anonymity_level = 1;
- bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON (
- gtk_builder_get_object (builder,
- "GNUNET_GTK_publish_file_dialog_priority_spin_button")));
+ bo.content_priority =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_file_dialog_priority_spin_button")));
bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
- bo.replication_level = 1; /* FIXME... */
- do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
- gtk_builder_get_object (builder,
- "GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
+ bo.replication_level = 1; /* FIXME... */
+ do_index =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (ad));
add_file_at_iter (user_data, filename, &bo, do_index, NULL);
@@ -1870,16 +1874,16 @@
GtkWidget *ad;
GtkTreeStore *ts;
GtkBuilder *builder;
-
+
builder = GTK_BUILDER (data);
ad = GTK_WIDGET (gtk_builder_get_object
(builder, "GNUNET_GTK_master_publish_dialog"));
if (!gtk_widget_get_visible (ad))
{
- ts = GTK_TREE_STORE (gtk_builder_get_object (builder,
- "GNUNET_GTK_pseudonym_tree_store"));
+ ts = GTK_TREE_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_pseudonym_tree_store"));
GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
- &add_namespace_to_ts, ts);
+ &add_namespace_to_ts, ts);
}
gtk_window_present (GTK_WINDOW (ad));
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
2011-12-26 20:04:58 UTC (rev 18836)
@@ -67,8 +67,8 @@
dmeta = GNUNET_CONTAINER_meta_data_duplicate (meta);
GNUNET_CONTAINER_meta_data_insert (dmeta, "<user>",
EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METAFORMAT_UTF8,
- "text/plain", acc->filename,
+ EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+ acc->filename,
strlen (acc->filename) + 1);
acc->tab = GNUNET_GTK_add_to_uri_tab (&acc->iter, &acc->par, dmeta, NULL);
tp = gtk_tree_model_get_path (GTK_TREE_MODEL (acc->tab->ts), &acc->iter);
@@ -86,8 +86,9 @@
}
void
-GNUNET_GTK_open_directory_dialog_response_cb (GtkDialog *dialog,
- gint response_id, gpointer user_data)
+GNUNET_GTK_open_directory_dialog_response_cb (GtkDialog * dialog,
+ gint response_id,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkWidget *ad;
@@ -106,7 +107,8 @@
}
filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (ad));
- filename_utf8 = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER
(ad));
+ filename_utf8 =
+ GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (ad));
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
acc.filename = filename_utf8;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2011-12-26 20:04:58 UTC (rev 18836)
@@ -120,20 +120,26 @@
{
GNUNET_GTK_tray_icon_destroy ();
GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
- &shutdown_task, NULL);
+ &shutdown_task, NULL);
}
void
-main_window_search_namespace_dropdown_button_toggled_cb (GtkToggleButton
*togglebutton,
- gpointer user_data)
+main_window_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
+ togglebutton,
+ gpointer user_data)
{
gboolean active;
GtkBuilder *builder = GTK_BUILDER (user_data);
GtkWidget *namespace_selector_window;
GtkWidget *namespace_selector_treeview;
- namespace_selector_window = GTK_WIDGET (gtk_builder_get_object (builder,
"namespace_selector_window"));
- namespace_selector_treeview = GTK_WIDGET (gtk_builder_get_object (builder,
"namespace_selector_treeview"));
+
+ namespace_selector_window =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "namespace_selector_window"));
+ namespace_selector_treeview =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "namespace_selector_treeview"));
g_object_get (G_OBJECT (togglebutton), "active", &active, NULL);
if (active)
{
@@ -141,7 +147,8 @@
GdkWindow *main_window_gdk;
gint mwg_x, mwg_y, tgb_x, tgb_y, popup_x, popup_y;
- gtk_widget_get_allocation (GTK_WIDGET (togglebutton),
&togglebutton_allocation);
+ gtk_widget_get_allocation (GTK_WIDGET (togglebutton),
+ &togglebutton_allocation);
main_window_gdk = gtk_widget_get_window (GTK_WIDGET (togglebutton));
@@ -172,14 +179,19 @@
namespace_selector_window_leave_timeout_cb (gpointer user_data)
{
GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (user_data);
+
/* This will eventually hide the namespace selector */
gtk_toggle_button_set_active (toggle_button, FALSE);
return FALSE;
}
gboolean
-main_window_search_namespace_dropdown_button_enter_notify_event_cb (
- GtkWidget *widget, GdkEvent *event, gpointer user_data)
+main_window_search_namespace_dropdown_button_enter_notify_event_cb (GtkWidget *
+ widget,
+ GdkEvent *
+ event,
+ gpointer
+ user_data)
{
if (namespace_selector_window_leave_timeout_source > 0)
g_source_remove (namespace_selector_window_leave_timeout_source);
@@ -188,8 +200,9 @@
gboolean
-namespace_selector_window_leave_notify_event_cb (GtkWidget *widget,
- GdkEvent *event, gpointer user_data)
+namespace_selector_window_leave_notify_event_cb (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkToggleButton *toggle_button;
@@ -197,12 +210,17 @@
builder = GTK_BUILDER (user_data);
- toggle_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder,
"main_window_search_namespace_dropdown_button"));
+ toggle_button =
+ GTK_TOGGLE_BUTTON (gtk_builder_get_object
+ (builder,
+ "main_window_search_namespace_dropdown_button"));
/* Place a timeout to hide the window. It will be cancelled if the cursor
* enters the namespace selector window or the toggle button within 100ms.
*/
- timeout_id = g_timeout_add (100,
&namespace_selector_window_leave_timeout_cb, toggle_button);
+ timeout_id =
+ g_timeout_add (100, &namespace_selector_window_leave_timeout_cb,
+ toggle_button);
if (namespace_selector_window_leave_timeout_source > 0)
g_source_remove (namespace_selector_window_leave_timeout_source);
namespace_selector_window_leave_timeout_source = timeout_id;
@@ -211,8 +229,8 @@
}
gboolean
-GNUNET_GTK_get_tree_string (GtkTreeView *treeview, GtkTreePath *treepath,
- guint column, gchar **value)
+GNUNET_GTK_get_tree_string (GtkTreeView * treeview, GtkTreePath * treepath,
+ guint column, gchar ** value)
{
gboolean ok;
GtkTreeModel *model;
@@ -222,6 +240,7 @@
return FALSE;
GtkTreeIter iter;
+
ok = gtk_tree_model_get_iter (model, &iter, treepath);
if (!ok)
return FALSE;
@@ -234,7 +253,8 @@
}
gboolean
-GNUNET_GTK_get_selected_anonymity_level (GtkBuilder *builder, gchar
*combo_name, guint *p_level)
+GNUNET_GTK_get_selected_anonymity_level (GtkBuilder * builder,
+ gchar * combo_name, guint * p_level)
{
GtkComboBox *combo;
GtkTreeIter iter;
@@ -259,7 +279,8 @@
}
gboolean
-GNUNET_GTK_select_anonymity_level (GtkBuilder *builder, gchar *combo_name,
guint sel_level)
+GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name,
+ guint sel_level)
{
GtkComboBox *combo;
GtkTreeIter iter;
@@ -275,9 +296,8 @@
if (!model)
return FALSE;
- for (go_on = gtk_tree_model_get_iter_first (model, &iter);
- go_on;
- go_on = gtk_tree_model_iter_next (model, &iter))
+ for (go_on = gtk_tree_model_get_iter_first (model, &iter); go_on;
+ go_on = gtk_tree_model_iter_next (model, &iter))
{
gtk_tree_model_get (model, &iter, 1, &level, -1);
if (level == sel_level)
@@ -290,9 +310,11 @@
}
gboolean
-get_selected_namespace_treepath_iter_model_widget (GtkBuilder *builder,
- GtkTreePath **p_treepath, GtkTreeIter *p_iter, GtkTreeModel **p_model,
- GtkWidget **p_widget)
+get_selected_namespace_treepath_iter_model_widget (GtkBuilder * builder,
+ GtkTreePath ** p_treepath,
+ GtkTreeIter * p_iter,
+ GtkTreeModel ** p_model,
+ GtkWidget ** p_widget)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
@@ -300,7 +322,9 @@
GtkTreePath *treepath;
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (builder,
"namespace_selector_treeview"));
+ widget =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "namespace_selector_treeview"));
if (!widget)
return FALSE;
@@ -338,8 +362,8 @@
}
void
-namespace_selector_treeview_cursor_changed_cb (GtkWidget *widget,
- gpointer user_data)
+namespace_selector_treeview_cursor_changed_cb (GtkWidget * widget,
+ gpointer user_data)
{
GtkBuilder *builder;
GtkToggleButton *toggle_button;
@@ -352,15 +376,20 @@
builder = GTK_BUILDER (user_data);
- toggle_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder,
"main_window_search_namespace_dropdown_button"));
+ toggle_button =
+ GTK_TOGGLE_BUTTON (gtk_builder_get_object
+ (builder,
+ "main_window_search_namespace_dropdown_button"));
if (!toggle_button)
return;
- search_entry = GTK_ENTRY (gtk_builder_get_object (builder,
"main_window_search_entry"));
+ search_entry =
+ GTK_ENTRY (gtk_builder_get_object (builder, "main_window_search_entry"));
if (!search_entry)
return;
- if (!get_selected_namespace_treepath_iter_model_widget (builder, &treepath,
NULL, &model, NULL))
+ if (!get_selected_namespace_treepath_iter_model_widget
+ (builder, &treepath, NULL, &model, NULL))
return;
ref = gtk_tree_row_reference_new (model, treepath);
old = g_object_get_data (G_OBJECT (toggle_button), "selected-row-reference");
@@ -369,18 +398,20 @@
g_object_set_data (G_OBJECT (toggle_button), "selected-row-reference", ref);
- sel_namespace_label = GTK_LABEL (gtk_builder_get_object (builder,
"main_window_search_selected_namespace_label"));
+ sel_namespace_label =
+ GTK_LABEL (gtk_builder_get_object
+ (builder, "main_window_search_selected_namespace_label"));
if (!sel_namespace_label)
return;
- if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 0,
- &value) && value != NULL)
+ if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 0, &value)
+ && value != NULL)
{
gtk_label_set_text (sel_namespace_label, value);
g_free (value);
}
- if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 2,
- &value) && value != NULL)
+ if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 2, &value)
+ && value != NULL)
{
gtk_entry_set_text (search_entry, value);
g_free (value);
@@ -393,7 +424,7 @@
}
GtkTreeRowReference *
-get_ns_selected_row (GtkTreeView *tree)
+get_ns_selected_row (GtkTreeView * tree)
{
GtkTreeSelection *sel;
GList *rows, *row;
@@ -414,8 +445,9 @@
}
gboolean
-namespace_selector_treeview_button_press_event_cb (GtkWidget *widget,
- GdkEvent *event, gpointer user_data)
+namespace_selector_treeview_button_press_event_cb (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_data)
{
GtkTreeRowReference *ref = NULL;
@@ -423,6 +455,7 @@
if (ref != NULL)
{
gpointer old = g_object_get_data (G_OBJECT (widget),
"pushed-rowreference");
+
if (old)
gtk_tree_row_reference_free (old);
g_object_set_data (G_OBJECT (widget), "pushed-rowreference", ref);
@@ -431,8 +464,9 @@
}
gboolean
-namespace_selector_treeview_button_release_event_cb (GtkWidget *widget,
- GdkEvent *event, gpointer user_data)
+namespace_selector_treeview_button_release_event_cb (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_data)
{
GtkTreeRowReference *ref = NULL;
gpointer old = g_object_get_data (G_OBJECT (widget), "pushed-rowreference");
@@ -441,6 +475,7 @@
if (ref && old)
{
GtkTreePath *path_ref, *path_old;
+
path_ref = gtk_tree_row_reference_get_path (ref);
path_old = gtk_tree_row_reference_get_path (old);
if (gtk_tree_path_compare (path_ref, path_old) == 0)
@@ -459,7 +494,7 @@
}
void
-main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
+main_window_search_button_clicked_cb (GtkButton * button, gpointer user_data)
{
GtkBuilder *builder;
GtkTreePath *namespace_treepath = NULL;
@@ -481,19 +516,22 @@
builder = GTK_BUILDER (user_data);
- toggle_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder,
- "main_window_search_namespace_dropdown_button"));
+ toggle_button =
+ GTK_TOGGLE_BUTTON (gtk_builder_get_object
+ (builder,
+ "main_window_search_namespace_dropdown_button"));
- if (!GNUNET_GTK_get_selected_anonymity_level (builder,
- "main_window_search_anonymity_combobox", &anonymity_level))
+ if (!GNUNET_GTK_get_selected_anonymity_level
+ (builder, "main_window_search_anonymity_combobox", &anonymity_level))
return;
- mime_combo = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object
- ("main_window_search_mime_combobox"));
+ mime_combo =
+ GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object
+ ("main_window_search_mime_combobox"));
mime_model = gtk_combo_box_get_model (mime_combo);
- mime_keyword = NULL;
- if (mime_model && gtk_combo_box_get_active_iter (mime_combo, &iter))
- gtk_tree_model_get (mime_model, &iter, 0, &mime_keyword, -1);
+ mime_keyword = NULL;
+ if (mime_model && gtk_combo_box_get_active_iter (mime_combo, &iter))
+ gtk_tree_model_get (mime_model, &iter, 0, &mime_keyword, -1);
if (strcmp (mime_keyword, " ") == 0)
{
g_free (mime_keyword);
@@ -505,14 +543,17 @@
{
namespace_model = gtk_tree_row_reference_get_model (ref);
namespace_treepath = gtk_tree_row_reference_get_path (ref);
- if ( (NULL != namespace_treepath) &&
- (TRUE == gtk_tree_model_get_iter (namespace_model, &iter,
namespace_treepath)) )
+ if ((NULL != namespace_treepath) &&
+ (TRUE ==
+ gtk_tree_model_get_iter (namespace_model, &iter, namespace_treepath)))
gtk_tree_model_get (namespace_model, &iter, 1, &nsid, -1);
}
- query_entry = GTK_ENTRY (gtk_builder_get_object (builder,
- "main_window_search_entry"));
+ query_entry =
+ GTK_ENTRY (gtk_builder_get_object (builder, "main_window_search_entry"));
entry_keywords = gtk_entry_get_text (query_entry);
- keywords = g_strdup_printf ("%s %s%s", entry_keywords, mime_keyword ? "+" :
"", mime_keyword ? mime_keyword : "");
+ keywords =
+ g_strdup_printf ("%s %s%s", entry_keywords, mime_keyword ? "+" : "",
+ mime_keyword ? mime_keyword : "");
g_free (mime_keyword);
if (nsid != NULL)
{
@@ -525,14 +566,14 @@
uri = GNUNET_FS_uri_ksk_create (keywords, &emsg);
if (uri == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Invalid keyword string `%s': %s"), keywords, emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid keyword string `%s':
%s"),
+ keywords, emsg);
GNUNET_free_non_null (emsg);
return;
}
}
- GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), uri,
- anonymity_level, GNUNET_FS_SEARCH_OPTION_NONE, NULL);
+ GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), uri, anonymity_level,
+ GNUNET_FS_SEARCH_OPTION_NONE, NULL);
g_free (keywords);
GNUNET_FS_uri_destroy (uri);
@@ -540,16 +581,19 @@
gboolean
-main_window_search_entry_key_press_event_cb (GtkWidget *widget,
- GdkEventKey *event, gpointer user_data)
+main_window_search_entry_key_press_event_cb (GtkWidget * widget,
+ GdkEventKey * event,
+ gpointer user_data)
{
GtkBuilder *builder;
+
builder = GTK_BUILDER (user_data);
if (event->keyval == GDK_KEY_Return)
{
GtkWidget *find = GTK_WIDGET (gtk_builder_get_object (builder,
- "main_window_search_button"));
+
"main_window_search_button"));
+
main_window_search_button_clicked_cb (GTK_BUTTON (find), user_data);
return TRUE;
}
@@ -567,7 +611,7 @@
*/
static int
add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
- const struct GNUNET_CONTAINER_MetaData *md, int rating)
+ const struct GNUNET_CONTAINER_MetaData *md, int rating)
{
GtkTreeStore *ts = cls;
char *root;
@@ -611,7 +655,10 @@
else
{
char *utf8_desc = NULL;
- utf8_desc = GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8,
description, strlen (description));
+
+ utf8_desc =
+ GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8,
+ description, strlen (description));
GNUNET_free (description);
if (utf8_desc != NULL)
description = utf8_desc;
@@ -619,7 +666,7 @@
description = NULL;
}
gtk_tree_store_insert_with_values (ts, &iter, NULL, G_MAXINT, 0, ns_name, 1,
- nsid, 2, root, 3, description, -1);
+ nsid, 2, root, 3, description, -1);
GNUNET_free (ns_name);
GNUNET_free_non_null (root);
GNUNET_free_non_null (description);
@@ -627,7 +674,7 @@
}
void
-GNUNET_GTK_main_window_realize_cb (GtkWidget *widget, gpointer user_data)
+GNUNET_GTK_main_window_realize_cb (GtkWidget * widget, gpointer user_data)
{
GtkTreeIter iter;
GtkTreeView *namespace_tree;
@@ -638,15 +685,19 @@
builder = GTK_BUILDER (user_data);
- namespace_treestore = GTK_TREE_STORE (GNUNET_FS_GTK_get_main_window_object
- ("main_window_search_namespace_treestore"));
- namespace_tree = GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
- ("namespace_selector_treeview"));
- metadata_tree = GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
- ("GNUNET_GTK_main_window_metadata_treeview"));
+ namespace_treestore =
+ GTK_TREE_STORE (GNUNET_FS_GTK_get_main_window_object
+ ("main_window_search_namespace_treestore"));
+ namespace_tree =
+ GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
+ ("namespace_selector_treeview"));
+ metadata_tree =
+ GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_metadata_treeview"));
/* Allow multiple selection in metadata view */
- gtk_tree_selection_set_mode (gtk_tree_view_get_selection (metadata_tree),
GTK_SELECTION_MULTIPLE);
+ gtk_tree_selection_set_mode (gtk_tree_view_get_selection (metadata_tree),
+ GTK_SELECTION_MULTIPLE);
/* FIXME: find a way to manage pseudonyms.
* Right now the list will be filled with ALL and ANY pseudonyms that we
@@ -657,33 +708,40 @@
* drag them around to change the order in which they appear in the list.
* All that is not possible with a simple "files in a directory" concept.
*/
- gtk_tree_store_insert_with_values (namespace_treestore, &iter, NULL,
- G_MAXINT, 0, "Any", 1, NULL, 2, "", 3,
- "Do not search in any particular namespace", -1);
+ gtk_tree_store_insert_with_values (namespace_treestore, &iter, NULL,
G_MAXINT,
+ 0, "Any", 1, NULL, 2, "", 3,
+ "Do not search in any particular
namespace",
+ -1);
/*
- GNUNET_PSEUDONYM_list_all (GNUNET_FS_GTK_get_configuration (),
- &add_namespace_to_ts, namespace_treestore);
- */
- GNUNET_PSEUDONYM_discovery_callback_register (
- GNUNET_FS_GTK_get_configuration (),
- &add_namespace_to_ts, namespace_treestore);
+ * GNUNET_PSEUDONYM_list_all (GNUNET_FS_GTK_get_configuration (),
+ * &add_namespace_to_ts, namespace_treestore);
+ */
+ GNUNET_PSEUDONYM_discovery_callback_register (GNUNET_FS_GTK_get_configuration
+ (), &add_namespace_to_ts,
+ namespace_treestore);
/* FIXME: read currently selected namespace from somewhere instead of
selecting 0th item */
- if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (namespace_treestore),
&iter))
+ if (gtk_tree_model_get_iter_first
+ (GTK_TREE_MODEL (namespace_treestore), &iter))
{
gchar *value;
GtkLabel *sel_namespace_label;
GtkTreePath *treepath = gtk_tree_path_new_first ();
- gtk_tree_selection_select_iter (gtk_tree_view_get_selection (
- namespace_tree), &iter);
- sel_namespace_label = GTK_LABEL (gtk_builder_get_object (builder,
"main_window_search_selected_namespace_label"));
+
+ gtk_tree_selection_select_iter (gtk_tree_view_get_selection
+ (namespace_tree), &iter);
+ sel_namespace_label =
+ GTK_LABEL (gtk_builder_get_object
+ (builder, "main_window_search_selected_namespace_label"));
if (GNUNET_GTK_get_tree_string (namespace_tree, treepath, 0, &value))
gtk_label_set_text (sel_namespace_label, value);
gtk_tree_path_free (treepath);
}
/* How the window (to trigger certain events) and immediately hide it */
- namespace_selector_window = GTK_WIDGET (gtk_builder_get_object (builder,
"namespace_selector_window"));
+ namespace_selector_window =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "namespace_selector_window"));
gtk_widget_show (namespace_selector_window);
gtk_widget_hide (namespace_selector_window);
@@ -714,10 +772,8 @@
/* initialize file-sharing */
plugins = EXTRACTOR_plugin_add_defaults (EXTRACTOR_OPTION_DEFAULT_POLICY);
- fs = GNUNET_FS_start (GNUNET_GTK_main_loop_get_configuration (ml),
- "gnunet-gtk", &GNUNET_GTK_fs_event_handler, NULL,
- GNUNET_FS_FLAGS_NONE /* | GNUNET_FS_FLAGS_PERSISTENCE |
- GNUNET_FS_FLAGS_DO_PROBES*/,
+ fs = GNUNET_FS_start (GNUNET_GTK_main_loop_get_configuration (ml),
"gnunet-gtk", &GNUNET_GTK_fs_event_handler, NULL, GNUNET_FS_FLAGS_NONE /* |
GNUNET_FS_FLAGS_PERSISTENCE |
+
*
GNUNET_FS_FLAGS_DO_PROBES */ ,
GNUNET_FS_OPTIONS_END);
if (fs != NULL)
{
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.h 2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.h 2011-12-26 20:04:58 UTC (rev 18836)
@@ -72,8 +72,8 @@
* @return TRUE on success, FALSE on error
*/
gboolean
-GNUNET_GTK_get_selected_anonymity_level (GtkBuilder *builder,
- gchar *combo_name, guint *p_level);
+GNUNET_GTK_get_selected_anonymity_level (GtkBuilder * builder,
+ gchar * combo_name, guint * p_level);
/**
@@ -86,8 +86,8 @@
* @return TRUE on success, FALSE on error (no item with such level)
*/
gboolean
-GNUNET_GTK_select_anonymity_level (GtkBuilder *builder,
- gchar *combo_name, guint sel_level);
+GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name,
+ guint sel_level);
#endif
/* end of gnunet-fs-gtk.h */
Modified: gnunet-gtk/src/fs/metatypes.c
===================================================================
--- gnunet-gtk/src/fs/metatypes.c 2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/fs/metatypes.c 2011-12-26 20:04:58 UTC (rev 18836)
@@ -1,1187 +1,959 @@
-
-gint types_generic[3 + 26 + 7 + 8 + 11 + 10 + 3 + 26 + 17 + 5 + 11 + 45 + 8 +
1] =
-{ /* Generic */
- EXTRACTOR_METATYPE_MIMETYPE,
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METATYPE_COMMENT,
-
- EXTRACTOR_METATYPE_TITLE,
- EXTRACTOR_METATYPE_BOOK_TITLE,
- EXTRACTOR_METATYPE_BOOK_EDITION,
- EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
- EXTRACTOR_METATYPE_JOURNAL_NAME,
- EXTRACTOR_METATYPE_JOURNAL_VOLUME,
- EXTRACTOR_METATYPE_JOURNAL_NUMBER,
- EXTRACTOR_METATYPE_PAGE_COUNT,
- EXTRACTOR_METATYPE_PAGE_RANGE,
- EXTRACTOR_METATYPE_AUTHOR_NAME,
- EXTRACTOR_METATYPE_AUTHOR_EMAIL,
- EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER,
- EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
- EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER_SERIES,
- EXTRACTOR_METATYPE_PUBLICATION_TYPE,
- EXTRACTOR_METATYPE_PUBLICATION_YEAR,
- EXTRACTOR_METATYPE_PUBLICATION_MONTH,
- EXTRACTOR_METATYPE_PUBLICATION_DAY,
- EXTRACTOR_METATYPE_PUBLICATION_DATE,
- EXTRACTOR_METATYPE_BIBTEX_EPRINT,
- EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
- EXTRACTOR_METATYPE_LANGUAGE,
- EXTRACTOR_METATYPE_CREATION_TIME,
- EXTRACTOR_METATYPE_URL,
-
- EXTRACTOR_METATYPE_URI,
- EXTRACTOR_METATYPE_ISRC,
- EXTRACTOR_METATYPE_HASH_MD4,
- EXTRACTOR_METATYPE_HASH_MD5,
- EXTRACTOR_METATYPE_HASH_SHA0,
- EXTRACTOR_METATYPE_HASH_SHA1,
- EXTRACTOR_METATYPE_HASH_RMD160,
-
- EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LATITUDE,
- EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LONGITUDE,
- EXTRACTOR_METATYPE_LOCATION_CITY,
- EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
-
- EXTRACTOR_METATYPE_UNKNOWN,
- EXTRACTOR_METATYPE_DESCRIPTION,
- EXTRACTOR_METATYPE_COPYRIGHT,
- EXTRACTOR_METATYPE_RIGHTS,
- EXTRACTOR_METATYPE_KEYWORDS,
- EXTRACTOR_METATYPE_ABSTRACT,
- EXTRACTOR_METATYPE_SUMMARY,
- EXTRACTOR_METATYPE_SUBJECT,
- EXTRACTOR_METATYPE_CREATOR,
- EXTRACTOR_METATYPE_FORMAT,
- EXTRACTOR_METATYPE_FORMAT_VERSION,
-
- EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_UNKNOWN_DATE,
- EXTRACTOR_METATYPE_CREATION_DATE,
- EXTRACTOR_METATYPE_MODIFICATION_DATE,
- EXTRACTOR_METATYPE_LAST_PRINTED,
- EXTRACTOR_METATYPE_LAST_SAVED_BY,
- EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
- EXTRACTOR_METATYPE_EDITING_CYCLES,
- EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_REVISION_HISTORY,
-
- EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
- EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
- EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
-
- EXTRACTOR_METATYPE_PACKAGE_NAME,
- EXTRACTOR_METATYPE_PACKAGE_VERSION,
- EXTRACTOR_METATYPE_SECTION,
- EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
- EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
- EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
- EXTRACTOR_METATYPE_PACKAGE_REPLACES,
- EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
- EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
- EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
- EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
- EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
- EXTRACTOR_METATYPE_PACKAGE_SOURCE,
- EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
- EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
- EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
- EXTRACTOR_METATYPE_LICENSE,
- EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
- EXTRACTOR_METATYPE_BUILDHOST,
- EXTRACTOR_METATYPE_VENDOR,
- EXTRACTOR_METATYPE_TARGET_OS,
- EXTRACTOR_METATYPE_SOFTWARE_VERSION,
- EXTRACTOR_METATYPE_TARGET_PLATFORM,
- EXTRACTOR_METATYPE_RESOURCE_TYPE,
- EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
- EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
-
- EXTRACTOR_METATYPE_CAMERA_MAKE,
- EXTRACTOR_METATYPE_CAMERA_MODEL,
- EXTRACTOR_METATYPE_EXPOSURE,
- EXTRACTOR_METATYPE_APERTURE,
- EXTRACTOR_METATYPE_EXPOSURE_BIAS,
- EXTRACTOR_METATYPE_FLASH,
- EXTRACTOR_METATYPE_FLASH_BIAS,
- EXTRACTOR_METATYPE_FOCAL_LENGTH,
- EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
- EXTRACTOR_METATYPE_ISO_SPEED,
- EXTRACTOR_METATYPE_EXPOSURE_MODE,
- EXTRACTOR_METATYPE_METERING_MODE,
- EXTRACTOR_METATYPE_MACRO_MODE,
- EXTRACTOR_METATYPE_IMAGE_QUALITY,
- EXTRACTOR_METATYPE_WHITE_BALANCE,
- EXTRACTOR_METATYPE_ORIENTATION,
- EXTRACTOR_METATYPE_MAGNIFICATION,
-
- EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
- EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_THUMBNAIL,
- EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
- EXTRACTOR_METATYPE_SOURCE,
-
- EXTRACTOR_METATYPE_CHARACTER_SET,
- EXTRACTOR_METATYPE_LINE_COUNT,
- EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
- EXTRACTOR_METATYPE_WORD_COUNT,
- EXTRACTOR_METATYPE_CHARACTER_COUNT,
- EXTRACTOR_METATYPE_PAGE_ORIENTATION,
- EXTRACTOR_METATYPE_PAPER_SIZE,
- EXTRACTOR_METATYPE_TEMPLATE,
- EXTRACTOR_METATYPE_COMPANY,
- EXTRACTOR_METATYPE_MANAGER,
- EXTRACTOR_METATYPE_REVISION_NUMBER,
-
- EXTRACTOR_METATYPE_DURATION,
- EXTRACTOR_METATYPE_ALBUM,
- EXTRACTOR_METATYPE_ARTIST,
- EXTRACTOR_METATYPE_GENRE,
- EXTRACTOR_METATYPE_TRACK_NUMBER,
- EXTRACTOR_METATYPE_DISC_NUMBER,
- EXTRACTOR_METATYPE_PERFORMER,
- EXTRACTOR_METATYPE_CONTACT_INFORMATION,
- EXTRACTOR_METATYPE_SONG_VERSION,
- EXTRACTOR_METATYPE_PICTURE,
- EXTRACTOR_METATYPE_COVER_PICTURE,
- EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
- EXTRACTOR_METATYPE_EVENT_PICTURE,
- EXTRACTOR_METATYPE_LOGO,
- EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
- EXTRACTOR_METATYPE_SOURCE_DEVICE,
- EXTRACTOR_METATYPE_DISCLAIMER,
- EXTRACTOR_METATYPE_WARNING,
- EXTRACTOR_METATYPE_PAGE_ORDER,
- EXTRACTOR_METATYPE_WRITER,
- EXTRACTOR_METATYPE_PRODUCT_VERSION,
- EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
- EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
- EXTRACTOR_METATYPE_NETWORK_NAME,
- EXTRACTOR_METATYPE_SHOW_NAME,
- EXTRACTOR_METATYPE_CHAPTER_NAME,
- EXTRACTOR_METATYPE_SONG_COUNT,
- EXTRACTOR_METATYPE_STARTING_SONG,
- EXTRACTOR_METATYPE_PLAY_COUNTER,
- EXTRACTOR_METATYPE_CONDUCTOR,
- EXTRACTOR_METATYPE_INTERPRETATION,
- EXTRACTOR_METATYPE_COMPOSER,
- EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
- EXTRACTOR_METATYPE_ENCODED_BY,
- EXTRACTOR_METATYPE_ORIGINAL_TITLE,
- EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
- EXTRACTOR_METATYPE_ORIGINAL_WRITER,
- EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
- EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
- EXTRACTOR_METATYPE_LYRICS,
- EXTRACTOR_METATYPE_POPULARITY_METER,
- EXTRACTOR_METATYPE_LICENSEE,
- EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
- EXTRACTOR_METATYPE_MOOD,
- EXTRACTOR_METATYPE_SUBTITLE,
-
- EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
- EXTRACTOR_METATYPE_GNUNET_FULL_DATA,
- EXTRACTOR_METATYPE_RATING,
- EXTRACTOR_METATYPE_ORGANIZATION,
- EXTRACTOR_METATYPE_RIPPER,
- EXTRACTOR_METATYPE_PRODUCER,
- EXTRACTOR_METATYPE_GROUP,
- EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-
- EXTRACTOR_METATYPE_RESERVED
-};
-gint types_text[3 + 26 + 7 /*+ 8*/ + 11 + 10 + 3 /*+ 26 + 17 + 5*/ + 11 /*+
45*/ + 8 + 1] =
-{ /* Text */
- EXTRACTOR_METATYPE_MIMETYPE,
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METATYPE_COMMENT,
-
- EXTRACTOR_METATYPE_TITLE,
- EXTRACTOR_METATYPE_BOOK_TITLE,
- EXTRACTOR_METATYPE_BOOK_EDITION,
- EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
- EXTRACTOR_METATYPE_JOURNAL_NAME,
- EXTRACTOR_METATYPE_JOURNAL_VOLUME,
- EXTRACTOR_METATYPE_JOURNAL_NUMBER,
- EXTRACTOR_METATYPE_PAGE_COUNT,
- EXTRACTOR_METATYPE_PAGE_RANGE,
- EXTRACTOR_METATYPE_AUTHOR_NAME,
- EXTRACTOR_METATYPE_AUTHOR_EMAIL,
- EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER,
- EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
- EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER_SERIES,
- EXTRACTOR_METATYPE_PUBLICATION_TYPE,
- EXTRACTOR_METATYPE_PUBLICATION_YEAR,
- EXTRACTOR_METATYPE_PUBLICATION_MONTH,
- EXTRACTOR_METATYPE_PUBLICATION_DAY,
- EXTRACTOR_METATYPE_PUBLICATION_DATE,
- EXTRACTOR_METATYPE_BIBTEX_EPRINT,
- EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
- EXTRACTOR_METATYPE_LANGUAGE,
- EXTRACTOR_METATYPE_CREATION_TIME,
- EXTRACTOR_METATYPE_URL,
-
- EXTRACTOR_METATYPE_URI,
- EXTRACTOR_METATYPE_ISRC,
- EXTRACTOR_METATYPE_HASH_MD4,
- EXTRACTOR_METATYPE_HASH_MD5,
- EXTRACTOR_METATYPE_HASH_SHA0,
- EXTRACTOR_METATYPE_HASH_SHA1,
- EXTRACTOR_METATYPE_HASH_RMD160,
-/*
- EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LATITUDE,
- EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LONGITUDE,
- EXTRACTOR_METATYPE_LOCATION_CITY,
- EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
-*/
- EXTRACTOR_METATYPE_UNKNOWN,
- EXTRACTOR_METATYPE_DESCRIPTION,
- EXTRACTOR_METATYPE_COPYRIGHT,
- EXTRACTOR_METATYPE_RIGHTS,
- EXTRACTOR_METATYPE_KEYWORDS,
- EXTRACTOR_METATYPE_ABSTRACT,
- EXTRACTOR_METATYPE_SUMMARY,
- EXTRACTOR_METATYPE_SUBJECT,
- EXTRACTOR_METATYPE_CREATOR,
- EXTRACTOR_METATYPE_FORMAT,
- EXTRACTOR_METATYPE_FORMAT_VERSION,
-
- EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_UNKNOWN_DATE,
- EXTRACTOR_METATYPE_CREATION_DATE,
- EXTRACTOR_METATYPE_MODIFICATION_DATE,
- EXTRACTOR_METATYPE_LAST_PRINTED,
- EXTRACTOR_METATYPE_LAST_SAVED_BY,
- EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
- EXTRACTOR_METATYPE_EDITING_CYCLES,
- EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_REVISION_HISTORY,
-
- EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
- EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
- EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
-/*
- EXTRACTOR_METATYPE_PACKAGE_NAME,
- EXTRACTOR_METATYPE_PACKAGE_VERSION,
- EXTRACTOR_METATYPE_SECTION,
- EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
- EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
- EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
- EXTRACTOR_METATYPE_PACKAGE_REPLACES,
- EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
- EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
- EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
- EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
- EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
- EXTRACTOR_METATYPE_PACKAGE_SOURCE,
- EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
- EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
- EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
- EXTRACTOR_METATYPE_LICENSE,
- EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
- EXTRACTOR_METATYPE_BUILDHOST,
- EXTRACTOR_METATYPE_VENDOR,
- EXTRACTOR_METATYPE_TARGET_OS,
- EXTRACTOR_METATYPE_SOFTWARE_VERSION,
- EXTRACTOR_METATYPE_TARGET_PLATFORM,
- EXTRACTOR_METATYPE_RESOURCE_TYPE,
- EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
- EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
-
- EXTRACTOR_METATYPE_CAMERA_MAKE,
- EXTRACTOR_METATYPE_CAMERA_MODEL,
- EXTRACTOR_METATYPE_EXPOSURE,
- EXTRACTOR_METATYPE_APERTURE,
- EXTRACTOR_METATYPE_EXPOSURE_BIAS,
- EXTRACTOR_METATYPE_FLASH,
- EXTRACTOR_METATYPE_FLASH_BIAS,
- EXTRACTOR_METATYPE_FOCAL_LENGTH,
- EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
- EXTRACTOR_METATYPE_ISO_SPEED,
- EXTRACTOR_METATYPE_EXPOSURE_MODE,
- EXTRACTOR_METATYPE_METERING_MODE,
- EXTRACTOR_METATYPE_MACRO_MODE,
- EXTRACTOR_METATYPE_IMAGE_QUALITY,
- EXTRACTOR_METATYPE_WHITE_BALANCE,
- EXTRACTOR_METATYPE_ORIENTATION,
- EXTRACTOR_METATYPE_MAGNIFICATION,
-
- EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
- EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_THUMBNAIL,
- EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
- EXTRACTOR_METATYPE_SOURCE,
-*/
- EXTRACTOR_METATYPE_CHARACTER_SET,
- EXTRACTOR_METATYPE_LINE_COUNT,
- EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
- EXTRACTOR_METATYPE_WORD_COUNT,
- EXTRACTOR_METATYPE_CHARACTER_COUNT,
- EXTRACTOR_METATYPE_PAGE_ORIENTATION,
- EXTRACTOR_METATYPE_PAPER_SIZE,
- EXTRACTOR_METATYPE_TEMPLATE,
- EXTRACTOR_METATYPE_COMPANY,
- EXTRACTOR_METATYPE_MANAGER,
- EXTRACTOR_METATYPE_REVISION_NUMBER,
-/*
- EXTRACTOR_METATYPE_DURATION,
- EXTRACTOR_METATYPE_ALBUM,
- EXTRACTOR_METATYPE_ARTIST,
- EXTRACTOR_METATYPE_GENRE,
- EXTRACTOR_METATYPE_TRACK_NUMBER,
- EXTRACTOR_METATYPE_DISC_NUMBER,
- EXTRACTOR_METATYPE_PERFORMER,
- EXTRACTOR_METATYPE_CONTACT_INFORMATION,
- EXTRACTOR_METATYPE_SONG_VERSION,
- EXTRACTOR_METATYPE_PICTURE,
- EXTRACTOR_METATYPE_COVER_PICTURE,
- EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
- EXTRACTOR_METATYPE_EVENT_PICTURE,
- EXTRACTOR_METATYPE_LOGO,
- EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
- EXTRACTOR_METATYPE_SOURCE_DEVICE,
- EXTRACTOR_METATYPE_DISCLAIMER,
- EXTRACTOR_METATYPE_WARNING,
- EXTRACTOR_METATYPE_PAGE_ORDER,
- EXTRACTOR_METATYPE_WRITER,
- EXTRACTOR_METATYPE_PRODUCT_VERSION,
- EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
- EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
- EXTRACTOR_METATYPE_NETWORK_NAME,
- EXTRACTOR_METATYPE_SHOW_NAME,
- EXTRACTOR_METATYPE_CHAPTER_NAME,
- EXTRACTOR_METATYPE_SONG_COUNT,
- EXTRACTOR_METATYPE_STARTING_SONG,
- EXTRACTOR_METATYPE_PLAY_COUNTER,
- EXTRACTOR_METATYPE_CONDUCTOR,
- EXTRACTOR_METATYPE_INTERPRETATION,
- EXTRACTOR_METATYPE_COMPOSER,
- EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
- EXTRACTOR_METATYPE_ENCODED_BY,
- EXTRACTOR_METATYPE_ORIGINAL_TITLE,
- EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
- EXTRACTOR_METATYPE_ORIGINAL_WRITER,
- EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
- EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
- EXTRACTOR_METATYPE_LYRICS,
- EXTRACTOR_METATYPE_POPULARITY_METER,
- EXTRACTOR_METATYPE_LICENSEE,
- EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
- EXTRACTOR_METATYPE_MOOD,
- EXTRACTOR_METATYPE_SUBTITLE,
-*/
- EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
- EXTRACTOR_METATYPE_GNUNET_FULL_DATA,
- EXTRACTOR_METATYPE_RATING,
- EXTRACTOR_METATYPE_ORGANIZATION,
- EXTRACTOR_METATYPE_RIPPER,
- EXTRACTOR_METATYPE_PRODUCER,
- EXTRACTOR_METATYPE_GROUP,
- EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-
- EXTRACTOR_METATYPE_RESERVED
-};
-gint types_music[3 /*+ 26*/ + 7 /*+ 8*/ + 11 + /*10*/9 + 3 /*+ 26 + 17 + 5 +
11*/ + 45 + 8 + 1] =
-{ /* Music */
- EXTRACTOR_METATYPE_MIMETYPE,
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METATYPE_COMMENT,
-/*
- EXTRACTOR_METATYPE_TITLE,
- EXTRACTOR_METATYPE_BOOK_TITLE,
- EXTRACTOR_METATYPE_BOOK_EDITION,
- EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
- EXTRACTOR_METATYPE_JOURNAL_NAME,
- EXTRACTOR_METATYPE_JOURNAL_VOLUME,
- EXTRACTOR_METATYPE_JOURNAL_NUMBER,
- EXTRACTOR_METATYPE_PAGE_COUNT,
- EXTRACTOR_METATYPE_PAGE_RANGE,
- EXTRACTOR_METATYPE_AUTHOR_NAME,
- EXTRACTOR_METATYPE_AUTHOR_EMAIL,
- EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER,
- EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
- EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER_SERIES,
- EXTRACTOR_METATYPE_PUBLICATION_TYPE,
- EXTRACTOR_METATYPE_PUBLICATION_YEAR,
- EXTRACTOR_METATYPE_PUBLICATION_MONTH,
- EXTRACTOR_METATYPE_PUBLICATION_DAY,
- EXTRACTOR_METATYPE_PUBLICATION_DATE,
- EXTRACTOR_METATYPE_BIBTEX_EPRINT,
- EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
- EXTRACTOR_METATYPE_LANGUAGE,
- EXTRACTOR_METATYPE_CREATION_TIME,
- EXTRACTOR_METATYPE_URL,
-*/
- EXTRACTOR_METATYPE_URI,
- EXTRACTOR_METATYPE_ISRC,
- EXTRACTOR_METATYPE_HASH_MD4,
- EXTRACTOR_METATYPE_HASH_MD5,
- EXTRACTOR_METATYPE_HASH_SHA0,
- EXTRACTOR_METATYPE_HASH_SHA1,
- EXTRACTOR_METATYPE_HASH_RMD160,
-/*
- EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LATITUDE,
- EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LONGITUDE,
- EXTRACTOR_METATYPE_LOCATION_CITY,
- EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
-*/
- EXTRACTOR_METATYPE_UNKNOWN,
- EXTRACTOR_METATYPE_DESCRIPTION,
- EXTRACTOR_METATYPE_COPYRIGHT,
- EXTRACTOR_METATYPE_RIGHTS,
- EXTRACTOR_METATYPE_KEYWORDS,
- EXTRACTOR_METATYPE_ABSTRACT,
- EXTRACTOR_METATYPE_SUMMARY,
- EXTRACTOR_METATYPE_SUBJECT,
- EXTRACTOR_METATYPE_CREATOR,
- EXTRACTOR_METATYPE_FORMAT,
- EXTRACTOR_METATYPE_FORMAT_VERSION,
-
- EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_UNKNOWN_DATE,
- EXTRACTOR_METATYPE_CREATION_DATE,
- EXTRACTOR_METATYPE_MODIFICATION_DATE,
-/* EXTRACTOR_METATYPE_LAST_PRINTED,*/
- EXTRACTOR_METATYPE_LAST_SAVED_BY,
- EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
- EXTRACTOR_METATYPE_EDITING_CYCLES,
- EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_REVISION_HISTORY,
-
- EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
- EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
- EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
-/*
- EXTRACTOR_METATYPE_PACKAGE_NAME,
- EXTRACTOR_METATYPE_PACKAGE_VERSION,
- EXTRACTOR_METATYPE_SECTION,
- EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
- EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
- EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
- EXTRACTOR_METATYPE_PACKAGE_REPLACES,
- EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
- EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
- EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
- EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
- EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
- EXTRACTOR_METATYPE_PACKAGE_SOURCE,
- EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
- EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
- EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
- EXTRACTOR_METATYPE_LICENSE,
- EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
- EXTRACTOR_METATYPE_BUILDHOST,
- EXTRACTOR_METATYPE_VENDOR,
- EXTRACTOR_METATYPE_TARGET_OS,
- EXTRACTOR_METATYPE_SOFTWARE_VERSION,
- EXTRACTOR_METATYPE_TARGET_PLATFORM,
- EXTRACTOR_METATYPE_RESOURCE_TYPE,
- EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
- EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
-
- EXTRACTOR_METATYPE_CAMERA_MAKE,
- EXTRACTOR_METATYPE_CAMERA_MODEL,
- EXTRACTOR_METATYPE_EXPOSURE,
- EXTRACTOR_METATYPE_APERTURE,
- EXTRACTOR_METATYPE_EXPOSURE_BIAS,
- EXTRACTOR_METATYPE_FLASH,
- EXTRACTOR_METATYPE_FLASH_BIAS,
- EXTRACTOR_METATYPE_FOCAL_LENGTH,
- EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
- EXTRACTOR_METATYPE_ISO_SPEED,
- EXTRACTOR_METATYPE_EXPOSURE_MODE,
- EXTRACTOR_METATYPE_METERING_MODE,
- EXTRACTOR_METATYPE_MACRO_MODE,
- EXTRACTOR_METATYPE_IMAGE_QUALITY,
- EXTRACTOR_METATYPE_WHITE_BALANCE,
- EXTRACTOR_METATYPE_ORIENTATION,
- EXTRACTOR_METATYPE_MAGNIFICATION,
-
- EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
- EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_THUMBNAIL,
- EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
- EXTRACTOR_METATYPE_SOURCE,
-
- EXTRACTOR_METATYPE_CHARACTER_SET,
- EXTRACTOR_METATYPE_LINE_COUNT,
- EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
- EXTRACTOR_METATYPE_WORD_COUNT,
- EXTRACTOR_METATYPE_CHARACTER_COUNT,
- EXTRACTOR_METATYPE_PAGE_ORIENTATION,
- EXTRACTOR_METATYPE_PAPER_SIZE,
- EXTRACTOR_METATYPE_TEMPLATE,
- EXTRACTOR_METATYPE_COMPANY,
- EXTRACTOR_METATYPE_MANAGER,
- EXTRACTOR_METATYPE_REVISION_NUMBER,
-*/
- EXTRACTOR_METATYPE_DURATION,
- EXTRACTOR_METATYPE_ALBUM,
- EXTRACTOR_METATYPE_ARTIST,
- EXTRACTOR_METATYPE_GENRE,
- EXTRACTOR_METATYPE_TRACK_NUMBER,
- EXTRACTOR_METATYPE_DISC_NUMBER,
- EXTRACTOR_METATYPE_PERFORMER,
- EXTRACTOR_METATYPE_CONTACT_INFORMATION,
- EXTRACTOR_METATYPE_SONG_VERSION,
- EXTRACTOR_METATYPE_PICTURE,
- EXTRACTOR_METATYPE_COVER_PICTURE,
- EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
- EXTRACTOR_METATYPE_EVENT_PICTURE,
- EXTRACTOR_METATYPE_LOGO,
- EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
- EXTRACTOR_METATYPE_SOURCE_DEVICE,
- EXTRACTOR_METATYPE_DISCLAIMER,
- EXTRACTOR_METATYPE_WARNING,
- EXTRACTOR_METATYPE_PAGE_ORDER,
- EXTRACTOR_METATYPE_WRITER,
- EXTRACTOR_METATYPE_PRODUCT_VERSION,
- EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
- EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
- EXTRACTOR_METATYPE_NETWORK_NAME,
- EXTRACTOR_METATYPE_SHOW_NAME,
- EXTRACTOR_METATYPE_CHAPTER_NAME,
- EXTRACTOR_METATYPE_SONG_COUNT,
- EXTRACTOR_METATYPE_STARTING_SONG,
- EXTRACTOR_METATYPE_PLAY_COUNTER,
- EXTRACTOR_METATYPE_CONDUCTOR,
- EXTRACTOR_METATYPE_INTERPRETATION,
- EXTRACTOR_METATYPE_COMPOSER,
- EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
- EXTRACTOR_METATYPE_ENCODED_BY,
- EXTRACTOR_METATYPE_ORIGINAL_TITLE,
- EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
- EXTRACTOR_METATYPE_ORIGINAL_WRITER,
- EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
- EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
- EXTRACTOR_METATYPE_LYRICS,
- EXTRACTOR_METATYPE_POPULARITY_METER,
- EXTRACTOR_METATYPE_LICENSEE,
- EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
- EXTRACTOR_METATYPE_MOOD,
- EXTRACTOR_METATYPE_SUBTITLE,
-
- EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
- EXTRACTOR_METATYPE_GNUNET_FULL_DATA,
- EXTRACTOR_METATYPE_RATING,
- EXTRACTOR_METATYPE_ORGANIZATION,
- EXTRACTOR_METATYPE_RIPPER,
- EXTRACTOR_METATYPE_PRODUCER,
- EXTRACTOR_METATYPE_GROUP,
- EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-
- EXTRACTOR_METATYPE_RESERVED
-};
-gint types_video[3 /*+ 26*/ + 7 /*+ 8*/ + 11 + /*10*/9 + 3 /*+ 26 + 17*/ + 5
/*+ 11*/ + 45 + 8 + 1] =
-{ /* Video */
- EXTRACTOR_METATYPE_MIMETYPE,
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METATYPE_COMMENT,
-/*
- EXTRACTOR_METATYPE_TITLE,
- EXTRACTOR_METATYPE_BOOK_TITLE,
- EXTRACTOR_METATYPE_BOOK_EDITION,
- EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
- EXTRACTOR_METATYPE_JOURNAL_NAME,
- EXTRACTOR_METATYPE_JOURNAL_VOLUME,
- EXTRACTOR_METATYPE_JOURNAL_NUMBER,
- EXTRACTOR_METATYPE_PAGE_COUNT,
- EXTRACTOR_METATYPE_PAGE_RANGE,
- EXTRACTOR_METATYPE_AUTHOR_NAME,
- EXTRACTOR_METATYPE_AUTHOR_EMAIL,
- EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER,
- EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
- EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER_SERIES,
- EXTRACTOR_METATYPE_PUBLICATION_TYPE,
- EXTRACTOR_METATYPE_PUBLICATION_YEAR,
- EXTRACTOR_METATYPE_PUBLICATION_MONTH,
- EXTRACTOR_METATYPE_PUBLICATION_DAY,
- EXTRACTOR_METATYPE_PUBLICATION_DATE,
- EXTRACTOR_METATYPE_BIBTEX_EPRINT,
- EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
- EXTRACTOR_METATYPE_LANGUAGE,
- EXTRACTOR_METATYPE_CREATION_TIME,
- EXTRACTOR_METATYPE_URL,
-*/
- EXTRACTOR_METATYPE_URI,
- EXTRACTOR_METATYPE_ISRC,
- EXTRACTOR_METATYPE_HASH_MD4,
- EXTRACTOR_METATYPE_HASH_MD5,
- EXTRACTOR_METATYPE_HASH_SHA0,
- EXTRACTOR_METATYPE_HASH_SHA1,
- EXTRACTOR_METATYPE_HASH_RMD160,
-/*
- EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LATITUDE,
- EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LONGITUDE,
- EXTRACTOR_METATYPE_LOCATION_CITY,
- EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
-*/
- EXTRACTOR_METATYPE_UNKNOWN,
- EXTRACTOR_METATYPE_DESCRIPTION,
- EXTRACTOR_METATYPE_COPYRIGHT,
- EXTRACTOR_METATYPE_RIGHTS,
- EXTRACTOR_METATYPE_KEYWORDS,
- EXTRACTOR_METATYPE_ABSTRACT,
- EXTRACTOR_METATYPE_SUMMARY,
- EXTRACTOR_METATYPE_SUBJECT,
- EXTRACTOR_METATYPE_CREATOR,
- EXTRACTOR_METATYPE_FORMAT,
- EXTRACTOR_METATYPE_FORMAT_VERSION,
-
- EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_UNKNOWN_DATE,
- EXTRACTOR_METATYPE_CREATION_DATE,
- EXTRACTOR_METATYPE_MODIFICATION_DATE,
-/* EXTRACTOR_METATYPE_LAST_PRINTED,*/
- EXTRACTOR_METATYPE_LAST_SAVED_BY,
- EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
- EXTRACTOR_METATYPE_EDITING_CYCLES,
- EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_REVISION_HISTORY,
-
- EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
- EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
- EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
-/*
- EXTRACTOR_METATYPE_PACKAGE_NAME,
- EXTRACTOR_METATYPE_PACKAGE_VERSION,
- EXTRACTOR_METATYPE_SECTION,
- EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
- EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
- EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
- EXTRACTOR_METATYPE_PACKAGE_REPLACES,
- EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
- EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
- EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
- EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
- EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
- EXTRACTOR_METATYPE_PACKAGE_SOURCE,
- EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
- EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
- EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
- EXTRACTOR_METATYPE_LICENSE,
- EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
- EXTRACTOR_METATYPE_BUILDHOST,
- EXTRACTOR_METATYPE_VENDOR,
- EXTRACTOR_METATYPE_TARGET_OS,
- EXTRACTOR_METATYPE_SOFTWARE_VERSION,
- EXTRACTOR_METATYPE_TARGET_PLATFORM,
- EXTRACTOR_METATYPE_RESOURCE_TYPE,
- EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
- EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
-
- EXTRACTOR_METATYPE_CAMERA_MAKE,
- EXTRACTOR_METATYPE_CAMERA_MODEL,
- EXTRACTOR_METATYPE_EXPOSURE,
- EXTRACTOR_METATYPE_APERTURE,
- EXTRACTOR_METATYPE_EXPOSURE_BIAS,
- EXTRACTOR_METATYPE_FLASH,
- EXTRACTOR_METATYPE_FLASH_BIAS,
- EXTRACTOR_METATYPE_FOCAL_LENGTH,
- EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
- EXTRACTOR_METATYPE_ISO_SPEED,
- EXTRACTOR_METATYPE_EXPOSURE_MODE,
- EXTRACTOR_METATYPE_METERING_MODE,
- EXTRACTOR_METATYPE_MACRO_MODE,
- EXTRACTOR_METATYPE_IMAGE_QUALITY,
- EXTRACTOR_METATYPE_WHITE_BALANCE,
- EXTRACTOR_METATYPE_ORIENTATION,
- EXTRACTOR_METATYPE_MAGNIFICATION,
-*/
- EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
- EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_THUMBNAIL,
- EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
- EXTRACTOR_METATYPE_SOURCE,
-/*
- EXTRACTOR_METATYPE_CHARACTER_SET,
- EXTRACTOR_METATYPE_LINE_COUNT,
- EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
- EXTRACTOR_METATYPE_WORD_COUNT,
- EXTRACTOR_METATYPE_CHARACTER_COUNT,
- EXTRACTOR_METATYPE_PAGE_ORIENTATION,
- EXTRACTOR_METATYPE_PAPER_SIZE,
- EXTRACTOR_METATYPE_TEMPLATE,
- EXTRACTOR_METATYPE_COMPANY,
- EXTRACTOR_METATYPE_MANAGER,
- EXTRACTOR_METATYPE_REVISION_NUMBER,
-*/
- EXTRACTOR_METATYPE_DURATION,
- EXTRACTOR_METATYPE_ALBUM,
- EXTRACTOR_METATYPE_ARTIST,
- EXTRACTOR_METATYPE_GENRE,
- EXTRACTOR_METATYPE_TRACK_NUMBER,
- EXTRACTOR_METATYPE_DISC_NUMBER,
- EXTRACTOR_METATYPE_PERFORMER,
- EXTRACTOR_METATYPE_CONTACT_INFORMATION,
- EXTRACTOR_METATYPE_SONG_VERSION,
- EXTRACTOR_METATYPE_PICTURE,
- EXTRACTOR_METATYPE_COVER_PICTURE,
- EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
- EXTRACTOR_METATYPE_EVENT_PICTURE,
- EXTRACTOR_METATYPE_LOGO,
- EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
- EXTRACTOR_METATYPE_SOURCE_DEVICE,
- EXTRACTOR_METATYPE_DISCLAIMER,
- EXTRACTOR_METATYPE_WARNING,
- EXTRACTOR_METATYPE_PAGE_ORDER,
- EXTRACTOR_METATYPE_WRITER,
- EXTRACTOR_METATYPE_PRODUCT_VERSION,
- EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
- EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
- EXTRACTOR_METATYPE_NETWORK_NAME,
- EXTRACTOR_METATYPE_SHOW_NAME,
- EXTRACTOR_METATYPE_CHAPTER_NAME,
- EXTRACTOR_METATYPE_SONG_COUNT,
- EXTRACTOR_METATYPE_STARTING_SONG,
- EXTRACTOR_METATYPE_PLAY_COUNTER,
- EXTRACTOR_METATYPE_CONDUCTOR,
- EXTRACTOR_METATYPE_INTERPRETATION,
- EXTRACTOR_METATYPE_COMPOSER,
- EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
- EXTRACTOR_METATYPE_ENCODED_BY,
- EXTRACTOR_METATYPE_ORIGINAL_TITLE,
- EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
- EXTRACTOR_METATYPE_ORIGINAL_WRITER,
- EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
- EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
- EXTRACTOR_METATYPE_LYRICS,
- EXTRACTOR_METATYPE_POPULARITY_METER,
- EXTRACTOR_METATYPE_LICENSEE,
- EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
- EXTRACTOR_METATYPE_MOOD,
- EXTRACTOR_METATYPE_SUBTITLE,
-
- EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
- EXTRACTOR_METATYPE_GNUNET_FULL_DATA,
- EXTRACTOR_METATYPE_RATING,
- EXTRACTOR_METATYPE_ORGANIZATION,
- EXTRACTOR_METATYPE_RIPPER,
- EXTRACTOR_METATYPE_PRODUCER,
- EXTRACTOR_METATYPE_GROUP,
- EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-
- EXTRACTOR_METATYPE_RESERVED
-};
-gint types_image[3 /*+ 26*/ + 7 /*+ 8*/ + 11 + 10 + 3 /*+ 26*/ + 17 + 5 /*+ 11
+ 45*/ + 8 + 1] =
-{ /* Image */
- EXTRACTOR_METATYPE_MIMETYPE,
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METATYPE_COMMENT,
-/*
- EXTRACTOR_METATYPE_TITLE,
- EXTRACTOR_METATYPE_BOOK_TITLE,
- EXTRACTOR_METATYPE_BOOK_EDITION,
- EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
- EXTRACTOR_METATYPE_JOURNAL_NAME,
- EXTRACTOR_METATYPE_JOURNAL_VOLUME,
- EXTRACTOR_METATYPE_JOURNAL_NUMBER,
- EXTRACTOR_METATYPE_PAGE_COUNT,
- EXTRACTOR_METATYPE_PAGE_RANGE,
- EXTRACTOR_METATYPE_AUTHOR_NAME,
- EXTRACTOR_METATYPE_AUTHOR_EMAIL,
- EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER,
- EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
- EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER_SERIES,
- EXTRACTOR_METATYPE_PUBLICATION_TYPE,
- EXTRACTOR_METATYPE_PUBLICATION_YEAR,
- EXTRACTOR_METATYPE_PUBLICATION_MONTH,
- EXTRACTOR_METATYPE_PUBLICATION_DAY,
- EXTRACTOR_METATYPE_PUBLICATION_DATE,
- EXTRACTOR_METATYPE_BIBTEX_EPRINT,
- EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
- EXTRACTOR_METATYPE_LANGUAGE,
- EXTRACTOR_METATYPE_CREATION_TIME,
- EXTRACTOR_METATYPE_URL,
-*/
- EXTRACTOR_METATYPE_URI,
- EXTRACTOR_METATYPE_ISRC,
- EXTRACTOR_METATYPE_HASH_MD4,
- EXTRACTOR_METATYPE_HASH_MD5,
- EXTRACTOR_METATYPE_HASH_SHA0,
- EXTRACTOR_METATYPE_HASH_SHA1,
- EXTRACTOR_METATYPE_HASH_RMD160,
-/*
- EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LATITUDE,
- EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LONGITUDE,
- EXTRACTOR_METATYPE_LOCATION_CITY,
- EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
-*/
- EXTRACTOR_METATYPE_UNKNOWN,
- EXTRACTOR_METATYPE_DESCRIPTION,
- EXTRACTOR_METATYPE_COPYRIGHT,
- EXTRACTOR_METATYPE_RIGHTS,
- EXTRACTOR_METATYPE_KEYWORDS,
- EXTRACTOR_METATYPE_ABSTRACT,
- EXTRACTOR_METATYPE_SUMMARY,
- EXTRACTOR_METATYPE_SUBJECT,
- EXTRACTOR_METATYPE_CREATOR,
- EXTRACTOR_METATYPE_FORMAT,
- EXTRACTOR_METATYPE_FORMAT_VERSION,
-
- EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_UNKNOWN_DATE,
- EXTRACTOR_METATYPE_CREATION_DATE,
- EXTRACTOR_METATYPE_MODIFICATION_DATE,
- EXTRACTOR_METATYPE_LAST_PRINTED,
- EXTRACTOR_METATYPE_LAST_SAVED_BY,
- EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
- EXTRACTOR_METATYPE_EDITING_CYCLES,
- EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_REVISION_HISTORY,
-
- EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
- EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
- EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
-/*
- EXTRACTOR_METATYPE_PACKAGE_NAME,
- EXTRACTOR_METATYPE_PACKAGE_VERSION,
- EXTRACTOR_METATYPE_SECTION,
- EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
- EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
- EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
- EXTRACTOR_METATYPE_PACKAGE_REPLACES,
- EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
- EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
- EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
- EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
- EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
- EXTRACTOR_METATYPE_PACKAGE_SOURCE,
- EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
- EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
- EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
- EXTRACTOR_METATYPE_LICENSE,
- EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
- EXTRACTOR_METATYPE_BUILDHOST,
- EXTRACTOR_METATYPE_VENDOR,
- EXTRACTOR_METATYPE_TARGET_OS,
- EXTRACTOR_METATYPE_SOFTWARE_VERSION,
- EXTRACTOR_METATYPE_TARGET_PLATFORM,
- EXTRACTOR_METATYPE_RESOURCE_TYPE,
- EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
- EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
-*/
- EXTRACTOR_METATYPE_CAMERA_MAKE,
- EXTRACTOR_METATYPE_CAMERA_MODEL,
- EXTRACTOR_METATYPE_EXPOSURE,
- EXTRACTOR_METATYPE_APERTURE,
- EXTRACTOR_METATYPE_EXPOSURE_BIAS,
- EXTRACTOR_METATYPE_FLASH,
- EXTRACTOR_METATYPE_FLASH_BIAS,
- EXTRACTOR_METATYPE_FOCAL_LENGTH,
- EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
- EXTRACTOR_METATYPE_ISO_SPEED,
- EXTRACTOR_METATYPE_EXPOSURE_MODE,
- EXTRACTOR_METATYPE_METERING_MODE,
- EXTRACTOR_METATYPE_MACRO_MODE,
- EXTRACTOR_METATYPE_IMAGE_QUALITY,
- EXTRACTOR_METATYPE_WHITE_BALANCE,
- EXTRACTOR_METATYPE_ORIENTATION,
- EXTRACTOR_METATYPE_MAGNIFICATION,
-
- EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
- EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_THUMBNAIL,
- EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
- EXTRACTOR_METATYPE_SOURCE,
-/*
- EXTRACTOR_METATYPE_CHARACTER_SET,
- EXTRACTOR_METATYPE_LINE_COUNT,
- EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
- EXTRACTOR_METATYPE_WORD_COUNT,
- EXTRACTOR_METATYPE_CHARACTER_COUNT,
- EXTRACTOR_METATYPE_PAGE_ORIENTATION,
- EXTRACTOR_METATYPE_PAPER_SIZE,
- EXTRACTOR_METATYPE_TEMPLATE,
- EXTRACTOR_METATYPE_COMPANY,
- EXTRACTOR_METATYPE_MANAGER,
- EXTRACTOR_METATYPE_REVISION_NUMBER,
-
- EXTRACTOR_METATYPE_DURATION,
- EXTRACTOR_METATYPE_ALBUM,
- EXTRACTOR_METATYPE_ARTIST,
- EXTRACTOR_METATYPE_GENRE,
- EXTRACTOR_METATYPE_TRACK_NUMBER,
- EXTRACTOR_METATYPE_DISC_NUMBER,
- EXTRACTOR_METATYPE_PERFORMER,
- EXTRACTOR_METATYPE_CONTACT_INFORMATION,
- EXTRACTOR_METATYPE_SONG_VERSION,
- EXTRACTOR_METATYPE_PICTURE,
- EXTRACTOR_METATYPE_COVER_PICTURE,
- EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
- EXTRACTOR_METATYPE_EVENT_PICTURE,
- EXTRACTOR_METATYPE_LOGO,
- EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
- EXTRACTOR_METATYPE_SOURCE_DEVICE,
- EXTRACTOR_METATYPE_DISCLAIMER,
- EXTRACTOR_METATYPE_WARNING,
- EXTRACTOR_METATYPE_PAGE_ORDER,
- EXTRACTOR_METATYPE_WRITER,
- EXTRACTOR_METATYPE_PRODUCT_VERSION,
- EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
- EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
- EXTRACTOR_METATYPE_NETWORK_NAME,
- EXTRACTOR_METATYPE_SHOW_NAME,
- EXTRACTOR_METATYPE_CHAPTER_NAME,
- EXTRACTOR_METATYPE_SONG_COUNT,
- EXTRACTOR_METATYPE_STARTING_SONG,
- EXTRACTOR_METATYPE_PLAY_COUNTER,
- EXTRACTOR_METATYPE_CONDUCTOR,
- EXTRACTOR_METATYPE_INTERPRETATION,
- EXTRACTOR_METATYPE_COMPOSER,
- EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
- EXTRACTOR_METATYPE_ENCODED_BY,
- EXTRACTOR_METATYPE_ORIGINAL_TITLE,
- EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
- EXTRACTOR_METATYPE_ORIGINAL_WRITER,
- EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
- EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
- EXTRACTOR_METATYPE_LYRICS,
- EXTRACTOR_METATYPE_POPULARITY_METER,
- EXTRACTOR_METATYPE_LICENSEE,
- EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
- EXTRACTOR_METATYPE_MOOD,
- EXTRACTOR_METATYPE_SUBTITLE,
-*/
- EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
- EXTRACTOR_METATYPE_GNUNET_FULL_DATA,
- EXTRACTOR_METATYPE_RATING,
- EXTRACTOR_METATYPE_ORGANIZATION,
- EXTRACTOR_METATYPE_RIPPER,
- EXTRACTOR_METATYPE_PRODUCER,
- EXTRACTOR_METATYPE_GROUP,
- EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-
- EXTRACTOR_METATYPE_RESERVED
-};
-gint types_namespace[3 /*+ 26 + 7 + 8*/ + 11 /*+ 10 + 3 + 26 + 17 + 5 + 11 +
45*/ + 8 + 1] =
-{ /* Namespace */
- EXTRACTOR_METATYPE_MIMETYPE,
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METATYPE_COMMENT,
-/*
- EXTRACTOR_METATYPE_TITLE,
- EXTRACTOR_METATYPE_BOOK_TITLE,
- EXTRACTOR_METATYPE_BOOK_EDITION,
- EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
- EXTRACTOR_METATYPE_JOURNAL_NAME,
- EXTRACTOR_METATYPE_JOURNAL_VOLUME,
- EXTRACTOR_METATYPE_JOURNAL_NUMBER,
- EXTRACTOR_METATYPE_PAGE_COUNT,
- EXTRACTOR_METATYPE_PAGE_RANGE,
- EXTRACTOR_METATYPE_AUTHOR_NAME,
- EXTRACTOR_METATYPE_AUTHOR_EMAIL,
- EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER,
- EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
- EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
- EXTRACTOR_METATYPE_PUBLISHER_SERIES,
- EXTRACTOR_METATYPE_PUBLICATION_TYPE,
- EXTRACTOR_METATYPE_PUBLICATION_YEAR,
- EXTRACTOR_METATYPE_PUBLICATION_MONTH,
- EXTRACTOR_METATYPE_PUBLICATION_DAY,
- EXTRACTOR_METATYPE_PUBLICATION_DATE,
- EXTRACTOR_METATYPE_BIBTEX_EPRINT,
- EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
- EXTRACTOR_METATYPE_LANGUAGE,
- EXTRACTOR_METATYPE_CREATION_TIME,
- EXTRACTOR_METATYPE_URL,
-
- EXTRACTOR_METATYPE_URI,
- EXTRACTOR_METATYPE_ISRC,
- EXTRACTOR_METATYPE_HASH_MD4,
- EXTRACTOR_METATYPE_HASH_MD5,
- EXTRACTOR_METATYPE_HASH_SHA0,
- EXTRACTOR_METATYPE_HASH_SHA1,
- EXTRACTOR_METATYPE_HASH_RMD160,
-
- EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LATITUDE,
- EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
- EXTRACTOR_METATYPE_GPS_LONGITUDE,
- EXTRACTOR_METATYPE_LOCATION_CITY,
- EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY,
- EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
-*/
- EXTRACTOR_METATYPE_UNKNOWN,
- EXTRACTOR_METATYPE_DESCRIPTION,
- EXTRACTOR_METATYPE_COPYRIGHT,
- EXTRACTOR_METATYPE_RIGHTS,
- EXTRACTOR_METATYPE_KEYWORDS,
- EXTRACTOR_METATYPE_ABSTRACT,
- EXTRACTOR_METATYPE_SUMMARY,
- EXTRACTOR_METATYPE_SUBJECT,
- EXTRACTOR_METATYPE_CREATOR,
- EXTRACTOR_METATYPE_FORMAT,
- EXTRACTOR_METATYPE_FORMAT_VERSION,
-/*
- EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_UNKNOWN_DATE,
- EXTRACTOR_METATYPE_CREATION_DATE,
- EXTRACTOR_METATYPE_MODIFICATION_DATE,
- EXTRACTOR_METATYPE_LAST_PRINTED,
- EXTRACTOR_METATYPE_LAST_SAVED_BY,
- EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
- EXTRACTOR_METATYPE_EDITING_CYCLES,
- EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_REVISION_HISTORY,
-
- EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
- EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
- EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
-
- EXTRACTOR_METATYPE_PACKAGE_NAME,
- EXTRACTOR_METATYPE_PACKAGE_VERSION,
- EXTRACTOR_METATYPE_SECTION,
- EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
- EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
- EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
- EXTRACTOR_METATYPE_PACKAGE_REPLACES,
- EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
- EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
- EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
- EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
- EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
- EXTRACTOR_METATYPE_PACKAGE_SOURCE,
- EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
- EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
- EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
- EXTRACTOR_METATYPE_LICENSE,
- EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
- EXTRACTOR_METATYPE_BUILDHOST,
- EXTRACTOR_METATYPE_VENDOR,
- EXTRACTOR_METATYPE_TARGET_OS,
- EXTRACTOR_METATYPE_SOFTWARE_VERSION,
- EXTRACTOR_METATYPE_TARGET_PLATFORM,
- EXTRACTOR_METATYPE_RESOURCE_TYPE,
- EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
- EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
-
- EXTRACTOR_METATYPE_CAMERA_MAKE,
- EXTRACTOR_METATYPE_CAMERA_MODEL,
- EXTRACTOR_METATYPE_EXPOSURE,
- EXTRACTOR_METATYPE_APERTURE,
- EXTRACTOR_METATYPE_EXPOSURE_BIAS,
- EXTRACTOR_METATYPE_FLASH,
- EXTRACTOR_METATYPE_FLASH_BIAS,
- EXTRACTOR_METATYPE_FOCAL_LENGTH,
- EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
- EXTRACTOR_METATYPE_ISO_SPEED,
- EXTRACTOR_METATYPE_EXPOSURE_MODE,
- EXTRACTOR_METATYPE_METERING_MODE,
- EXTRACTOR_METATYPE_MACRO_MODE,
- EXTRACTOR_METATYPE_IMAGE_QUALITY,
- EXTRACTOR_METATYPE_WHITE_BALANCE,
- EXTRACTOR_METATYPE_ORIENTATION,
- EXTRACTOR_METATYPE_MAGNIFICATION,
-
- EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
- EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
- EXTRACTOR_METATYPE_THUMBNAIL,
- EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
- EXTRACTOR_METATYPE_SOURCE,
-
- EXTRACTOR_METATYPE_CHARACTER_SET,
- EXTRACTOR_METATYPE_LINE_COUNT,
- EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
- EXTRACTOR_METATYPE_WORD_COUNT,
- EXTRACTOR_METATYPE_CHARACTER_COUNT,
- EXTRACTOR_METATYPE_PAGE_ORIENTATION,
- EXTRACTOR_METATYPE_PAPER_SIZE,
- EXTRACTOR_METATYPE_TEMPLATE,
- EXTRACTOR_METATYPE_COMPANY,
- EXTRACTOR_METATYPE_MANAGER,
- EXTRACTOR_METATYPE_REVISION_NUMBER,
-
- EXTRACTOR_METATYPE_DURATION,
- EXTRACTOR_METATYPE_ALBUM,
- EXTRACTOR_METATYPE_ARTIST,
- EXTRACTOR_METATYPE_GENRE,
- EXTRACTOR_METATYPE_TRACK_NUMBER,
- EXTRACTOR_METATYPE_DISC_NUMBER,
- EXTRACTOR_METATYPE_PERFORMER,
- EXTRACTOR_METATYPE_CONTACT_INFORMATION,
- EXTRACTOR_METATYPE_SONG_VERSION,
- EXTRACTOR_METATYPE_PICTURE,
- EXTRACTOR_METATYPE_COVER_PICTURE,
- EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
- EXTRACTOR_METATYPE_EVENT_PICTURE,
- EXTRACTOR_METATYPE_LOGO,
- EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
- EXTRACTOR_METATYPE_SOURCE_DEVICE,
- EXTRACTOR_METATYPE_DISCLAIMER,
- EXTRACTOR_METATYPE_WARNING,
- EXTRACTOR_METATYPE_PAGE_ORDER,
- EXTRACTOR_METATYPE_WRITER,
- EXTRACTOR_METATYPE_PRODUCT_VERSION,
- EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
- EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
- EXTRACTOR_METATYPE_NETWORK_NAME,
- EXTRACTOR_METATYPE_SHOW_NAME,
- EXTRACTOR_METATYPE_CHAPTER_NAME,
- EXTRACTOR_METATYPE_SONG_COUNT,
- EXTRACTOR_METATYPE_STARTING_SONG,
- EXTRACTOR_METATYPE_PLAY_COUNTER,
- EXTRACTOR_METATYPE_CONDUCTOR,
- EXTRACTOR_METATYPE_INTERPRETATION,
- EXTRACTOR_METATYPE_COMPOSER,
- EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
- EXTRACTOR_METATYPE_ENCODED_BY,
- EXTRACTOR_METATYPE_ORIGINAL_TITLE,
- EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
- EXTRACTOR_METATYPE_ORIGINAL_WRITER,
- EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
- EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
- EXTRACTOR_METATYPE_LYRICS,
- EXTRACTOR_METATYPE_POPULARITY_METER,
- EXTRACTOR_METATYPE_LICENSEE,
- EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
- EXTRACTOR_METATYPE_MOOD,
- EXTRACTOR_METATYPE_SUBTITLE,
-*/
- EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
- EXTRACTOR_METATYPE_GNUNET_FULL_DATA,
- EXTRACTOR_METATYPE_RATING,
- EXTRACTOR_METATYPE_ORGANIZATION,
- EXTRACTOR_METATYPE_RIPPER,
- EXTRACTOR_METATYPE_PRODUCER,
- EXTRACTOR_METATYPE_GROUP,
- EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-
- EXTRACTOR_METATYPE_RESERVED
-};
-
-gint *types[7] = {types_generic, types_text, types_music, types_video,
- types_image, types_namespace, NULL};
-
+ gint types_generic[3 + 26 + 7 + 8 + 11 + 10 + 3 + 26 + 17 + 5 + 11 + 45 + 8 +
+ 1] =
+{ /* Generic */
+EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METATYPE_COMMENT, EXTRACTOR_METATYPE_TITLE,
+ EXTRACTOR_METATYPE_BOOK_TITLE, EXTRACTOR_METATYPE_BOOK_EDITION,
+ EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
+ EXTRACTOR_METATYPE_JOURNAL_NAME, EXTRACTOR_METATYPE_JOURNAL_VOLUME,
+ EXTRACTOR_METATYPE_JOURNAL_NUMBER, EXTRACTOR_METATYPE_PAGE_COUNT,
+ EXTRACTOR_METATYPE_PAGE_RANGE, EXTRACTOR_METATYPE_AUTHOR_NAME,
+ EXTRACTOR_METATYPE_AUTHOR_EMAIL,
+ EXTRACTOR_METATYPE_AUTHOR_INSTITUTION, EXTRACTOR_METATYPE_PUBLISHER,
+ EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
+ EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER_SERIES,
+ EXTRACTOR_METATYPE_PUBLICATION_TYPE,
+ EXTRACTOR_METATYPE_PUBLICATION_YEAR,
+ EXTRACTOR_METATYPE_PUBLICATION_MONTH,
+ EXTRACTOR_METATYPE_PUBLICATION_DAY,
+ EXTRACTOR_METATYPE_PUBLICATION_DATE, EXTRACTOR_METATYPE_BIBTEX_EPRINT,
+ EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE, EXTRACTOR_METATYPE_LANGUAGE,
+ EXTRACTOR_METATYPE_CREATION_TIME, EXTRACTOR_METATYPE_URL,
+ EXTRACTOR_METATYPE_URI, EXTRACTOR_METATYPE_ISRC,
+ EXTRACTOR_METATYPE_HASH_MD4, EXTRACTOR_METATYPE_HASH_MD5,
+ EXTRACTOR_METATYPE_HASH_SHA0, EXTRACTOR_METATYPE_HASH_SHA1,
+ EXTRACTOR_METATYPE_HASH_RMD160, EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LATITUDE, EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE, EXTRACTOR_METATYPE_LOCATION_CITY,
+ EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
+ EXTRACTOR_METATYPE_UNKNOWN, EXTRACTOR_METATYPE_DESCRIPTION,
+ EXTRACTOR_METATYPE_COPYRIGHT, EXTRACTOR_METATYPE_RIGHTS,
+ EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METATYPE_ABSTRACT,
+ EXTRACTOR_METATYPE_SUMMARY, EXTRACTOR_METATYPE_SUBJECT,
+ EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METATYPE_FORMAT,
+ EXTRACTOR_METATYPE_FORMAT_VERSION,
+ EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_UNKNOWN_DATE, EXTRACTOR_METATYPE_CREATION_DATE,
+ EXTRACTOR_METATYPE_MODIFICATION_DATE, EXTRACTOR_METATYPE_LAST_PRINTED,
+ EXTRACTOR_METATYPE_LAST_SAVED_BY,
+ EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
+ EXTRACTOR_METATYPE_EDITING_CYCLES,
+ EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_REVISION_HISTORY,
+ EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
+ EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
+ EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
+ EXTRACTOR_METATYPE_PACKAGE_NAME, EXTRACTOR_METATYPE_PACKAGE_VERSION,
+ EXTRACTOR_METATYPE_SECTION, EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
+ EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
+ EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
+ EXTRACTOR_METATYPE_PACKAGE_REPLACES,
+ EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
+ EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
+ EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
+ EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
+ EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
+ EXTRACTOR_METATYPE_PACKAGE_SOURCE,
+ EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
+ EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
+ EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY, EXTRACTOR_METATYPE_LICENSE,
+ EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION, EXTRACTOR_METATYPE_BUILDHOST,
+ EXTRACTOR_METATYPE_VENDOR, EXTRACTOR_METATYPE_TARGET_OS,
+ EXTRACTOR_METATYPE_SOFTWARE_VERSION,
+ EXTRACTOR_METATYPE_TARGET_PLATFORM, EXTRACTOR_METATYPE_RESOURCE_TYPE,
+ EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
+ EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
+ EXTRACTOR_METATYPE_CAMERA_MAKE, EXTRACTOR_METATYPE_CAMERA_MODEL,
+ EXTRACTOR_METATYPE_EXPOSURE, EXTRACTOR_METATYPE_APERTURE,
+ EXTRACTOR_METATYPE_EXPOSURE_BIAS, EXTRACTOR_METATYPE_FLASH,
+ EXTRACTOR_METATYPE_FLASH_BIAS, EXTRACTOR_METATYPE_FOCAL_LENGTH,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM, EXTRACTOR_METATYPE_ISO_SPEED,
+ EXTRACTOR_METATYPE_EXPOSURE_MODE, EXTRACTOR_METATYPE_METERING_MODE,
+ EXTRACTOR_METATYPE_MACRO_MODE, EXTRACTOR_METATYPE_IMAGE_QUALITY,
+ EXTRACTOR_METATYPE_WHITE_BALANCE, EXTRACTOR_METATYPE_ORIENTATION,
+ EXTRACTOR_METATYPE_MAGNIFICATION,
+ EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
+ EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE, EXTRACTOR_METATYPE_THUMBNAIL,
+ EXTRACTOR_METATYPE_IMAGE_RESOLUTION, EXTRACTOR_METATYPE_SOURCE,
+ EXTRACTOR_METATYPE_CHARACTER_SET, EXTRACTOR_METATYPE_LINE_COUNT,
+ EXTRACTOR_METATYPE_PARAGRAPH_COUNT, EXTRACTOR_METATYPE_WORD_COUNT,
+ EXTRACTOR_METATYPE_CHARACTER_COUNT,
+ EXTRACTOR_METATYPE_PAGE_ORIENTATION, EXTRACTOR_METATYPE_PAPER_SIZE,
+ EXTRACTOR_METATYPE_TEMPLATE, EXTRACTOR_METATYPE_COMPANY,
+ EXTRACTOR_METATYPE_MANAGER, EXTRACTOR_METATYPE_REVISION_NUMBER,
+ EXTRACTOR_METATYPE_DURATION, EXTRACTOR_METATYPE_ALBUM,
+ EXTRACTOR_METATYPE_ARTIST, EXTRACTOR_METATYPE_GENRE,
+ EXTRACTOR_METATYPE_TRACK_NUMBER, EXTRACTOR_METATYPE_DISC_NUMBER,
+ EXTRACTOR_METATYPE_PERFORMER, EXTRACTOR_METATYPE_CONTACT_INFORMATION,
+ EXTRACTOR_METATYPE_SONG_VERSION, EXTRACTOR_METATYPE_PICTURE,
+ EXTRACTOR_METATYPE_COVER_PICTURE,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
+ EXTRACTOR_METATYPE_EVENT_PICTURE, EXTRACTOR_METATYPE_LOGO,
+ EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
+ EXTRACTOR_METATYPE_SOURCE_DEVICE, EXTRACTOR_METATYPE_DISCLAIMER,
+ EXTRACTOR_METATYPE_WARNING, EXTRACTOR_METATYPE_PAGE_ORDER,
+ EXTRACTOR_METATYPE_WRITER, EXTRACTOR_METATYPE_PRODUCT_VERSION,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
+ EXTRACTOR_METATYPE_MOVIE_DIRECTOR, EXTRACTOR_METATYPE_NETWORK_NAME,
+ EXTRACTOR_METATYPE_SHOW_NAME, EXTRACTOR_METATYPE_CHAPTER_NAME,
+ EXTRACTOR_METATYPE_SONG_COUNT, EXTRACTOR_METATYPE_STARTING_SONG,
+ EXTRACTOR_METATYPE_PLAY_COUNTER, EXTRACTOR_METATYPE_CONDUCTOR,
+ EXTRACTOR_METATYPE_INTERPRETATION, EXTRACTOR_METATYPE_COMPOSER,
+ EXTRACTOR_METATYPE_BEATS_PER_MINUTE, EXTRACTOR_METATYPE_ENCODED_BY,
+ EXTRACTOR_METATYPE_ORIGINAL_TITLE, EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
+ EXTRACTOR_METATYPE_ORIGINAL_WRITER,
+ EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
+ EXTRACTOR_METATYPE_ORIGINAL_PERFORMER, EXTRACTOR_METATYPE_LYRICS,
+ EXTRACTOR_METATYPE_POPULARITY_METER, EXTRACTOR_METATYPE_LICENSEE,
+ EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST, EXTRACTOR_METATYPE_MOOD,
+ EXTRACTOR_METATYPE_SUBTITLE, EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
+ EXTRACTOR_METATYPE_GNUNET_FULL_DATA, EXTRACTOR_METATYPE_RATING,
+ EXTRACTOR_METATYPE_ORGANIZATION, EXTRACTOR_METATYPE_RIPPER,
+ EXTRACTOR_METATYPE_PRODUCER, EXTRACTOR_METATYPE_GROUP,
+ EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+ EXTRACTOR_METATYPE_RESERVED };
+gint types_text[3 + 26 + 7 /*+ 8 */ + 11 + 10 + 3 /*+ 26 + 17 + 5 */ +
+ 11 /*+ 45 */ + 8 + 1] =
+{ /* Text */
+ EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METATYPE_COMMENT, EXTRACTOR_METATYPE_TITLE,
+ EXTRACTOR_METATYPE_BOOK_TITLE, EXTRACTOR_METATYPE_BOOK_EDITION,
+ EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER, EXTRACTOR_METATYPE_JOURNAL_NAME,
+ EXTRACTOR_METATYPE_JOURNAL_VOLUME, EXTRACTOR_METATYPE_JOURNAL_NUMBER,
+ EXTRACTOR_METATYPE_PAGE_COUNT, EXTRACTOR_METATYPE_PAGE_RANGE,
+ EXTRACTOR_METATYPE_AUTHOR_NAME, EXTRACTOR_METATYPE_AUTHOR_EMAIL,
+ EXTRACTOR_METATYPE_AUTHOR_INSTITUTION, EXTRACTOR_METATYPE_PUBLISHER,
+ EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
+ EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER_SERIES,
+ EXTRACTOR_METATYPE_PUBLICATION_TYPE,
+ EXTRACTOR_METATYPE_PUBLICATION_YEAR,
+ EXTRACTOR_METATYPE_PUBLICATION_MONTH,
+ EXTRACTOR_METATYPE_PUBLICATION_DAY, EXTRACTOR_METATYPE_PUBLICATION_DATE,
+ EXTRACTOR_METATYPE_BIBTEX_EPRINT, EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
+ EXTRACTOR_METATYPE_LANGUAGE, EXTRACTOR_METATYPE_CREATION_TIME,
+ EXTRACTOR_METATYPE_URL, EXTRACTOR_METATYPE_URI,
+ EXTRACTOR_METATYPE_ISRC, EXTRACTOR_METATYPE_HASH_MD4,
+ EXTRACTOR_METATYPE_HASH_MD5, EXTRACTOR_METATYPE_HASH_SHA0,
+ EXTRACTOR_METATYPE_HASH_SHA1, EXTRACTOR_METATYPE_HASH_RMD160,
+/*
+ EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LATITUDE,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE,
+ EXTRACTOR_METATYPE_LOCATION_CITY,
+ EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
+*/
+ EXTRACTOR_METATYPE_UNKNOWN, EXTRACTOR_METATYPE_DESCRIPTION,
+ EXTRACTOR_METATYPE_COPYRIGHT, EXTRACTOR_METATYPE_RIGHTS,
+ EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METATYPE_ABSTRACT,
+ EXTRACTOR_METATYPE_SUMMARY, EXTRACTOR_METATYPE_SUBJECT,
+ EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METATYPE_FORMAT,
+ EXTRACTOR_METATYPE_FORMAT_VERSION,
+ EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_UNKNOWN_DATE, EXTRACTOR_METATYPE_CREATION_DATE,
+ EXTRACTOR_METATYPE_MODIFICATION_DATE, EXTRACTOR_METATYPE_LAST_PRINTED,
+ EXTRACTOR_METATYPE_LAST_SAVED_BY, EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
+ EXTRACTOR_METATYPE_EDITING_CYCLES,
+ EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_REVISION_HISTORY,
+ EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
+ EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
+ EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
+/*
+ EXTRACTOR_METATYPE_PACKAGE_NAME,
+ EXTRACTOR_METATYPE_PACKAGE_VERSION,
+ EXTRACTOR_METATYPE_SECTION,
+ EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
+ EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
+ EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
+ EXTRACTOR_METATYPE_PACKAGE_REPLACES,
+ EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
+ EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
+ EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
+ EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
+ EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
+ EXTRACTOR_METATYPE_PACKAGE_SOURCE,
+ EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
+ EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
+ EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
+ EXTRACTOR_METATYPE_LICENSE,
+ EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
+ EXTRACTOR_METATYPE_BUILDHOST,
+ EXTRACTOR_METATYPE_VENDOR,
+ EXTRACTOR_METATYPE_TARGET_OS,
+ EXTRACTOR_METATYPE_SOFTWARE_VERSION,
+ EXTRACTOR_METATYPE_TARGET_PLATFORM,
+ EXTRACTOR_METATYPE_RESOURCE_TYPE,
+ EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
+ EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
+
+ EXTRACTOR_METATYPE_CAMERA_MAKE,
+ EXTRACTOR_METATYPE_CAMERA_MODEL,
+ EXTRACTOR_METATYPE_EXPOSURE,
+ EXTRACTOR_METATYPE_APERTURE,
+ EXTRACTOR_METATYPE_EXPOSURE_BIAS,
+ EXTRACTOR_METATYPE_FLASH,
+ EXTRACTOR_METATYPE_FLASH_BIAS,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
+ EXTRACTOR_METATYPE_ISO_SPEED,
+ EXTRACTOR_METATYPE_EXPOSURE_MODE,
+ EXTRACTOR_METATYPE_METERING_MODE,
+ EXTRACTOR_METATYPE_MACRO_MODE,
+ EXTRACTOR_METATYPE_IMAGE_QUALITY,
+ EXTRACTOR_METATYPE_WHITE_BALANCE,
+ EXTRACTOR_METATYPE_ORIENTATION,
+ EXTRACTOR_METATYPE_MAGNIFICATION,
+
+ EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
+ EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_THUMBNAIL,
+ EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
+ EXTRACTOR_METATYPE_SOURCE,
+*/
+ EXTRACTOR_METATYPE_CHARACTER_SET, EXTRACTOR_METATYPE_LINE_COUNT,
+ EXTRACTOR_METATYPE_PARAGRAPH_COUNT, EXTRACTOR_METATYPE_WORD_COUNT,
+ EXTRACTOR_METATYPE_CHARACTER_COUNT, EXTRACTOR_METATYPE_PAGE_ORIENTATION,
+ EXTRACTOR_METATYPE_PAPER_SIZE, EXTRACTOR_METATYPE_TEMPLATE,
+ EXTRACTOR_METATYPE_COMPANY, EXTRACTOR_METATYPE_MANAGER,
+ EXTRACTOR_METATYPE_REVISION_NUMBER,
+/*
+ EXTRACTOR_METATYPE_DURATION,
+ EXTRACTOR_METATYPE_ALBUM,
+ EXTRACTOR_METATYPE_ARTIST,
+ EXTRACTOR_METATYPE_GENRE,
+ EXTRACTOR_METATYPE_TRACK_NUMBER,
+ EXTRACTOR_METATYPE_DISC_NUMBER,
+ EXTRACTOR_METATYPE_PERFORMER,
+ EXTRACTOR_METATYPE_CONTACT_INFORMATION,
+ EXTRACTOR_METATYPE_SONG_VERSION,
+ EXTRACTOR_METATYPE_PICTURE,
+ EXTRACTOR_METATYPE_COVER_PICTURE,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
+ EXTRACTOR_METATYPE_EVENT_PICTURE,
+ EXTRACTOR_METATYPE_LOGO,
+ EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
+ EXTRACTOR_METATYPE_SOURCE_DEVICE,
+ EXTRACTOR_METATYPE_DISCLAIMER,
+ EXTRACTOR_METATYPE_WARNING,
+ EXTRACTOR_METATYPE_PAGE_ORDER,
+ EXTRACTOR_METATYPE_WRITER,
+ EXTRACTOR_METATYPE_PRODUCT_VERSION,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
+ EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
+ EXTRACTOR_METATYPE_NETWORK_NAME,
+ EXTRACTOR_METATYPE_SHOW_NAME,
+ EXTRACTOR_METATYPE_CHAPTER_NAME,
+ EXTRACTOR_METATYPE_SONG_COUNT,
+ EXTRACTOR_METATYPE_STARTING_SONG,
+ EXTRACTOR_METATYPE_PLAY_COUNTER,
+ EXTRACTOR_METATYPE_CONDUCTOR,
+ EXTRACTOR_METATYPE_INTERPRETATION,
+ EXTRACTOR_METATYPE_COMPOSER,
+ EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
+ EXTRACTOR_METATYPE_ENCODED_BY,
+ EXTRACTOR_METATYPE_ORIGINAL_TITLE,
+ EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
+ EXTRACTOR_METATYPE_ORIGINAL_WRITER,
+ EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
+ EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
+ EXTRACTOR_METATYPE_LYRICS,
+ EXTRACTOR_METATYPE_POPULARITY_METER,
+ EXTRACTOR_METATYPE_LICENSEE,
+ EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
+ EXTRACTOR_METATYPE_MOOD,
+ EXTRACTOR_METATYPE_SUBTITLE,
+*/
+EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
+ EXTRACTOR_METATYPE_GNUNET_FULL_DATA, EXTRACTOR_METATYPE_RATING,
+ EXTRACTOR_METATYPE_ORGANIZATION, EXTRACTOR_METATYPE_RIPPER,
+ EXTRACTOR_METATYPE_PRODUCER, EXTRACTOR_METATYPE_GROUP,
+ EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+ EXTRACTOR_METATYPE_RESERVED };
+gint types_music[3 /*+ 26 */ + 7 /*+ 8 */ + 11 + /*10 */ 9 +
+ 3 /*+ 26 + 17 + 5 + 11 */ + 45 + 8 + 1] =
+{ /* Music */
+ EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METATYPE_COMMENT,
+/*
+ EXTRACTOR_METATYPE_TITLE,
+ EXTRACTOR_METATYPE_BOOK_TITLE,
+ EXTRACTOR_METATYPE_BOOK_EDITION,
+ EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
+ EXTRACTOR_METATYPE_JOURNAL_NAME,
+ EXTRACTOR_METATYPE_JOURNAL_VOLUME,
+ EXTRACTOR_METATYPE_JOURNAL_NUMBER,
+ EXTRACTOR_METATYPE_PAGE_COUNT,
+ EXTRACTOR_METATYPE_PAGE_RANGE,
+ EXTRACTOR_METATYPE_AUTHOR_NAME,
+ EXTRACTOR_METATYPE_AUTHOR_EMAIL,
+ EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER,
+ EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
+ EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER_SERIES,
+ EXTRACTOR_METATYPE_PUBLICATION_TYPE,
+ EXTRACTOR_METATYPE_PUBLICATION_YEAR,
+ EXTRACTOR_METATYPE_PUBLICATION_MONTH,
+ EXTRACTOR_METATYPE_PUBLICATION_DAY,
+ EXTRACTOR_METATYPE_PUBLICATION_DATE,
+ EXTRACTOR_METATYPE_BIBTEX_EPRINT,
+ EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
+ EXTRACTOR_METATYPE_LANGUAGE,
+ EXTRACTOR_METATYPE_CREATION_TIME,
+ EXTRACTOR_METATYPE_URL,
+*/
+ EXTRACTOR_METATYPE_URI, EXTRACTOR_METATYPE_ISRC,
+ EXTRACTOR_METATYPE_HASH_MD4, EXTRACTOR_METATYPE_HASH_MD5,
+ EXTRACTOR_METATYPE_HASH_SHA0, EXTRACTOR_METATYPE_HASH_SHA1,
+ EXTRACTOR_METATYPE_HASH_RMD160,
+/*
+ EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LATITUDE,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE,
+ EXTRACTOR_METATYPE_LOCATION_CITY,
+ EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
+*/
+ EXTRACTOR_METATYPE_UNKNOWN, EXTRACTOR_METATYPE_DESCRIPTION,
+ EXTRACTOR_METATYPE_COPYRIGHT, EXTRACTOR_METATYPE_RIGHTS,
+ EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METATYPE_ABSTRACT,
+ EXTRACTOR_METATYPE_SUMMARY, EXTRACTOR_METATYPE_SUBJECT,
+ EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METATYPE_FORMAT,
+ EXTRACTOR_METATYPE_FORMAT_VERSION,
+ EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_UNKNOWN_DATE, EXTRACTOR_METATYPE_CREATION_DATE,
+ EXTRACTOR_METATYPE_MODIFICATION_DATE,
+/* EXTRACTOR_METATYPE_LAST_PRINTED,*/
+ EXTRACTOR_METATYPE_LAST_SAVED_BY, EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
+ EXTRACTOR_METATYPE_EDITING_CYCLES,
+ EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_REVISION_HISTORY,
+ EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
+ EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
+ EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
+/*
+ EXTRACTOR_METATYPE_PACKAGE_NAME,
+ EXTRACTOR_METATYPE_PACKAGE_VERSION,
+ EXTRACTOR_METATYPE_SECTION,
+ EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
+ EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
+ EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
+ EXTRACTOR_METATYPE_PACKAGE_REPLACES,
+ EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
+ EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
+ EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
+ EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
+ EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
+ EXTRACTOR_METATYPE_PACKAGE_SOURCE,
+ EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
+ EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
+ EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
+ EXTRACTOR_METATYPE_LICENSE,
+ EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
+ EXTRACTOR_METATYPE_BUILDHOST,
+ EXTRACTOR_METATYPE_VENDOR,
+ EXTRACTOR_METATYPE_TARGET_OS,
+ EXTRACTOR_METATYPE_SOFTWARE_VERSION,
+ EXTRACTOR_METATYPE_TARGET_PLATFORM,
+ EXTRACTOR_METATYPE_RESOURCE_TYPE,
+ EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
+ EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
+
+ EXTRACTOR_METATYPE_CAMERA_MAKE,
+ EXTRACTOR_METATYPE_CAMERA_MODEL,
+ EXTRACTOR_METATYPE_EXPOSURE,
+ EXTRACTOR_METATYPE_APERTURE,
+ EXTRACTOR_METATYPE_EXPOSURE_BIAS,
+ EXTRACTOR_METATYPE_FLASH,
+ EXTRACTOR_METATYPE_FLASH_BIAS,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
+ EXTRACTOR_METATYPE_ISO_SPEED,
+ EXTRACTOR_METATYPE_EXPOSURE_MODE,
+ EXTRACTOR_METATYPE_METERING_MODE,
+ EXTRACTOR_METATYPE_MACRO_MODE,
+ EXTRACTOR_METATYPE_IMAGE_QUALITY,
+ EXTRACTOR_METATYPE_WHITE_BALANCE,
+ EXTRACTOR_METATYPE_ORIENTATION,
+ EXTRACTOR_METATYPE_MAGNIFICATION,
+
+ EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
+ EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_THUMBNAIL,
+ EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
+ EXTRACTOR_METATYPE_SOURCE,
+
+ EXTRACTOR_METATYPE_CHARACTER_SET,
+ EXTRACTOR_METATYPE_LINE_COUNT,
+ EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
+ EXTRACTOR_METATYPE_WORD_COUNT,
+ EXTRACTOR_METATYPE_CHARACTER_COUNT,
+ EXTRACTOR_METATYPE_PAGE_ORIENTATION,
+ EXTRACTOR_METATYPE_PAPER_SIZE,
+ EXTRACTOR_METATYPE_TEMPLATE,
+ EXTRACTOR_METATYPE_COMPANY,
+ EXTRACTOR_METATYPE_MANAGER,
+ EXTRACTOR_METATYPE_REVISION_NUMBER,
+*/
+EXTRACTOR_METATYPE_DURATION, EXTRACTOR_METATYPE_ALBUM,
+ EXTRACTOR_METATYPE_ARTIST, EXTRACTOR_METATYPE_GENRE,
+ EXTRACTOR_METATYPE_TRACK_NUMBER, EXTRACTOR_METATYPE_DISC_NUMBER,
+ EXTRACTOR_METATYPE_PERFORMER,
+ EXTRACTOR_METATYPE_CONTACT_INFORMATION,
+ EXTRACTOR_METATYPE_SONG_VERSION, EXTRACTOR_METATYPE_PICTURE,
+ EXTRACTOR_METATYPE_COVER_PICTURE,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
+ EXTRACTOR_METATYPE_EVENT_PICTURE, EXTRACTOR_METATYPE_LOGO,
+ EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
+ EXTRACTOR_METATYPE_SOURCE_DEVICE, EXTRACTOR_METATYPE_DISCLAIMER,
+ EXTRACTOR_METATYPE_WARNING, EXTRACTOR_METATYPE_PAGE_ORDER,
+ EXTRACTOR_METATYPE_WRITER, EXTRACTOR_METATYPE_PRODUCT_VERSION,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
+ EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
+ EXTRACTOR_METATYPE_NETWORK_NAME, EXTRACTOR_METATYPE_SHOW_NAME,
+ EXTRACTOR_METATYPE_CHAPTER_NAME, EXTRACTOR_METATYPE_SONG_COUNT,
+ EXTRACTOR_METATYPE_STARTING_SONG, EXTRACTOR_METATYPE_PLAY_COUNTER,
+ EXTRACTOR_METATYPE_CONDUCTOR, EXTRACTOR_METATYPE_INTERPRETATION,
+ EXTRACTOR_METATYPE_COMPOSER, EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
+ EXTRACTOR_METATYPE_ENCODED_BY, EXTRACTOR_METATYPE_ORIGINAL_TITLE,
+ EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
+ EXTRACTOR_METATYPE_ORIGINAL_WRITER,
+ EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
+ EXTRACTOR_METATYPE_ORIGINAL_PERFORMER, EXTRACTOR_METATYPE_LYRICS,
+ EXTRACTOR_METATYPE_POPULARITY_METER, EXTRACTOR_METATYPE_LICENSEE,
+ EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST, EXTRACTOR_METATYPE_MOOD,
+ EXTRACTOR_METATYPE_SUBTITLE,
+ EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
+ EXTRACTOR_METATYPE_GNUNET_FULL_DATA, EXTRACTOR_METATYPE_RATING,
+ EXTRACTOR_METATYPE_ORGANIZATION, EXTRACTOR_METATYPE_RIPPER,
+ EXTRACTOR_METATYPE_PRODUCER, EXTRACTOR_METATYPE_GROUP,
+ EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+ EXTRACTOR_METATYPE_RESERVED };
+gint types_video[3 /*+ 26 */ + 7 /*+ 8 */ + 11 + /*10 */ 9 +
+ 3 /*+ 26 + 17 */ + 5 /*+ 11 */ + 45 + 8 + 1] =
+{ /* Video */
+ EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METATYPE_COMMENT,
+/*
+ EXTRACTOR_METATYPE_TITLE,
+ EXTRACTOR_METATYPE_BOOK_TITLE,
+ EXTRACTOR_METATYPE_BOOK_EDITION,
+ EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
+ EXTRACTOR_METATYPE_JOURNAL_NAME,
+ EXTRACTOR_METATYPE_JOURNAL_VOLUME,
+ EXTRACTOR_METATYPE_JOURNAL_NUMBER,
+ EXTRACTOR_METATYPE_PAGE_COUNT,
+ EXTRACTOR_METATYPE_PAGE_RANGE,
+ EXTRACTOR_METATYPE_AUTHOR_NAME,
+ EXTRACTOR_METATYPE_AUTHOR_EMAIL,
+ EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER,
+ EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
+ EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER_SERIES,
+ EXTRACTOR_METATYPE_PUBLICATION_TYPE,
+ EXTRACTOR_METATYPE_PUBLICATION_YEAR,
+ EXTRACTOR_METATYPE_PUBLICATION_MONTH,
+ EXTRACTOR_METATYPE_PUBLICATION_DAY,
+ EXTRACTOR_METATYPE_PUBLICATION_DATE,
+ EXTRACTOR_METATYPE_BIBTEX_EPRINT,
+ EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
+ EXTRACTOR_METATYPE_LANGUAGE,
+ EXTRACTOR_METATYPE_CREATION_TIME,
+ EXTRACTOR_METATYPE_URL,
+*/
+ EXTRACTOR_METATYPE_URI, EXTRACTOR_METATYPE_ISRC,
+ EXTRACTOR_METATYPE_HASH_MD4, EXTRACTOR_METATYPE_HASH_MD5,
+ EXTRACTOR_METATYPE_HASH_SHA0, EXTRACTOR_METATYPE_HASH_SHA1,
+ EXTRACTOR_METATYPE_HASH_RMD160,
+/*
+ EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LATITUDE,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE,
+ EXTRACTOR_METATYPE_LOCATION_CITY,
+ EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
+*/
+ EXTRACTOR_METATYPE_UNKNOWN, EXTRACTOR_METATYPE_DESCRIPTION,
+ EXTRACTOR_METATYPE_COPYRIGHT, EXTRACTOR_METATYPE_RIGHTS,
+ EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METATYPE_ABSTRACT,
+ EXTRACTOR_METATYPE_SUMMARY, EXTRACTOR_METATYPE_SUBJECT,
+ EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METATYPE_FORMAT,
+ EXTRACTOR_METATYPE_FORMAT_VERSION,
+ EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_UNKNOWN_DATE, EXTRACTOR_METATYPE_CREATION_DATE,
+ EXTRACTOR_METATYPE_MODIFICATION_DATE,
+/* EXTRACTOR_METATYPE_LAST_PRINTED,*/
+ EXTRACTOR_METATYPE_LAST_SAVED_BY, EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
+ EXTRACTOR_METATYPE_EDITING_CYCLES,
+ EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_REVISION_HISTORY,
+ EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
+ EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
+ EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
+/*
+ EXTRACTOR_METATYPE_PACKAGE_NAME,
+ EXTRACTOR_METATYPE_PACKAGE_VERSION,
+ EXTRACTOR_METATYPE_SECTION,
+ EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
+ EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
+ EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
+ EXTRACTOR_METATYPE_PACKAGE_REPLACES,
+ EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
+ EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
+ EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
+ EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
+ EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
+ EXTRACTOR_METATYPE_PACKAGE_SOURCE,
+ EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
+ EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
+ EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
+ EXTRACTOR_METATYPE_LICENSE,
+ EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
+ EXTRACTOR_METATYPE_BUILDHOST,
+ EXTRACTOR_METATYPE_VENDOR,
+ EXTRACTOR_METATYPE_TARGET_OS,
+ EXTRACTOR_METATYPE_SOFTWARE_VERSION,
+ EXTRACTOR_METATYPE_TARGET_PLATFORM,
+ EXTRACTOR_METATYPE_RESOURCE_TYPE,
+ EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
+ EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
+
+ EXTRACTOR_METATYPE_CAMERA_MAKE,
+ EXTRACTOR_METATYPE_CAMERA_MODEL,
+ EXTRACTOR_METATYPE_EXPOSURE,
+ EXTRACTOR_METATYPE_APERTURE,
+ EXTRACTOR_METATYPE_EXPOSURE_BIAS,
+ EXTRACTOR_METATYPE_FLASH,
+ EXTRACTOR_METATYPE_FLASH_BIAS,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
+ EXTRACTOR_METATYPE_ISO_SPEED,
+ EXTRACTOR_METATYPE_EXPOSURE_MODE,
+ EXTRACTOR_METATYPE_METERING_MODE,
+ EXTRACTOR_METATYPE_MACRO_MODE,
+ EXTRACTOR_METATYPE_IMAGE_QUALITY,
+ EXTRACTOR_METATYPE_WHITE_BALANCE,
+ EXTRACTOR_METATYPE_ORIENTATION,
+ EXTRACTOR_METATYPE_MAGNIFICATION,
+*/
+ EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
+ EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE, EXTRACTOR_METATYPE_THUMBNAIL,
+ EXTRACTOR_METATYPE_IMAGE_RESOLUTION, EXTRACTOR_METATYPE_SOURCE,
+/*
+ EXTRACTOR_METATYPE_CHARACTER_SET,
+ EXTRACTOR_METATYPE_LINE_COUNT,
+ EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
+ EXTRACTOR_METATYPE_WORD_COUNT,
+ EXTRACTOR_METATYPE_CHARACTER_COUNT,
+ EXTRACTOR_METATYPE_PAGE_ORIENTATION,
+ EXTRACTOR_METATYPE_PAPER_SIZE,
+ EXTRACTOR_METATYPE_TEMPLATE,
+ EXTRACTOR_METATYPE_COMPANY,
+ EXTRACTOR_METATYPE_MANAGER,
+ EXTRACTOR_METATYPE_REVISION_NUMBER,
+*/
+EXTRACTOR_METATYPE_DURATION, EXTRACTOR_METATYPE_ALBUM,
+ EXTRACTOR_METATYPE_ARTIST, EXTRACTOR_METATYPE_GENRE,
+ EXTRACTOR_METATYPE_TRACK_NUMBER, EXTRACTOR_METATYPE_DISC_NUMBER,
+ EXTRACTOR_METATYPE_PERFORMER,
+ EXTRACTOR_METATYPE_CONTACT_INFORMATION,
+ EXTRACTOR_METATYPE_SONG_VERSION, EXTRACTOR_METATYPE_PICTURE,
+ EXTRACTOR_METATYPE_COVER_PICTURE,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
+ EXTRACTOR_METATYPE_EVENT_PICTURE, EXTRACTOR_METATYPE_LOGO,
+ EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
+ EXTRACTOR_METATYPE_SOURCE_DEVICE, EXTRACTOR_METATYPE_DISCLAIMER,
+ EXTRACTOR_METATYPE_WARNING, EXTRACTOR_METATYPE_PAGE_ORDER,
+ EXTRACTOR_METATYPE_WRITER, EXTRACTOR_METATYPE_PRODUCT_VERSION,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
+ EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
+ EXTRACTOR_METATYPE_NETWORK_NAME, EXTRACTOR_METATYPE_SHOW_NAME,
+ EXTRACTOR_METATYPE_CHAPTER_NAME, EXTRACTOR_METATYPE_SONG_COUNT,
+ EXTRACTOR_METATYPE_STARTING_SONG, EXTRACTOR_METATYPE_PLAY_COUNTER,
+ EXTRACTOR_METATYPE_CONDUCTOR, EXTRACTOR_METATYPE_INTERPRETATION,
+ EXTRACTOR_METATYPE_COMPOSER, EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
+ EXTRACTOR_METATYPE_ENCODED_BY, EXTRACTOR_METATYPE_ORIGINAL_TITLE,
+ EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
+ EXTRACTOR_METATYPE_ORIGINAL_WRITER,
+ EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
+ EXTRACTOR_METATYPE_ORIGINAL_PERFORMER, EXTRACTOR_METATYPE_LYRICS,
+ EXTRACTOR_METATYPE_POPULARITY_METER, EXTRACTOR_METATYPE_LICENSEE,
+ EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST, EXTRACTOR_METATYPE_MOOD,
+ EXTRACTOR_METATYPE_SUBTITLE,
+ EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
+ EXTRACTOR_METATYPE_GNUNET_FULL_DATA, EXTRACTOR_METATYPE_RATING,
+ EXTRACTOR_METATYPE_ORGANIZATION, EXTRACTOR_METATYPE_RIPPER,
+ EXTRACTOR_METATYPE_PRODUCER, EXTRACTOR_METATYPE_GROUP,
+ EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+ EXTRACTOR_METATYPE_RESERVED };
+gint types_image[3 /*+ 26 */ + 7 /*+ 8 */ + 11 + 10 + 3 /*+ 26 */ + 17 +
+ 5 /*+ 11 + 45 */ + 8 + 1] =
+{ /* Image */
+ EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METATYPE_COMMENT,
+/*
+ EXTRACTOR_METATYPE_TITLE,
+ EXTRACTOR_METATYPE_BOOK_TITLE,
+ EXTRACTOR_METATYPE_BOOK_EDITION,
+ EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
+ EXTRACTOR_METATYPE_JOURNAL_NAME,
+ EXTRACTOR_METATYPE_JOURNAL_VOLUME,
+ EXTRACTOR_METATYPE_JOURNAL_NUMBER,
+ EXTRACTOR_METATYPE_PAGE_COUNT,
+ EXTRACTOR_METATYPE_PAGE_RANGE,
+ EXTRACTOR_METATYPE_AUTHOR_NAME,
+ EXTRACTOR_METATYPE_AUTHOR_EMAIL,
+ EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER,
+ EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
+ EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER_SERIES,
+ EXTRACTOR_METATYPE_PUBLICATION_TYPE,
+ EXTRACTOR_METATYPE_PUBLICATION_YEAR,
+ EXTRACTOR_METATYPE_PUBLICATION_MONTH,
+ EXTRACTOR_METATYPE_PUBLICATION_DAY,
+ EXTRACTOR_METATYPE_PUBLICATION_DATE,
+ EXTRACTOR_METATYPE_BIBTEX_EPRINT,
+ EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
+ EXTRACTOR_METATYPE_LANGUAGE,
+ EXTRACTOR_METATYPE_CREATION_TIME,
+ EXTRACTOR_METATYPE_URL,
+*/
+ EXTRACTOR_METATYPE_URI, EXTRACTOR_METATYPE_ISRC,
+ EXTRACTOR_METATYPE_HASH_MD4, EXTRACTOR_METATYPE_HASH_MD5,
+ EXTRACTOR_METATYPE_HASH_SHA0, EXTRACTOR_METATYPE_HASH_SHA1,
+ EXTRACTOR_METATYPE_HASH_RMD160,
+/*
+ EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LATITUDE,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE,
+ EXTRACTOR_METATYPE_LOCATION_CITY,
+ EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
+*/
+ EXTRACTOR_METATYPE_UNKNOWN, EXTRACTOR_METATYPE_DESCRIPTION,
+ EXTRACTOR_METATYPE_COPYRIGHT, EXTRACTOR_METATYPE_RIGHTS,
+ EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METATYPE_ABSTRACT,
+ EXTRACTOR_METATYPE_SUMMARY, EXTRACTOR_METATYPE_SUBJECT,
+ EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METATYPE_FORMAT,
+ EXTRACTOR_METATYPE_FORMAT_VERSION,
+ EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_UNKNOWN_DATE, EXTRACTOR_METATYPE_CREATION_DATE,
+ EXTRACTOR_METATYPE_MODIFICATION_DATE, EXTRACTOR_METATYPE_LAST_PRINTED,
+ EXTRACTOR_METATYPE_LAST_SAVED_BY, EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
+ EXTRACTOR_METATYPE_EDITING_CYCLES,
+ EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_REVISION_HISTORY,
+ EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
+ EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
+ EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
+/*
+ EXTRACTOR_METATYPE_PACKAGE_NAME,
+ EXTRACTOR_METATYPE_PACKAGE_VERSION,
+ EXTRACTOR_METATYPE_SECTION,
+ EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
+ EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
+ EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
+ EXTRACTOR_METATYPE_PACKAGE_REPLACES,
+ EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
+ EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
+ EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
+ EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
+ EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
+ EXTRACTOR_METATYPE_PACKAGE_SOURCE,
+ EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
+ EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
+ EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
+ EXTRACTOR_METATYPE_LICENSE,
+ EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
+ EXTRACTOR_METATYPE_BUILDHOST,
+ EXTRACTOR_METATYPE_VENDOR,
+ EXTRACTOR_METATYPE_TARGET_OS,
+ EXTRACTOR_METATYPE_SOFTWARE_VERSION,
+ EXTRACTOR_METATYPE_TARGET_PLATFORM,
+ EXTRACTOR_METATYPE_RESOURCE_TYPE,
+ EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
+ EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
+*/
+ EXTRACTOR_METATYPE_CAMERA_MAKE, EXTRACTOR_METATYPE_CAMERA_MODEL,
+ EXTRACTOR_METATYPE_EXPOSURE, EXTRACTOR_METATYPE_APERTURE,
+ EXTRACTOR_METATYPE_EXPOSURE_BIAS, EXTRACTOR_METATYPE_FLASH,
+ EXTRACTOR_METATYPE_FLASH_BIAS, EXTRACTOR_METATYPE_FOCAL_LENGTH,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM, EXTRACTOR_METATYPE_ISO_SPEED,
+ EXTRACTOR_METATYPE_EXPOSURE_MODE, EXTRACTOR_METATYPE_METERING_MODE,
+ EXTRACTOR_METATYPE_MACRO_MODE, EXTRACTOR_METATYPE_IMAGE_QUALITY,
+ EXTRACTOR_METATYPE_WHITE_BALANCE, EXTRACTOR_METATYPE_ORIENTATION,
+ EXTRACTOR_METATYPE_MAGNIFICATION, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
+ EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE, EXTRACTOR_METATYPE_THUMBNAIL,
+ EXTRACTOR_METATYPE_IMAGE_RESOLUTION, EXTRACTOR_METATYPE_SOURCE,
+/*
+ EXTRACTOR_METATYPE_CHARACTER_SET,
+ EXTRACTOR_METATYPE_LINE_COUNT,
+ EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
+ EXTRACTOR_METATYPE_WORD_COUNT,
+ EXTRACTOR_METATYPE_CHARACTER_COUNT,
+ EXTRACTOR_METATYPE_PAGE_ORIENTATION,
+ EXTRACTOR_METATYPE_PAPER_SIZE,
+ EXTRACTOR_METATYPE_TEMPLATE,
+ EXTRACTOR_METATYPE_COMPANY,
+ EXTRACTOR_METATYPE_MANAGER,
+ EXTRACTOR_METATYPE_REVISION_NUMBER,
+
+ EXTRACTOR_METATYPE_DURATION,
+ EXTRACTOR_METATYPE_ALBUM,
+ EXTRACTOR_METATYPE_ARTIST,
+ EXTRACTOR_METATYPE_GENRE,
+ EXTRACTOR_METATYPE_TRACK_NUMBER,
+ EXTRACTOR_METATYPE_DISC_NUMBER,
+ EXTRACTOR_METATYPE_PERFORMER,
+ EXTRACTOR_METATYPE_CONTACT_INFORMATION,
+ EXTRACTOR_METATYPE_SONG_VERSION,
+ EXTRACTOR_METATYPE_PICTURE,
+ EXTRACTOR_METATYPE_COVER_PICTURE,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
+ EXTRACTOR_METATYPE_EVENT_PICTURE,
+ EXTRACTOR_METATYPE_LOGO,
+ EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
+ EXTRACTOR_METATYPE_SOURCE_DEVICE,
+ EXTRACTOR_METATYPE_DISCLAIMER,
+ EXTRACTOR_METATYPE_WARNING,
+ EXTRACTOR_METATYPE_PAGE_ORDER,
+ EXTRACTOR_METATYPE_WRITER,
+ EXTRACTOR_METATYPE_PRODUCT_VERSION,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
+ EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
+ EXTRACTOR_METATYPE_NETWORK_NAME,
+ EXTRACTOR_METATYPE_SHOW_NAME,
+ EXTRACTOR_METATYPE_CHAPTER_NAME,
+ EXTRACTOR_METATYPE_SONG_COUNT,
+ EXTRACTOR_METATYPE_STARTING_SONG,
+ EXTRACTOR_METATYPE_PLAY_COUNTER,
+ EXTRACTOR_METATYPE_CONDUCTOR,
+ EXTRACTOR_METATYPE_INTERPRETATION,
+ EXTRACTOR_METATYPE_COMPOSER,
+ EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
+ EXTRACTOR_METATYPE_ENCODED_BY,
+ EXTRACTOR_METATYPE_ORIGINAL_TITLE,
+ EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
+ EXTRACTOR_METATYPE_ORIGINAL_WRITER,
+ EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
+ EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
+ EXTRACTOR_METATYPE_LYRICS,
+ EXTRACTOR_METATYPE_POPULARITY_METER,
+ EXTRACTOR_METATYPE_LICENSEE,
+ EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
+ EXTRACTOR_METATYPE_MOOD,
+ EXTRACTOR_METATYPE_SUBTITLE,
+*/
+EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
+ EXTRACTOR_METATYPE_GNUNET_FULL_DATA, EXTRACTOR_METATYPE_RATING,
+ EXTRACTOR_METATYPE_ORGANIZATION, EXTRACTOR_METATYPE_RIPPER,
+ EXTRACTOR_METATYPE_PRODUCER, EXTRACTOR_METATYPE_GROUP,
+ EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+ EXTRACTOR_METATYPE_RESERVED };
+gint types_namespace[3 /*+ 26 + 7 + 8 */ +
+ 11 /*+ 10 + 3 + 26 + 17 + 5 + 11 + 45 */ + 8 + 1] =
+{ /* Namespace */
+ EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METATYPE_COMMENT,
+/*
+ EXTRACTOR_METATYPE_TITLE,
+ EXTRACTOR_METATYPE_BOOK_TITLE,
+ EXTRACTOR_METATYPE_BOOK_EDITION,
+ EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
+ EXTRACTOR_METATYPE_JOURNAL_NAME,
+ EXTRACTOR_METATYPE_JOURNAL_VOLUME,
+ EXTRACTOR_METATYPE_JOURNAL_NUMBER,
+ EXTRACTOR_METATYPE_PAGE_COUNT,
+ EXTRACTOR_METATYPE_PAGE_RANGE,
+ EXTRACTOR_METATYPE_AUTHOR_NAME,
+ EXTRACTOR_METATYPE_AUTHOR_EMAIL,
+ EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER,
+ EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
+ EXTRACTOR_METATYPE_PUBLISHER_INSTITUTION,
+ EXTRACTOR_METATYPE_PUBLISHER_SERIES,
+ EXTRACTOR_METATYPE_PUBLICATION_TYPE,
+ EXTRACTOR_METATYPE_PUBLICATION_YEAR,
+ EXTRACTOR_METATYPE_PUBLICATION_MONTH,
+ EXTRACTOR_METATYPE_PUBLICATION_DAY,
+ EXTRACTOR_METATYPE_PUBLICATION_DATE,
+ EXTRACTOR_METATYPE_BIBTEX_EPRINT,
+ EXTRACTOR_METATYPE_BIBTEX_ENTRY_TYPE,
+ EXTRACTOR_METATYPE_LANGUAGE,
+ EXTRACTOR_METATYPE_CREATION_TIME,
+ EXTRACTOR_METATYPE_URL,
+
+ EXTRACTOR_METATYPE_URI,
+ EXTRACTOR_METATYPE_ISRC,
+ EXTRACTOR_METATYPE_HASH_MD4,
+ EXTRACTOR_METATYPE_HASH_MD5,
+ EXTRACTOR_METATYPE_HASH_SHA0,
+ EXTRACTOR_METATYPE_HASH_SHA1,
+ EXTRACTOR_METATYPE_HASH_RMD160,
+
+ EXTRACTOR_METATYPE_GPS_LATITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LATITUDE,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
+ EXTRACTOR_METATYPE_GPS_LONGITUDE,
+ EXTRACTOR_METATYPE_LOCATION_CITY,
+ EXTRACTOR_METATYPE_LOCATION_SUBLOCATION,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY,
+ EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
+*/
+ EXTRACTOR_METATYPE_UNKNOWN, EXTRACTOR_METATYPE_DESCRIPTION,
+ EXTRACTOR_METATYPE_COPYRIGHT, EXTRACTOR_METATYPE_RIGHTS,
+ EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METATYPE_ABSTRACT,
+ EXTRACTOR_METATYPE_SUMMARY, EXTRACTOR_METATYPE_SUBJECT,
+ EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METATYPE_FORMAT,
+ EXTRACTOR_METATYPE_FORMAT_VERSION,
+/*
+ EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_UNKNOWN_DATE,
+ EXTRACTOR_METATYPE_CREATION_DATE,
+ EXTRACTOR_METATYPE_MODIFICATION_DATE,
+ EXTRACTOR_METATYPE_LAST_PRINTED,
+ EXTRACTOR_METATYPE_LAST_SAVED_BY,
+ EXTRACTOR_METATYPE_TOTAL_EDITING_TIME,
+ EXTRACTOR_METATYPE_EDITING_CYCLES,
+ EXTRACTOR_METATYPE_MODIFIED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_REVISION_HISTORY,
+
+ EXTRACTOR_METATYPE_EMBEDDED_FILE_SIZE,
+ EXTRACTOR_METATYPE_FINDER_FILE_TYPE,
+ EXTRACTOR_METATYPE_FINDER_FILE_CREATOR,
+
+ EXTRACTOR_METATYPE_PACKAGE_NAME,
+ EXTRACTOR_METATYPE_PACKAGE_VERSION,
+ EXTRACTOR_METATYPE_SECTION,
+ EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
+ EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
+ EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
+ EXTRACTOR_METATYPE_PACKAGE_REPLACES,
+ EXTRACTOR_METATYPE_PACKAGE_PROVIDES,
+ EXTRACTOR_METATYPE_PACKAGE_RECOMMENDS,
+ EXTRACTOR_METATYPE_PACKAGE_SUGGESTS,
+ EXTRACTOR_METATYPE_PACKAGE_MAINTAINER,
+ EXTRACTOR_METATYPE_PACKAGE_INSTALLED_SIZE,
+ EXTRACTOR_METATYPE_PACKAGE_SOURCE,
+ EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
+ EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
+ EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
+ EXTRACTOR_METATYPE_LICENSE,
+ EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
+ EXTRACTOR_METATYPE_BUILDHOST,
+ EXTRACTOR_METATYPE_VENDOR,
+ EXTRACTOR_METATYPE_TARGET_OS,
+ EXTRACTOR_METATYPE_SOFTWARE_VERSION,
+ EXTRACTOR_METATYPE_TARGET_PLATFORM,
+ EXTRACTOR_METATYPE_RESOURCE_TYPE,
+ EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
+ EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
+
+ EXTRACTOR_METATYPE_CAMERA_MAKE,
+ EXTRACTOR_METATYPE_CAMERA_MODEL,
+ EXTRACTOR_METATYPE_EXPOSURE,
+ EXTRACTOR_METATYPE_APERTURE,
+ EXTRACTOR_METATYPE_EXPOSURE_BIAS,
+ EXTRACTOR_METATYPE_FLASH,
+ EXTRACTOR_METATYPE_FLASH_BIAS,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH,
+ EXTRACTOR_METATYPE_FOCAL_LENGTH_35MM,
+ EXTRACTOR_METATYPE_ISO_SPEED,
+ EXTRACTOR_METATYPE_EXPOSURE_MODE,
+ EXTRACTOR_METATYPE_METERING_MODE,
+ EXTRACTOR_METATYPE_MACRO_MODE,
+ EXTRACTOR_METATYPE_IMAGE_QUALITY,
+ EXTRACTOR_METATYPE_WHITE_BALANCE,
+ EXTRACTOR_METATYPE_ORIENTATION,
+ EXTRACTOR_METATYPE_MAGNIFICATION,
+
+ EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
+ EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE,
+ EXTRACTOR_METATYPE_THUMBNAIL,
+ EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
+ EXTRACTOR_METATYPE_SOURCE,
+
+ EXTRACTOR_METATYPE_CHARACTER_SET,
+ EXTRACTOR_METATYPE_LINE_COUNT,
+ EXTRACTOR_METATYPE_PARAGRAPH_COUNT,
+ EXTRACTOR_METATYPE_WORD_COUNT,
+ EXTRACTOR_METATYPE_CHARACTER_COUNT,
+ EXTRACTOR_METATYPE_PAGE_ORIENTATION,
+ EXTRACTOR_METATYPE_PAPER_SIZE,
+ EXTRACTOR_METATYPE_TEMPLATE,
+ EXTRACTOR_METATYPE_COMPANY,
+ EXTRACTOR_METATYPE_MANAGER,
+ EXTRACTOR_METATYPE_REVISION_NUMBER,
+
+ EXTRACTOR_METATYPE_DURATION,
+ EXTRACTOR_METATYPE_ALBUM,
+ EXTRACTOR_METATYPE_ARTIST,
+ EXTRACTOR_METATYPE_GENRE,
+ EXTRACTOR_METATYPE_TRACK_NUMBER,
+ EXTRACTOR_METATYPE_DISC_NUMBER,
+ EXTRACTOR_METATYPE_PERFORMER,
+ EXTRACTOR_METATYPE_CONTACT_INFORMATION,
+ EXTRACTOR_METATYPE_SONG_VERSION,
+ EXTRACTOR_METATYPE_PICTURE,
+ EXTRACTOR_METATYPE_COVER_PICTURE,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_PICTURE,
+ EXTRACTOR_METATYPE_EVENT_PICTURE,
+ EXTRACTOR_METATYPE_LOGO,
+ EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM,
+ EXTRACTOR_METATYPE_SOURCE_DEVICE,
+ EXTRACTOR_METATYPE_DISCLAIMER,
+ EXTRACTOR_METATYPE_WARNING,
+ EXTRACTOR_METATYPE_PAGE_ORDER,
+ EXTRACTOR_METATYPE_WRITER,
+ EXTRACTOR_METATYPE_PRODUCT_VERSION,
+ EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
+ EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
+ EXTRACTOR_METATYPE_NETWORK_NAME,
+ EXTRACTOR_METATYPE_SHOW_NAME,
+ EXTRACTOR_METATYPE_CHAPTER_NAME,
+ EXTRACTOR_METATYPE_SONG_COUNT,
+ EXTRACTOR_METATYPE_STARTING_SONG,
+ EXTRACTOR_METATYPE_PLAY_COUNTER,
+ EXTRACTOR_METATYPE_CONDUCTOR,
+ EXTRACTOR_METATYPE_INTERPRETATION,
+ EXTRACTOR_METATYPE_COMPOSER,
+ EXTRACTOR_METATYPE_BEATS_PER_MINUTE,
+ EXTRACTOR_METATYPE_ENCODED_BY,
+ EXTRACTOR_METATYPE_ORIGINAL_TITLE,
+ EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
+ EXTRACTOR_METATYPE_ORIGINAL_WRITER,
+ EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
+ EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
+ EXTRACTOR_METATYPE_LYRICS,
+ EXTRACTOR_METATYPE_POPULARITY_METER,
+ EXTRACTOR_METATYPE_LICENSEE,
+ EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
+ EXTRACTOR_METATYPE_MOOD,
+ EXTRACTOR_METATYPE_SUBTITLE,
+*/
+EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE,
+ EXTRACTOR_METATYPE_GNUNET_FULL_DATA, EXTRACTOR_METATYPE_RATING,
+ EXTRACTOR_METATYPE_ORGANIZATION, EXTRACTOR_METATYPE_RIPPER,
+ EXTRACTOR_METATYPE_PRODUCER, EXTRACTOR_METATYPE_GROUP,
+ EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+ EXTRACTOR_METATYPE_RESERVED };
+ gint * types[7] =
+{
+types_generic, types_text, types_music, types_video, types_image,
+ types_namespace, NULL};
+
Modified: gnunet-gtk/src/include/gnunet_gtk.h
===================================================================
--- gnunet-gtk/src/include/gnunet_gtk.h 2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/include/gnunet_gtk.h 2011-12-26 20:04:58 UTC (rev 18836)
@@ -122,31 +122,31 @@
GNUNET_GTK_tray_icon_destroy (void);
char *
-GNUNET_GTK_from_utf8_to_loc (gchar *str_utf8);
+GNUNET_GTK_from_utf8_to_loc (gchar * str_utf8);
char *
-GNUNET_GTK_from_loc_to_utf8 (gchar *str_loc);
+GNUNET_GTK_from_loc_to_utf8 (gchar * str_loc);
char *
-GNUNET_GTK_from_filename_to_utf8 (gchar *filename);
+GNUNET_GTK_from_filename_to_utf8 (gchar * filename);
char *
-GNUNET_GTK_from_utf8_to_filename (gchar *str_utf8);
+GNUNET_GTK_from_utf8_to_filename (gchar * str_utf8);
char *
-GNUNET_GTK_from_loc_to_filename (gchar *str_loc);
+GNUNET_GTK_from_loc_to_filename (gchar * str_loc);
char *
-GNUNET_GTK_from_filename_to_loc (gchar *filename);
+GNUNET_GTK_from_filename_to_loc (gchar * filename);
/* Returns filename form filechooser, encoded in locale-dependent
* encoding, suitable to be given to CRT and/or GNUnet
*/
char *
-GNUNET_GTK_filechooser_get_filename_loc (GtkFileChooser *fc);
+GNUNET_GTK_filechooser_get_filename_loc (GtkFileChooser * fc);
gchar *
-GNUNET_GTK_filechooser_get_filename_utf8 (GtkFileChooser *fc);
+GNUNET_GTK_filechooser_get_filename_utf8 (GtkFileChooser * fc);
@@ -193,11 +193,11 @@
/**
* Obtain the name of the configuration file that is being used.
- *
+ *
* @param ml handle to the main loop
* @return name of configuration file
*/
-const char *
+const char *
GNUNET_GTK_main_loop_get_configuration_file (struct GNUNET_GTK_MainLoop *ml);
Modified: gnunet-gtk/src/lib/about.c
===================================================================
--- gnunet-gtk/src/lib/about.c 2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/lib/about.c 2011-12-26 20:04:58 UTC (rev 18836)
@@ -28,7 +28,7 @@
static void
-destroy_about_dialog (GtkBuilder *builder)
+destroy_about_dialog (GtkBuilder * builder)
{
GtkWidget *ad;
@@ -39,13 +39,15 @@
static void
-about_window_show_exclusively (GtkBuilder *builder, gchar *name)
+about_window_show_exclusively (GtkBuilder * builder, gchar * name)
{
GtkWidget *about_credits_notebook;
GtkWidget *about_license_scroller;
- about_credits_notebook = GTK_WIDGET (gtk_builder_get_object (builder,
"about_credits_notebook"));
- about_license_scroller = GTK_WIDGET (gtk_builder_get_object (builder,
"about_license_scroller"));
+ about_credits_notebook =
+ GTK_WIDGET (gtk_builder_get_object (builder, "about_credits_notebook"));
+ about_license_scroller =
+ GTK_WIDGET (gtk_builder_get_object (builder, "about_license_scroller"));
if (name == NULL)
{
gtk_widget_hide (about_credits_notebook);
@@ -65,7 +67,7 @@
G_MODULE_EXPORT void
-GNUNET_GTK_about_window_realized (GtkWidget *widget, gpointer user_data)
+GNUNET_GTK_about_window_realized (GtkWidget * widget, gpointer user_data)
{
GtkBuilder *builder = GTK_BUILDER (user_data);
GtkTextBuffer *license_contents;
@@ -73,13 +75,15 @@
const char *path;
char *license_path;
- license_contents = GTK_TEXT_BUFFER (gtk_builder_get_object (builder,
"license_contents"));
+ license_contents =
+ GTK_TEXT_BUFFER (gtk_builder_get_object (builder, "license_contents"));
path = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DOCDIR);
if (path != NULL)
GNUNET_asprintf (&license_path, "%s%s", path, "COPYING");
else
license_path = GNUNET_strdup ("COPYING");
- if (g_file_get_contents (license_path, &license, NULL, NULL) && (license !=
NULL))
+ if (g_file_get_contents (license_path, &license, NULL, NULL) &&
+ (license != NULL))
{
gtk_text_buffer_set_text (license_contents, license, -1);
g_free (license);
@@ -89,34 +93,38 @@
G_MODULE_EXPORT void
-GNUNET_GTK_about_close_button_clicked (GtkButton *widget, gpointer user_data)
+GNUNET_GTK_about_close_button_clicked (GtkButton * widget, gpointer user_data)
{
GtkBuilder *builder = GTK_BUILDER (user_data);
+
destroy_about_dialog (builder);
}
G_MODULE_EXPORT gboolean
-GNUNET_GTK_about_window_got_delete_event (GtkWidget *widget, GdkEvent *event,
+GNUNET_GTK_about_window_got_delete_event (GtkWidget * widget, GdkEvent * event,
gpointer user_data)
{
GtkBuilder *builder = GTK_BUILDER (user_data);
+
destroy_about_dialog (builder);
return FALSE;
}
G_MODULE_EXPORT void
-GNUNET_GTK_about_credits_button_clicked (GtkButton *widget, gpointer user_data)
+GNUNET_GTK_about_credits_button_clicked (GtkButton * widget, gpointer
user_data)
{
GtkBuilder *builder = GTK_BUILDER (user_data);
+
about_window_show_exclusively (builder, "about_credits_notebook");
}
G_MODULE_EXPORT void
-GNUNET_GTK_about_license_button_clicked (GtkButton *widget, gpointer user_data)
+GNUNET_GTK_about_license_button_clicked (GtkButton * widget, gpointer
user_data)
{
GtkBuilder *builder = GTK_BUILDER (user_data);
+
about_window_show_exclusively (builder, "about_license_scroller");
}
Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c 2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/lib/eventloop.c 2011-12-26 20:04:58 UTC (rev 18836)
@@ -194,11 +194,11 @@
/**
* Obtain the name of the configuration file that is being used.
- *
+ *
* @param ml handle to the main loop
* @return name of configuration file
*/
-const char *
+const char *
GNUNET_GTK_main_loop_get_configuration_file (struct GNUNET_GTK_MainLoop *ml)
{
return ml->cfgfile;
@@ -213,7 +213,7 @@
* @return NULL on error, otherwise the object
*/
GObject *
-GNUNET_GTK_main_loop_get_object (struct GNUNET_GTK_MainLoop *ml,
+GNUNET_GTK_main_loop_get_object (struct GNUNET_GTK_MainLoop * ml,
const char *name)
{
return gtk_builder_get_object (ml->builder, name);
@@ -497,7 +497,7 @@
}
}
}
-
+
if ((rfds != NULL) && (rfds->sds.fd_count > 0))
{
#if DEBUG_EVENTLOOP
@@ -756,7 +756,8 @@
error = GetLastError ();
#if DEBUG_EVENTLOOP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "send to the socket %u returned %d (%u)\n", ui, status,
error);
+ "send to the socket %u returned %d (%u)\n", ui, status,
+ error);
#endif
if (status == 0 || (error != WSAEWOULDBLOCK && error != WSAENOTCONN) ||
(status == -1 && gso_result == 0 && error == WSAENOTCONN &&
@@ -831,7 +832,7 @@
*/
static void
run_main_loop (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_GTK_MainLoop *ml = cls;
int argc;
@@ -907,8 +908,8 @@
ml.main_window_file = main_window_file;
ml.main_task = main_task;
ret =
- GNUNET_PROGRAM_run (argc, argv, binary_name, binary_help,
- options, &run_main_loop, &ml);
+ GNUNET_PROGRAM_run (argc, argv, binary_name, binary_help, options,
+ &run_main_loop, &ml);
if (NULL != ml.cached_poll_array)
g_free (ml.cached_poll_array);
if (NULL != ml.rs)
Modified: gnunet-gtk/src/lib/nls.c
===================================================================
--- gnunet-gtk/src/lib/nls.c 2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/lib/nls.c 2011-12-26 20:04:58 UTC (rev 18836)
@@ -55,7 +55,7 @@
char *
-GNUNET_GTK_from_utf8_to_loc (gchar *str_utf8)
+GNUNET_GTK_from_utf8_to_loc (gchar * str_utf8)
{
char *str_loc;
const char *loc_charset;
@@ -68,13 +68,14 @@
if (is_UTF8)
str_loc = GNUNET_strdup (str_utf8);
else
- str_loc = GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8),
loc_charset);
+ str_loc =
+ GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8), loc_charset);
return str_loc;
}
char *
-GNUNET_GTK_from_loc_to_utf8 (gchar *str_loc)
+GNUNET_GTK_from_loc_to_utf8 (gchar * str_loc)
{
char *str_utf8;
const char *loc_charset;
@@ -94,21 +95,21 @@
/* This is copied from GLib */
static gboolean
-get_filename_charset (const gchar **filename_charset)
+get_filename_charset (const gchar ** filename_charset)
{
const gchar **charsets;
gboolean is_utf8;
-
+
is_utf8 = g_get_filename_charsets (&charsets);
if (filename_charset)
*filename_charset = charsets[0];
-
+
return is_utf8;
}
char *
-GNUNET_GTK_from_filename_to_utf8 (gchar *filename)
+GNUNET_GTK_from_filename_to_utf8 (gchar * filename)
{
char *str_utf8;
const char *filename_charset;
@@ -121,13 +122,14 @@
if (is_UTF8)
str_utf8 = GNUNET_strdup (filename);
else
- str_utf8 = GNUNET_STRINGS_to_utf8 (filename, strlen (filename),
filename_charset);
+ str_utf8 =
+ GNUNET_STRINGS_to_utf8 (filename, strlen (filename), filename_charset);
return str_utf8;
}
char *
-GNUNET_GTK_from_utf8_to_filename (gchar *str_utf8)
+GNUNET_GTK_from_utf8_to_filename (gchar * str_utf8)
{
char *filename;
const char *filename_charset;
@@ -140,13 +142,15 @@
if (is_UTF8)
filename = GNUNET_strdup (str_utf8);
else
- filename = GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8),
filename_charset);
+ filename =
+ GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8),
+ filename_charset);
return filename;
}
char *
-GNUNET_GTK_from_loc_to_filename (gchar *str_loc)
+GNUNET_GTK_from_loc_to_filename (gchar * str_loc)
{
char *filename;
const char *filename_charset;
@@ -163,16 +167,19 @@
else if (is_filename_UTF8)
filename = GNUNET_STRINGS_to_utf8 (str_loc, strlen (str_loc), loc_charset);
else if (is_loc_UTF8)
- filename = GNUNET_STRINGS_from_utf8 (str_loc, strlen (str_loc),
filename_charset);
+ filename =
+ GNUNET_STRINGS_from_utf8 (str_loc, strlen (str_loc), filename_charset);
else
/* Pray that iconv() knows these charsets */
- filename = GNUNET_STRINGS_conv (str_loc, strlen (str_loc), loc_charset,
filename_charset);
+ filename =
+ GNUNET_STRINGS_conv (str_loc, strlen (str_loc), loc_charset,
+ filename_charset);
return filename;
}
char *
-GNUNET_GTK_from_filename_to_loc (gchar *filename)
+GNUNET_GTK_from_filename_to_loc (gchar * filename)
{
char *str_loc;
const char *loc_charset;
@@ -187,12 +194,16 @@
if (is_loc_UTF8 && is_filename_UTF8)
str_loc = GNUNET_strdup (filename);
else if (is_loc_UTF8)
- str_loc = GNUNET_STRINGS_to_utf8 (filename, strlen (filename),
filename_charset);
+ str_loc =
+ GNUNET_STRINGS_to_utf8 (filename, strlen (filename), filename_charset);
else if (is_filename_UTF8)
- str_loc = GNUNET_STRINGS_from_utf8 (filename, strlen (filename),
loc_charset);
+ str_loc =
+ GNUNET_STRINGS_from_utf8 (filename, strlen (filename), loc_charset);
else
/* Pray that iconv() knows these charsets */
- str_loc = GNUNET_STRINGS_conv (filename, strlen (filename),
filename_charset, loc_charset);
+ str_loc =
+ GNUNET_STRINGS_conv (filename, strlen (filename), filename_charset,
+ loc_charset);
return str_loc;
}
@@ -201,20 +212,22 @@
* encoding, suitable to be given to CRT and/or GNUnet
*/
char *
-GNUNET_GTK_filechooser_get_filename_loc (GtkFileChooser *fc)
+GNUNET_GTK_filechooser_get_filename_loc (GtkFileChooser * fc)
{
char *filename_loc;
gchar *filename = gtk_file_chooser_get_filename (fc);
+
filename_loc = GNUNET_GTK_from_filename_to_loc (filename);
g_free (filename);
return filename_loc;
}
gchar *
-GNUNET_GTK_filechooser_get_filename_utf8 (GtkFileChooser *fc)
+GNUNET_GTK_filechooser_get_filename_utf8 (GtkFileChooser * fc)
{
char *filename_utf8;
gchar *filename = gtk_file_chooser_get_filename (fc);
+
filename_utf8 = GNUNET_GTK_from_filename_to_utf8 (filename);
g_free (filename);
return filename_utf8;
Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2011-12-26 20:03:46 UTC
(rev 18835)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2011-12-26 20:04:58 UTC
(rev 18836)
@@ -165,8 +165,7 @@
* @param address address as a string, NULL on error
*/
static void
-peer_address_string_cb (void *cls,
- const char *address)
+peer_address_string_cb (void *cls, const char *address)
{
struct PeerInfo *info = cls;
GtkListStore *ls;
@@ -183,16 +182,11 @@
path = gtk_tree_row_reference_get_path (info->rr);
GNUNET_assert (NULL != path);
GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm, &iter, path));
- gtk_tree_path_free (path);
- if (NULL == address)
+ gtk_tree_path_free (path);
+ if (NULL == address)
{
/* error */
- gtk_list_store_set (ls, &iter,
- 1, 1,
- 2, NULL,
- 3, NULL,
- 6, "<error>",
- -1);
+ gtk_list_store_set (ls, &iter, 1, 1, 2, NULL, 3, NULL, 6, "<error>", -1);
}
else
{
@@ -207,12 +201,8 @@
if ('.' == *dot)
country = GNUNET_strndup (&dot[1], (colon - dot) - 1);
}
- gtk_list_store_set (ls, &iter,
- 1, 1,
- 2, country,
- 3, GNUNET_PEERINFO_GTK_get_flag (country),
- 6, address,
- -1);
+ gtk_list_store_set (ls, &iter, 1, 1, 2, country, 3,
+ GNUNET_PEERINFO_GTK_get_flag (country), 6, address,
-1);
GNUNET_free (country);
}
}
@@ -226,9 +216,8 @@
* @param address NULL on disconnect, otherwise 0-terminated printable UTF-8
string
*/
static void
-peer_address_cb (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Address *address)
+peer_address_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address)
{
struct PeerInfo *info = cls;
GtkListStore *ls;
@@ -245,22 +234,17 @@
GNUNET_assert (NULL != path);
GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm, &iter, path));
gtk_tree_path_free (path);
- gtk_list_store_set (ls, &iter,
- 1, 0,
- 2, NULL,
- 3, NULL,
- 6, "<disconnected>",
- -1);
+ gtk_list_store_set (ls, &iter, 1, 0, 2, NULL, 3, NULL, 6, "<disconnected>",
+ -1);
return;
}
if (NULL != info->tos)
GNUNET_TRANSPORT_address_to_string_cancel (info->tos);
- info->tos = GNUNET_TRANSPORT_address_to_string (get_configuration (),
- address,
- GNUNET_NO,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &peer_address_string_cb,
- info);
+ info->tos =
+ GNUNET_TRANSPORT_address_to_string (get_configuration (), address,
+ GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &peer_address_string_cb, info);
}
@@ -319,9 +303,9 @@
{
info->palc =
GNUNET_TRANSPORT_peer_get_active_addresses (get_configuration (), peer,
- GNUNET_NO,
-
GNUNET_TIME_UNIT_FOREVER_REL,
- &peer_address_cb, info);
+ GNUNET_NO,
+
GNUNET_TIME_UNIT_FOREVER_REL,
+ &peer_address_cb, info);
}
}
@@ -401,9 +385,7 @@
exit (1);
}
#if FIXME
- ats =
- GNUNET_ATS_connect (get_configuration (),
- &status_cb, NULL);
+ ats = GNUNET_ATS_connect (get_configuration (), &status_cb, NULL);
#endif
/* setup main window */
main_window = GTK_WIDGET (get_object ("GNUNET_PEERINFO_GTK_main_window"));
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2011-12-26 20:04:58 UTC (rev
18836)
@@ -792,9 +792,9 @@
if (strlen (pos->tcpred) > 0)
GNUNET_CONFIGURATION_set_value_string (cfg, pos->section,
"TCP_REDIRECTS",
pos->tcpred);
- if ( (strlen (pos->udpred) > 0) ||
- (strlen (pos->tcpred) > 0) )
- GNUNET_CONFIGURATION_set_value_number (cfg, pos->section, "TTL",
pos->ttl);
+ if ((strlen (pos->udpred) > 0) || (strlen (pos->tcpred) > 0))
+ GNUNET_CONFIGURATION_set_value_number (cfg, pos->section, "TTL",
+ pos->ttl);
GNUNET_free_non_null (pos->altnames);
GNUNET_free (pos->tcpred);
GNUNET_free (pos->udpred);
Modified: gnunet-gtk/src/setup/gnunet-setup-transport.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport.c 2011-12-26 20:03:46 UTC
(rev 18835)
+++ gnunet-gtk/src/setup/gnunet-setup-transport.c 2011-12-26 20:04:58 UTC
(rev 18836)
@@ -160,10 +160,8 @@
* @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
*/
static int
-nipo (void *cls, const char *name, int isDefault,
- const struct sockaddr *addr,
- const struct sockaddr *broadcast_addr,
- const struct sockaddr *netmask,
+nipo (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
+ const struct sockaddr *broadcast_addr, const struct sockaddr *netmask,
socklen_t addrlen)
{
const struct sockaddr_in *in;
Modified: gnunet-gtk/src/setup/gnunet-setup.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup.c 2011-12-26 20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/setup/gnunet-setup.c 2011-12-26 20:04:58 UTC (rev 18836)
@@ -103,7 +103,7 @@
GtkWidget *widget;
regex_t r;
- if (NULL == os->visibility)
+ if (NULL == os->visibility)
return;
i = 0;
while (os->visibility[i].widget_name != NULL)
Modified: gnunet-gtk/src/statistics/functions.c
===================================================================
--- gnunet-gtk/src/statistics/functions.c 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/statistics/functions.c 2011-12-26 20:04:58 UTC (rev
18836)
@@ -50,8 +50,7 @@
static struct GNUNET_CronManager *cron;
static int
-getStatValue (unsigned long long *value,
- unsigned long long *lvalue,
+getStatValue (unsigned long long *value, unsigned long long *lvalue,
GNUNET_CronTime * dtime, const char *optName, int monotone)
{
unsigned int i;
@@ -60,25 +59,24 @@
if (lvalue != NULL)
*lvalue = 0;
for (i = 0; i < lsv_size; i++)
+ {
+ if (0 == strcmp (optName, lastStatValues[i].statName))
{
- if (0 == strcmp (optName, lastStatValues[i].statName))
- {
- *value = lastStatValues[i].value;
- if (lvalue != NULL)
- *lvalue = lastStatValues[i].lvalue;
- if (dtime != NULL)
- *dtime = lastStatValues[i].delta;
- if ((monotone == GNUNET_YES) && (lvalue != NULL)
- && (*lvalue > *value))
- return GNUNET_SYSERR; /* gnunetd restart? */
- return GNUNET_OK;
- }
+ *value = lastStatValues[i].value;
+ if (lvalue != NULL)
+ *lvalue = lastStatValues[i].lvalue;
+ if (dtime != NULL)
+ *dtime = lastStatValues[i].delta;
+ if ((monotone == GNUNET_YES) && (lvalue != NULL) && (*lvalue > *value))
+ return GNUNET_SYSERR; /* gnunetd restart? */
+ return GNUNET_OK;
}
+ }
#if FUNCTIONS_DEBUG
GNUNET_GE_LOG (ectx,
GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
- GNUNET_GE_USER | GNUNET_GE_BULK,
- "Statistic not found: `%s'\n", optName);
+ GNUNET_GE_USER | GNUNET_GE_BULK, "Statistic not found:
`%s'\n",
+ optName);
#endif
return GNUNET_SYSERR;
}
@@ -92,13 +90,13 @@
GNUNET_mutex_lock (lock);
cmh =
- GNUNET_get_daemon_configuration_value (sock, "gnunetd",
- "connection-max-hosts");
+ GNUNET_get_daemon_configuration_value (sock, "gnunetd",
+ "connection-max-hosts");
availableDown =
- GNUNET_get_daemon_configuration_value (sock, "LOAD",
- "MAXNETDOWNBPSTOTAL");
+ GNUNET_get_daemon_configuration_value (sock, "LOAD",
+ "MAXNETDOWNBPSTOTAL");
availableUp =
- GNUNET_get_daemon_configuration_value (sock, "LOAD", "MAXNETUPBPSTOTAL");
+ GNUNET_get_daemon_configuration_value (sock, "LOAD", "MAXNETUPBPSTOTAL");
GNUNET_mutex_unlock (lock);
if (cmh == NULL)
connectionGoal = 0;
@@ -146,14 +144,13 @@
if (GNUNET_OK !=
getStatValue (&vali, NULL, NULL, "% of allowed io load", GNUNET_NO))
return GNUNET_SYSERR;
- if (GNUNET_OK != getStatValue (&valu,
- NULL, NULL, "% of allowed network load (up)",
- GNUNET_NO))
+ if (GNUNET_OK !=
+ getStatValue (&valu, NULL, NULL, "% of allowed network load (up)",
+ GNUNET_NO))
return GNUNET_SYSERR;
- if (GNUNET_OK != getStatValue (&vald,
- NULL, NULL,
- "% of allowed network load (down)",
- GNUNET_NO))
+ if (GNUNET_OK !=
+ getStatValue (&vald, NULL, NULL, "% of allowed network load (down)",
+ GNUNET_NO))
return GNUNET_SYSERR;
data[0][0] = (gfloat) valc / 100.0;
data[0][1] = (gfloat) vali / 100.0;
@@ -170,17 +167,15 @@
data[0][0] = 0;
data[0][1] = 0;
- if ((GNUNET_OK == getStatValue (&allowed,
- NULL, NULL, "# bytes allowed in datastore",
- GNUNET_NO)) &&
- (allowed != 0) &&
+ if ((GNUNET_OK ==
+ getStatValue (&allowed, NULL, NULL, "# bytes allowed in datastore",
+ GNUNET_NO)) && (allowed != 0) &&
(GNUNET_OK ==
getStatValue (&have, NULL, NULL, "# bytes in datastore", GNUNET_NO)))
data[0][0] = ((gfloat) have) / allowed;
- if ((GNUNET_OK == getStatValue (&allowed,
- NULL, NULL, "# max bytes allowed in dstore",
- GNUNET_NO)) &&
- (allowed != 0) &&
+ if ((GNUNET_OK ==
+ getStatValue (&allowed, NULL, NULL, "# max bytes allowed in dstore",
+ GNUNET_NO)) && (allowed != 0) &&
(GNUNET_OK ==
getStatValue (&have, NULL, NULL, "# bytes in dstore", GNUNET_NO)))
data[0][1] = ((gfloat) have) / allowed;
@@ -208,43 +203,39 @@
if (GNUNET_OK !=
getStatValue (&total, <otal, &dtime, "# bytes received", GNUNET_YES))
return GNUNET_SYSERR;
- if (GNUNET_OK != getStatValue (&noise,
- &lnoise, NULL, "# bytes of noise received",
- GNUNET_YES))
+ if (GNUNET_OK !=
+ getStatValue (&noise, &lnoise, NULL, "# bytes of noise received",
+ GNUNET_YES))
return GNUNET_SYSERR;
buffer = GNUNET_malloc (512);
GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
GNUNET_P2P_PROTO_GAP_RESULT);
- if (GNUNET_OK !=
- getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
- {
- content = 0;
- lcontent = 0;
- }
+ if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer,
GNUNET_YES))
+ {
+ content = 0;
+ lcontent = 0;
+ }
GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
GNUNET_P2P_PROTO_HELLO);
if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
- {
- hellos = 0;
- lhellos = 0;
- }
+ {
+ hellos = 0;
+ lhellos = 0;
+ }
GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
GNUNET_P2P_PROTO_GAP_QUERY);
+ if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer,
GNUNET_YES))
+ {
+ queries = 0;
+ lqueries = 0;
+ }
if (GNUNET_OK !=
- getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
- {
- queries = 0;
- lqueries = 0;
- }
- if (GNUNET_OK != getStatValue (&rlimit,
- &lrlimit,
- NULL,
- "# total bytes per second receive limit",
- GNUNET_NO))
- {
- rlimit = 0;
- lrlimit = 0;
- }
+ getStatValue (&rlimit, &lrlimit, NULL,
+ "# total bytes per second receive limit", GNUNET_NO))
+ {
+ rlimit = 0;
+ lrlimit = 0;
+ }
GNUNET_free (buffer);
if (banddown == 0)
return GNUNET_SYSERR;
@@ -255,15 +246,15 @@
content -= lcontent;
hellos -= lhellos;
if (banddown <= 0)
- {
- data[0][0] = 0.0;
- data[0][1] = 0.0;
- data[0][2] = 0.0;
- data[0][3] = 0.0;
- data[0][4] = 0.0;
- data[0][5] = 0.0;
- return GNUNET_OK;
- }
+ {
+ data[0][0] = 0.0;
+ data[0][1] = 0.0;
+ data[0][2] = 0.0;
+ data[0][3] = 0.0;
+ data[0][4] = 0.0;
+ data[0][5] = 0.0;
+ return GNUNET_OK;
+ }
data[0][0] = ((gfloat) noise) / (banddown * dtime / GNUNET_CRON_SECONDS);
/* red */
data[0][1] = ((gfloat) (content + noise)) / (banddown * dtime /
GNUNET_CRON_SECONDS); /* green */
data[0][2] = ((gfloat) (queries + content + noise)) / (banddown * dtime /
GNUNET_CRON_SECONDS); /* yellow */
@@ -294,47 +285,41 @@
GNUNET_CronTime dtime;
char *buffer;
- if (GNUNET_OK != getStatValue (&total,
- <otal, &dtime, "# bytes transmitted",
- GNUNET_YES))
+ if (GNUNET_OK !=
+ getStatValue (&total, <otal, &dtime, "# bytes transmitted",
GNUNET_YES))
return GNUNET_SYSERR;
if (GNUNET_OK !=
getStatValue (&noise, &lnoise, NULL, "# bytes noise sent", GNUNET_YES))
return GNUNET_SYSERR;
buffer = GNUNET_malloc (512);
- GNUNET_snprintf (buffer,
- 512, "# bytes transmitted of type %d",
+ GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
GNUNET_P2P_PROTO_GAP_RESULT);
- if (GNUNET_OK !=
- getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
- {
- content = 0;
- lcontent = 0;
- }
- GNUNET_snprintf (buffer,
- 512, "# bytes transmitted of type %d",
+ if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer,
GNUNET_YES))
+ {
+ content = 0;
+ lcontent = 0;
+ }
+ GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
GNUNET_P2P_PROTO_GAP_QUERY);
- if (GNUNET_OK !=
- getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
- {
- queries = 0;
- lqueries = 0;
- }
+ if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer,
GNUNET_YES))
+ {
+ queries = 0;
+ lqueries = 0;
+ }
GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
GNUNET_P2P_PROTO_HELLO);
if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
- {
- queries = 0;
- lqueries = 0;
- }
- if (GNUNET_OK != getStatValue (&slimit,
- &lslimit,
- NULL, "# total bytes per second send limit",
- GNUNET_NO))
- {
- slimit = 0;
- lslimit = 0;
- }
+ {
+ queries = 0;
+ lqueries = 0;
+ }
+ if (GNUNET_OK !=
+ getStatValue (&slimit, &lslimit, NULL,
+ "# total bytes per second send limit", GNUNET_NO))
+ {
+ slimit = 0;
+ lslimit = 0;
+ }
GNUNET_free (buffer);
if (bandup == 0)
return GNUNET_SYSERR;
@@ -344,15 +329,15 @@
content -= lcontent;
hellos -= lhellos;
if (bandup <= 0)
- {
- data[0][0] = 0.0;
- data[0][1] = 0.0;
- data[0][2] = 0.0;
- data[0][3] = 0.0;
- data[0][4] = 0.0;
- data[0][5] = 0.0;
- return GNUNET_OK;
- }
+ {
+ data[0][0] = 0.0;
+ data[0][1] = 0.0;
+ data[0][2] = 0.0;
+ data[0][3] = 0.0;
+ data[0][4] = 0.0;
+ data[0][5] = 0.0;
+ return GNUNET_OK;
+ }
data[0][0] = ((gfloat) noise) / (bandup * dtime / GNUNET_CRON_SECONDS);
/* red */
data[0][1] = ((gfloat) (noise + content)) / (bandup * dtime /
GNUNET_CRON_SECONDS); /* green */
data[0][2] = ((gfloat) (noise + content + queries)) / (bandup * dtime /
GNUNET_CRON_SECONDS); /* yellow */
@@ -376,17 +361,15 @@
unsigned long long lawarded;
unsigned long long max;
- if (GNUNET_OK != getStatValue (&spent,
- &lspent, NULL, "# trust spent", GNUNET_YES))
+ if (GNUNET_OK !=
+ getStatValue (&spent, &lspent, NULL, "# trust spent", GNUNET_YES))
return GNUNET_SYSERR;
- if (GNUNET_OK != getStatValue (&earned,
- &learned,
- NULL, "# trust earned", GNUNET_YES))
+ if (GNUNET_OK !=
+ getStatValue (&earned, &learned, NULL, "# trust earned", GNUNET_YES))
return GNUNET_SYSERR;
- if (GNUNET_OK != getStatValue (&awarded,
- &lawarded,
- NULL, "# gap total trust awarded",
- GNUNET_YES))
+ if (GNUNET_OK !=
+ getStatValue (&awarded, &lawarded, NULL, "# gap total trust awarded",
+ GNUNET_YES))
return GNUNET_SYSERR;
max = spent;
if (earned > max)
@@ -395,17 +378,17 @@
max = awarded;
data[0][0] = 0.0;
if (max > 0)
- {
- data[0][0] = (1.0 * spent) / max;
- data[0][1] = (1.0 * earned) / max;
- data[0][2] = (1.0 * awarded) / max;
- }
+ {
+ data[0][0] = (1.0 * spent) / max;
+ data[0][1] = (1.0 * earned) / max;
+ data[0][2] = (1.0 * awarded) / max;
+ }
else
- {
- data[0][0] = 0.0;
- data[0][1] = 0.0;
- data[0][2] = 0.0;
- }
+ {
+ data[0][0] = 0.0;
+ data[0][1] = 0.0;
+ data[0][2] = 0.0;
+ }
return GNUNET_OK;
}
@@ -417,14 +400,13 @@
unsigned long long ltotal;
unsigned long long lsuccess;
- if (GNUNET_OK != getStatValue (&total,
- <otal,
- NULL,
- "# gap requests total sent", GNUNET_YES))
+ if (GNUNET_OK !=
+ getStatValue (&total, <otal, NULL, "# gap requests total sent",
+ GNUNET_YES))
return GNUNET_SYSERR;
- if (GNUNET_OK != getStatValue (&success,
- &lsuccess,
- NULL, "# gap routes succeeded", GNUNET_YES))
+ if (GNUNET_OK !=
+ getStatValue (&success, &lsuccess, NULL, "# gap routes succeeded",
+ GNUNET_YES))
return GNUNET_SYSERR;
if (total > 0)
data[0][0] = 1.0 * success / total;
@@ -455,22 +437,22 @@
if ((j < lsv_size) && (0 == strcmp (optName, lastStatValues[j].statName)))
found = j;
if (found == (unsigned int) -1)
+ {
+ for (j = 0; j < lsv_size; j++)
{
- for (j = 0; j < lsv_size; j++)
- {
- if (0 == strcmp (optName, lastStatValues[j].statName))
- {
- found = j;
- break;
- }
- }
+ if (0 == strcmp (optName, lastStatValues[j].statName))
+ {
+ found = j;
+ break;
+ }
}
+ }
if (found == (unsigned int) -1)
- {
- found = lsv_size;
- GNUNET_array_grow (lastStatValues, lsv_size, lsv_size + 1);
- lastStatValues[found].statName = GNUNET_strdup (optName);
- }
+ {
+ found = lsv_size;
+ GNUNET_array_grow (lastStatValues, lsv_size, lsv_size + 1);
+ lastStatValues[found].statName = GNUNET_strdup (optName);
+ }
lastStatValues[found].lvalue = lastStatValues[found].value;
lastStatValues[found].value = value;
lastStatValues[found].delta = *delta;
@@ -494,17 +476,17 @@
unsigned long long connected_peers;
if (uc->is_running)
- {
- if (GNUNET_OK !=
- getStatValue (&connected_peers, NULL, NULL,
- "# of connected peers", GNUNET_NO))
- GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_UNKNOWN, 0);
- else if (connected_peers > 0)
- GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_CONNECTED,
- connected_peers);
- else
- GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_DISCONNECTED, 0);
- }
+ {
+ if (GNUNET_OK !=
+ getStatValue (&connected_peers, NULL, NULL, "# of connected peers",
+ GNUNET_NO))
+ GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_UNKNOWN, 0);
+ else if (connected_peers > 0)
+ GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_CONNECTED,
+ connected_peers);
+ else
+ GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_DISCONNECTED, 0);
+ }
else
GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_NODAEMON, 0);
return NULL;
@@ -613,24 +595,19 @@
static unsigned long long UPDATE_INTERVAL;
void
-init_functions (struct GNUNET_GE_Context *e,
- struct GNUNET_GC_Configuration *c)
+init_functions (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
{
ectx = e;
cfg = c;
- GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNET-GTK",
- "STATS-INTERVAL",
- 1,
- 99 * GNUNET_CRON_YEARS,
+ GNUNET_GC_get_configuration_value_number (cfg, "GNUNET-GTK",
"STATS-INTERVAL",
+ 1, 99 * GNUNET_CRON_YEARS,
30 * GNUNET_CRON_SECONDS,
&UPDATE_INTERVAL);
sock = GNUNET_client_connection_create (ectx, cfg);
lock = GNUNET_mutex_create (GNUNET_NO);
cron = GNUNET_GTK_get_cron_manager ();
- GNUNET_cron_add_job (cron,
- &updateStatValues, UPDATE_INTERVAL, UPDATE_INTERVAL,
- NULL);
+ GNUNET_cron_add_job (cron, &updateStatValues, UPDATE_INTERVAL,
+ UPDATE_INTERVAL, NULL);
GNUNET_cron_add_job (cron, &updateConnectionGoal, 5 * GNUNET_CRON_SECONDS,
5 * GNUNET_CRON_MINUTES, NULL);
updateStatValues (NULL);
Modified: gnunet-gtk/src/statistics/functions.h
===================================================================
--- gnunet-gtk/src/statistics/functions.h 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/statistics/functions.h 2011-12-26 20:04:58 UTC (rev
18836)
@@ -51,9 +51,10 @@
extern StatEntry stats[];
-void init_functions (struct GNUNET_GE_Context *e,
- struct GNUNET_GC_Configuration *c);
+void
+init_functions (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration
*c);
-void done_functions (void);
+void
+done_functions (void);
#endif
Modified: gnunet-gtk/src/statistics/gnunet-statistics-gtk-about.c
===================================================================
--- gnunet-gtk/src/statistics/gnunet-statistics-gtk-about.c 2011-12-26
20:03:46 UTC (rev 18835)
+++ gnunet-gtk/src/statistics/gnunet-statistics-gtk-about.c 2011-12-26
20:04:58 UTC (rev 18836)
@@ -33,7 +33,7 @@
*/
void
GNUNET_STATISTICS_GTK_main_menu_help_about_activate_cb (GtkWidget * dummy,
- gpointer data)
+ gpointer data)
{
GNUNET_GTK_display_about ("gnunet_statistics_gtk_about_window.glade");
}
Modified: gnunet-gtk/src/statistics/gnunet-statistics-gtk.c
===================================================================
--- gnunet-gtk/src/statistics/gnunet-statistics-gtk.c 2011-12-26 20:03:46 UTC
(rev 18835)
+++ gnunet-gtk/src/statistics/gnunet-statistics-gtk.c 2011-12-26 20:04:58 UTC
(rev 18836)
@@ -57,41 +57,42 @@
* Name of color to use when plotting.
*/
const char *color_name;
-
+
};
-static const struct PlotInfo connection_data[] =
- {
- { "fs", "# peers connected", "file-sharing connections", "blue" },
- { "core", "# entries in session map", "encrypted connections (core)",
"green" },
- { "core", "# neighbour entries allocated", "transport connections (core)",
"yellow" },
- { "transport", "# peers connected", "total connections (transport)",
"orange" },
- { "transport", "# TCP sessions active", "tcp connections", "red" },
- { "peerinfo", "# peers known", "peers known", "brown" },
- { "nse", "# nodes in the network (estimate)", "network size (estimate)",
"purple" },
- { NULL, NULL, NULL}
- };
+static const struct PlotInfo connection_data[] = {
+ {"fs", "# peers connected", "file-sharing connections", "blue"},
+ {"core", "# entries in session map", "encrypted connections (core)",
"green"},
+ {"core", "# neighbour entries allocated", "transport connections (core)",
+ "yellow"},
+ {"transport", "# peers connected", "total connections (transport)",
"orange"},
+ {"transport", "# TCP sessions active", "tcp connections", "red"},
+ {"peerinfo", "# peers known", "peers known", "brown"},
+ {"nse", "# nodes in the network (estimate)", "network size (estimate)",
+ "purple"},
+ {NULL, NULL, NULL}
+};
-static const struct PlotInfo traffic_data[] =
- {
- { "core", "# bytes encrypted", "bytes encrypted", "blue" },
- { "core", "# bytes decrypted", "bytes decrypted", "green" },
- { "transport", "# bytes received via TCP", "received via tcp", "yellow" },
- { "transport", "# bytes transmitted via TCP", "sent via tcp", "brown" },
- { NULL, NULL, NULL}
- };
+static const struct PlotInfo traffic_data[] = {
+ {"core", "# bytes encrypted", "bytes encrypted", "blue"},
+ {"core", "# bytes decrypted", "bytes decrypted", "green"},
+ {"transport", "# bytes received via TCP", "received via tcp", "yellow"},
+ {"transport", "# bytes transmitted via TCP", "sent via tcp", "brown"},
+ {NULL, NULL, NULL}
+};
-static const struct PlotInfo storage_data[] =
- {
- { "datastore", "# quota", "datastore capacity", "blue" },
- { "datastore", "# utilization by current datastore", "datastore
utilization", "yellow" },
- { "datastore", "# cache size", "reservation for datastore cache", "green"
},
- { "datastore", "# bytes purged (low-priority)", "discarded due to limited
space", "red" },
- { NULL, NULL, NULL}
- };
+static const struct PlotInfo storage_data[] = {
+ {"datastore", "# quota", "datastore capacity", "blue"},
+ {"datastore", "# utilization by current datastore", "datastore utilization",
+ "yellow"},
+ {"datastore", "# cache size", "reservation for datastore cache", "green"},
+ {"datastore", "# bytes purged (low-priority)",
+ "discarded due to limited space", "red"},
+ {NULL, NULL, NULL}
+};
/**
@@ -130,19 +131,17 @@
* @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
* @return GNUNET_OK to continue
*/
-static int
-process_value_update (void *cls, const char *subsystem,
- const char *name, uint64_t value,
- int is_persistent)
+static int
+process_value_update (void *cls, const char *subsystem, const char *name,
+ uint64_t value, int is_persistent)
{
GtkStatistics *stats = cls;
char *id;
GNUNET_asprintf (&id, "%s: %s", subsystem, name);
- gtk_statistics_update_value (stats,
- id,
- GNUNET_TIME_absolute_get_duration
(start_time).rel_value / 1000LL,
- value);
+ gtk_statistics_update_value (stats, id,
+ GNUNET_TIME_absolute_get_duration
+ (start_time).rel_value / 1000LL, value);
GNUNET_free (id);
return GNUNET_OK;
}
@@ -168,8 +167,7 @@
* @param info what to draw
*/
static void
-create_plot (const char *box_name,
- const struct PlotInfo *info)
+create_plot (const char *box_name, const struct PlotInfo *info)
{
GtkBox *box;
GtkStatistics *ret;
@@ -178,27 +176,17 @@
ret = GTK_STATISTICS (gtk_statistics_new ());
box = GTK_BOX (get_object (box_name));
-
- for (i=0; NULL != info[i].subsystem; i++)
+
+ for (i = 0; NULL != info[i].subsystem; i++)
{
GNUNET_asprintf (&id, "%s: %s", info[i].subsystem, info[i].name);
- gtk_statistics_add_line (ret,
- id,
- info[i].label,
- info[i].color_name);
+ gtk_statistics_add_line (ret, id, info[i].label, info[i].color_name);
GNUNET_free (id);
- GNUNET_STATISTICS_watch (statistics,
- info[i].subsystem,
- info[i].name,
- &process_value_update,
- ret);
+ GNUNET_STATISTICS_watch (statistics, info[i].subsystem, info[i].name,
+ &process_value_update, ret);
}
gtk_widget_show (GTK_WIDGET (ret));
- gtk_box_pack_start (box,
- GTK_WIDGET (ret),
- TRUE,
- TRUE,
- 0);
+ gtk_box_pack_start (box, GTK_WIDGET (ret), TRUE, TRUE, 0);
}
@@ -253,12 +241,13 @@
GtkWidget *main_window;
ml = cls;
- statistics = GNUNET_STATISTICS_create ("gnunet-statistics-gtk",
- GNUNET_GTK_main_loop_get_configuration
(ml));
+ statistics =
+ GNUNET_STATISTICS_create ("gnunet-statistics-gtk",
+ GNUNET_GTK_main_loop_get_configuration (ml));
if (NULL == statistics)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to initiate connection with statistics service\n"));
+ _("Failed to initiate connection with statistics service\n"));
return;
}
GNUNET_GTK_set_icon_search_path ();
@@ -271,12 +260,9 @@
"gnunet-gtk" /* FIXME: different icon? */ ,
"gnunet-statistics-gtk");
- create_plot ("GNUNET_STATISTICS_GTK_connectivity_box",
- connection_data);
- create_plot ("GNUNET_STATISTICS_GTK_traffic_box",
- traffic_data);
- create_plot ("GNUNET_STATISTICS_GTK_storage_box",
- storage_data);
+ create_plot ("GNUNET_STATISTICS_GTK_connectivity_box", connection_data);
+ create_plot ("GNUNET_STATISTICS_GTK_traffic_box", traffic_data);
+ create_plot ("GNUNET_STATISTICS_GTK_storage_box", storage_data);
/* make GUI visible */
if (!tray_only)
Modified: gnunet-gtk/src/statistics/gtk_statistics.c
===================================================================
--- gnunet-gtk/src/statistics/gtk_statistics.c 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/statistics/gtk_statistics.c 2011-12-26 20:04:58 UTC (rev
18836)
@@ -115,19 +115,17 @@
};
-static gboolean gtk_statistics_draw (GtkWidget *widget,
- cairo_t *cr);
+static gboolean
+gtk_statistics_draw (GtkWidget * widget, cairo_t * cr);
-static void gtk_statistics_finalize (GObject *object);
+static void
+gtk_statistics_finalize (GObject * object);
G_DEFINE_TYPE (GtkStatistics, gtk_statistics, GTK_TYPE_WIDGET)
-
-
#if GTK_MAJOR_VERSION < 3
-static gboolean
-statistics_expose (GtkWidget *statistics,
- GdkEventExpose *event)
+ static gboolean statistics_expose (GtkWidget * statistics,
+ GdkEventExpose * event)
{
GtkAllocation alloc;
cairo_t *cr;
@@ -135,53 +133,51 @@
gint y;
gtk_widget_translate_coordinates (statistics,
- GTK_WIDGET (gtk_widget_get_toplevel
(statistics)),
- 0, 0,
- &x, &y);
+ GTK_WIDGET (gtk_widget_get_toplevel
+ (statistics)), 0, 0, &x, &y);
gtk_widget_get_allocation (statistics, &alloc);
- cr = gdk_cairo_create (statistics->window);
+ cr = gdk_cairo_create (statistics->window);
cairo_translate (cr, x, y);
- cairo_rectangle (cr,
- 0, 0,
- alloc.width, alloc.height);
+ cairo_rectangle (cr, 0, 0, alloc.width, alloc.height);
cairo_clip (cr);
- gtk_statistics_draw (statistics, cr);
- cairo_destroy (cr);
+ gtk_statistics_draw (statistics, cr);
+ cairo_destroy (cr);
return FALSE;
}
#endif
static void
-gtk_statistics_class_init (GtkStatisticsClass *class)
+gtk_statistics_class_init (GtkStatisticsClass * class)
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- gobject_class = (GObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
+ gobject_class = (GObjectClass *) class;
+ widget_class = (GtkWidgetClass *) class;
gobject_class->finalize = gtk_statistics_finalize;
#if GTK_MAJOR_VERSION >= 3
widget_class->draw = gtk_statistics_draw;
#endif
-
+
g_type_class_add_private (class, sizeof (GtkStatisticsPrivate));
}
static void
-gtk_statistics_init (GtkStatistics *statistics)
+gtk_statistics_init (GtkStatistics * statistics)
{
GtkStatisticsPrivate *priv;
- statistics->priv = G_TYPE_INSTANCE_GET_PRIVATE (statistics,
- GTK_TYPE_STATISTICS,
- GtkStatisticsPrivate);
+ statistics->priv =
+ G_TYPE_INSTANCE_GET_PRIVATE (statistics, GTK_TYPE_STATISTICS,
+ GtkStatisticsPrivate);
priv = statistics->priv;
#if GTK_MAJOR_VERSION < 3
- g_signal_connect (statistics, "expose-event", G_CALLBACK
(statistics_expose), statistics);
+ g_signal_connect (statistics, "expose-event", G_CALLBACK (statistics_expose),
+ statistics);
#endif
gtk_widget_set_has_window (GTK_WIDGET (statistics), FALSE);
priv->values = NULL;
@@ -196,7 +192,7 @@
*
* Returns: the new #GtkStatistics widget.
*/
-GtkWidget*
+GtkWidget *
gtk_statistics_new ()
{
GtkStatisticsPrivate *priv;
@@ -221,10 +217,8 @@
* @param color_name name of the color to use
*/
void
-gtk_statistics_add_line (GtkStatistics *statistics,
- const char *id,
- const char *label,
- const char *color_name)
+gtk_statistics_add_line (GtkStatistics * statistics, const char *id,
+ const char *label, const char *color_name)
{
GtkStatisticsPrivate *priv;
struct ValueHistory *vh;
@@ -233,10 +227,12 @@
g_return_if_fail (GTK_IS_STATISTICS (statistics));
g_return_if_fail (gdk_color_parse (color_name, &c));
priv = statistics->priv;
- priv->values = g_realloc (priv->values,
- sizeof (struct ValueHistory*) * (1 +
priv->num_values));
- priv->values[priv->num_values++] = vh = g_malloc (sizeof (struct
ValueHistory));
- vh->id = strdup (id);
+ priv->values =
+ g_realloc (priv->values,
+ sizeof (struct ValueHistory *) * (1 + priv->num_values));
+ priv->values[priv->num_values++] = vh =
+ g_malloc (sizeof (struct ValueHistory));
+ vh->id = strdup (id);
vh->label = strdup (label);
vh->red = c.red / 65535.0;
vh->green = c.green / 65535.0;
@@ -248,17 +244,15 @@
/**
* Add another value to a data series.
- *
+ *
* @param statistics widget to update
* @param id identifier of the series
* @param x new x-value
* @param y new y-value
*/
void
-gtk_statistics_update_value (GtkStatistics *statistics,
- const char *id,
- uint64_t x,
- uint64_t y)
+gtk_statistics_update_value (GtkStatistics * statistics, const char *id,
+ uint64_t x, uint64_t y)
{
GtkStatisticsPrivate *priv;
GtkWidget *widget;
@@ -267,7 +261,7 @@
g_return_if_fail (GTK_IS_STATISTICS (statistics));
priv = statistics->priv;
- for (i=0;i<priv->num_values;i++)
+ for (i = 0; i < priv->num_values; i++)
{
vh = priv->values[i];
if (0 != strcmp (id, vh->id))
@@ -278,7 +272,7 @@
if (vh->history_size < MAX_HISTORY)
vh->history_size++;
vh->history[vh->last_history_offset].x = x;
- vh->history[vh->last_history_offset].y = y;
+ vh->history[vh->last_history_offset].y = y;
widget = GTK_WIDGET (statistics);
if (gtk_widget_is_drawable (widget))
gtk_widget_queue_draw (widget);
@@ -293,8 +287,7 @@
* @param label where to store the string (must be big enough!)
*/
static void
-num_to_label (unsigned long long num,
- char *label)
+num_to_label (unsigned long long num, char *label)
{
if (num > 1000LL * 1000 * 1000 * 1000 * 3)
sprintf (label, "%llu t", num / 1000LL / 1000LL / 1000LL / 1000LL);
@@ -316,8 +309,7 @@
* @param cr drawing context
*/
static gboolean
-gtk_statistics_draw (GtkWidget *widget,
- cairo_t *cr)
+gtk_statistics_draw (GtkWidget * widget, cairo_t * cr)
{
GtkStatistics *statistics = GTK_STATISTICS (widget);
GtkStatisticsPrivate *priv = statistics->priv;
@@ -343,168 +335,199 @@
xmin = UINT64_MAX;
xmax = 0;
ymax = 0;
- for (i=0;i<priv->num_values;i++)
+ for (i = 0; i < priv->num_values; i++)
{
vh = priv->values[i];
- for (j=0;j<vh->history_size;j++)
+ for (j = 0; j < vh->history_size; j++)
{
- hv = &vh->history[(vh->last_history_offset - j + MAX_HISTORY) %
MAX_HISTORY];
+ hv = &vh->history[(vh->last_history_offset - j + MAX_HISTORY) %
+ MAX_HISTORY];
xmin = GNUNET_MIN (hv->x, xmin);
xmax = GNUNET_MAX (hv->x, xmax);
ymax = GNUNET_MAX (hv->y, ymax);
}
}
/* round to 10x for nicer legends */
- while (0 != (ymax % 10)) ymax++;
- while (0 != (xmax % 10)) xmax++;
- while (0 != (xmin % 10)) xmin--;
+ while (0 != (ymax % 10))
+ ymax++;
+ while (0 != (xmax % 10))
+ xmax++;
+ while (0 != (xmin % 10))
+ xmin--;
gtk_widget_get_allocation (widget, &alloc);
width = alloc.width;
height = alloc.height;
/* fill with black background */
- cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
- cairo_paint(cr);
-
- if ( (0 == priv->num_values) || (ymax == 0) )
- return FALSE; /* done */
+ cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+ cairo_paint (cr);
+
+ if ((0 == priv->num_values) || (ymax == 0))
+ return FALSE; /* done */
/* select font */
cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
- cairo_select_font_face (cr, "Georgia",
- CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
- cairo_set_font_size (cr,
- GNUNET_MIN (20, height / (2 * XTICKS)));
+ cairo_select_font_face (cr, "Georgia", CAIRO_FONT_SLANT_NORMAL,
+ CAIRO_FONT_WEIGHT_BOLD);
+ cairo_set_font_size (cr, GNUNET_MIN (20, height / (2 * XTICKS)));
/* find out needed space for axis labels */
tex_max.width = 0;
tex_max.height = 0;
- for (i=0;i<XTICKS;i++)
+ for (i = 0; i < XTICKS; i++)
{
- num_to_label ((unsigned long long) (xmin + (xmax - xmin) * ((uint64_t) i)
/ (XTICKS - 1)),
- label);
+ num_to_label ((unsigned long long) (xmin +
+ (xmax -
+ xmin) * ((uint64_t) i) / (XTICKS -
1)),
+ label);
cairo_text_extents (cr, label, &te);
tex_max.width = GNUNET_MAX (te.width, tex_max.width);
tex_max.height = GNUNET_MAX (te.height, tex_max.height);
}
tey_max.width = 0;
tey_max.height = 0;
- for (i=0;i<YTICKS;i++)
+ for (i = 0; i < YTICKS; i++)
{
num_to_label ((unsigned long long) ymax * ((uint64_t) i) / (YTICKS - 1),
- label);
+ label);
cairo_text_extents (cr, label, &te);
tey_max.width = GNUNET_MAX (te.width, tey_max.width);
tey_max.height = GNUNET_MAX (te.height, tey_max.height);
}
/* draw y-axis labels */
- for (i=0;i<YTICKS;i++)
+ for (i = 0; i < YTICKS; i++)
{
num_to_label ((unsigned long long) ymax * ((uint64_t) i) / (YTICKS - 1),
- label);
+ label);
cairo_text_extents (cr, label, &te);
- cairo_move_to (cr,
- BORDER + tey_max.width - te.width,
- BORDER + tey_max.height + (YTICKS - i - 1) * (height - 2.0 *
BORDER - tey_max.height - tex_max.height) / (double) (YTICKS - 1));
+ cairo_move_to (cr, BORDER + tey_max.width - te.width,
+ BORDER + tey_max.height + (YTICKS - i - 1) * (height -
+ 2.0 * BORDER -
+ tey_max.height
+ -
+
tex_max.height)
+ / (double) (YTICKS - 1));
cairo_show_text (cr, label);
- cairo_move_to (cr,
- 2.0 * BORDER + tey_max.width,
- BORDER + tey_max.height / 2.0 + (YTICKS - i - 1) * (height -
2.0 * BORDER - tex_max.height - tey_max.height) / (double) (YTICKS - 1));
- cairo_line_to (cr,
- 2.0 * BORDER + tey_max.width + BORDER / 2.0,
- BORDER + tey_max.height / 2.0 + (YTICKS - i - 1) * (height -
2.0 * BORDER - tex_max.height - tey_max.height) / (double) (YTICKS - 1));
+ cairo_move_to (cr, 2.0 * BORDER + tey_max.width,
+ BORDER + tey_max.height / 2.0 + (YTICKS - i - 1) * (height -
+ 2.0 *
+ BORDER -
+
tex_max.height
+ -
+
tey_max.height)
+ / (double) (YTICKS - 1));
+ cairo_line_to (cr, 2.0 * BORDER + tey_max.width + BORDER / 2.0,
+ BORDER + tey_max.height / 2.0 + (YTICKS - i - 1) * (height -
+ 2.0 *
+ BORDER -
+
tex_max.height
+ -
+
tey_max.height)
+ / (double) (YTICKS - 1));
cairo_stroke (cr);
}
/* draw x-axis labels */
- for (i=0;i<XTICKS;i++)
+ for (i = 0; i < XTICKS; i++)
{
- num_to_label ((unsigned long long) (xmin + (xmax - xmin) * ((uint64_t) i)
/ (XTICKS - 1)),
- label);
+ num_to_label ((unsigned long long) (xmin +
+ (xmax -
+ xmin) * ((uint64_t) i) / (XTICKS -
1)),
+ label);
cairo_text_extents (cr, label, &te);
if (i != 0)
{
- cairo_move_to (cr,
- 2.0 * BORDER + tey_max.width + (width - tey_max.width -
tex_max.width / 2.0 - 3.0 * BORDER) * i / (XTICKS - 1.0) - te.width / 2.0,
- height - BORDER / 2.0 - tex_max.height / 2.0);
+ cairo_move_to (cr,
+ 2.0 * BORDER + tey_max.width + (width - tey_max.width -
+ tex_max.width / 2.0 -
+ 3.0 * BORDER) * i /
+ (XTICKS - 1.0) - te.width / 2.0,
+ height - BORDER / 2.0 - tex_max.height / 2.0);
cairo_show_text (cr, label);
}
- cairo_move_to (cr,
- 2.0 * BORDER + tey_max.width + (width - tey_max.width -
tex_max.width / 2.0 - 3.0 * BORDER) * i / (XTICKS - 1.0),
- height - BORDER - tey_max.height / 2.0 - tex_max.height);
- cairo_line_to (cr,
- 2.0 * BORDER + tey_max.width + (width - tey_max.width -
tex_max.width / 2.0 - 3.0 * BORDER) * i / (XTICKS - 1.0),
- height - BORDER - tey_max.height / 2.0 - tex_max.height -
BORDER / 2.0);
+ cairo_move_to (cr,
+ 2.0 * BORDER + tey_max.width + (width - tey_max.width -
+ tex_max.width / 2.0 -
+ 3.0 * BORDER) * i / (XTICKS
-
+ 1.0),
+ height - BORDER - tey_max.height / 2.0 - tex_max.height);
+ cairo_line_to (cr,
+ 2.0 * BORDER + tey_max.width + (width - tey_max.width -
+ tex_max.width / 2.0 -
+ 3.0 * BORDER) * i / (XTICKS
-
+ 1.0),
+ height - BORDER - tey_max.height / 2.0 - tex_max.height -
+ BORDER / 2.0);
cairo_stroke (cr);
}
/* plot border */
cairo_set_line_width (cr, 1.0);
- cairo_rectangle (cr,
- tey_max.width + BORDER * 2.0,
- BORDER + tey_max.height / 2.0,
- width - BORDER * 3.0 - tey_max.width - tex_max.width / 2.0,
- height - BORDER * 2.0 - tey_max.height - tex_max.height);
+ cairo_rectangle (cr, tey_max.width + BORDER * 2.0,
+ BORDER + tey_max.height / 2.0,
+ width - BORDER * 3.0 - tey_max.width - tex_max.width / 2.0,
+ height - BORDER * 2.0 - tey_max.height - tex_max.height);
cairo_stroke (cr);
/* finally, plot lines */
cairo_set_line_width (cr, 2.0);
- cairo_set_font_size (cr,
- GNUNET_MIN (20, (height - 3.0 * BORDER - tex_max.height
- tey_max.height / 2) / (priv->num_values + 1)));
+ cairo_set_font_size (cr,
+ GNUNET_MIN (20,
+ (height - 3.0 * BORDER - tex_max.height -
+ tey_max.height / 2) / (priv->num_values +
+ 1)));
h = 2.0 * BORDER + tey_max.height / 2;
- for (i=0;i<priv->num_values;i++)
+ for (i = 0; i < priv->num_values; i++)
{
vh = priv->values[i];
- cairo_set_source_rgb(cr, vh->red, vh->green, vh->blue);
+ cairo_set_source_rgb (cr, vh->red, vh->green, vh->blue);
cairo_text_extents (cr, vh->label, &te);
h += te.height / 2;
- cairo_move_to (cr,
- 3.0 * BORDER + tey_max.width,
- h);
+ cairo_move_to (cr, 3.0 * BORDER + tey_max.width, h);
h += te.height / 2 + 1.0;
cairo_show_text (cr, vh->label);
- if (xmax == xmin)
+ if (xmax == xmin)
{
hv = &vh->history[vh->last_history_offset % MAX_HISTORY];
ry = hv->y / (double) ymax;
- ry = BORDER + tex_max.height / 2.0 + (1.0 - ry) * (height - BORDER * 2.0
- tey_max.height - tex_max.height);
+ ry = BORDER + tex_max.height / 2.0 + (1.0 - ry) * (height - BORDER * 2.0
-
+ tey_max.height -
+ tex_max.height);
/* if y-values are small, offset y-values a bit to allow overlapping
curves to still show up */
if (ymax < height / (priv->num_values * 4))
- ry += priv->num_values * 2 - (4 * i);
- cairo_move_to (cr,
- width - BORDER - tex_max.width / 2.0,
- ry);
- cairo_line_to (cr,
- rx = tey_max.width + BORDER * 2.0,
- ry);
+ ry += priv->num_values * 2 - (4 * i);
+ cairo_move_to (cr, width - BORDER - tex_max.width / 2.0, ry);
+ cairo_line_to (cr, rx = tey_max.width + BORDER * 2.0, ry);
cairo_stroke (cr);
continue;
}
- for (j=0;j<vh->history_size;j++)
+ for (j = 0; j < vh->history_size; j++)
{
- hv = &vh->history[(vh->last_history_offset - j + MAX_HISTORY) %
MAX_HISTORY];
+ hv = &vh->history[(vh->last_history_offset - j + MAX_HISTORY) %
+ MAX_HISTORY];
rx = (hv->x - xmin) / (double) (xmax - xmin);
ry = hv->y / (double) ymax;
-
- rx = tey_max.width + BORDER * 2.0 + (rx * (width - BORDER * 3.0 -
tey_max.width - tex_max.width / 2.0));
- ry = BORDER + tex_max.height / 2.0 + (1.0 - ry) * (height - BORDER * 2.0
- tey_max.height - tex_max.height);
+ rx = tey_max.width + BORDER * 2.0 +
+ (rx * (width - BORDER * 3.0 - tey_max.width - tex_max.width / 2.0));
+ ry = BORDER + tex_max.height / 2.0 + (1.0 - ry) * (height - BORDER * 2.0
-
+ tey_max.height -
+ tex_max.height);
+
/* if y-values are small, offset y-values a bit to allow overlapping
curves to still show up */
if (ymax < height / (priv->num_values * 4))
- ry += priv->num_values * 2 - (4 * i);
- if (j == 0)
- cairo_move_to (cr,
- width - BORDER - tex_max.width / 2.0,
- ry);
+ ry += priv->num_values * 2 - (4 * i);
+ if (j == 0)
+ cairo_move_to (cr, width - BORDER - tex_max.width / 2.0, ry);
cairo_line_to (cr, rx, ry);
}
cairo_stroke (cr);
@@ -519,19 +542,19 @@
* @param object object to release
*/
static void
-gtk_statistics_finalize (GObject *object)
+gtk_statistics_finalize (GObject * object)
{
GtkStatistics *label = GTK_STATISTICS (object);
GtkStatisticsPrivate *priv = label->priv;
unsigned int i;
- for (i=0;i<priv->num_values;i++)
+ for (i = 0; i < priv->num_values; i++)
{
g_free (priv->values[i]->label);
g_free (priv->values[i]->id);
- g_free (priv->values[i]);
+ g_free (priv->values[i]);
}
- g_free (priv->values);
+ g_free (priv->values);
G_OBJECT_CLASS (gtk_statistics_parent_class)->finalize (object);
}
Modified: gnunet-gtk/src/statistics/gtk_statistics.h
===================================================================
--- gnunet-gtk/src/statistics/gtk_statistics.h 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/statistics/gtk_statistics.h 2011-12-26 20:04:58 UTC (rev
18836)
@@ -31,23 +31,21 @@
#include <cairo.h>
G_BEGIN_DECLS
-
#define GTK_TYPE_STATISTICS (gtk_statistics_get_type ())
#define GTK_STATISTICS(obj) (G_TYPE_CHECK_INSTANCE_CAST
((obj), GTK_TYPE_STATISTICS, GtkStatistics))
#define GTK_STATISTICS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST
((klass), GTK_TYPE_STATISTICS, GtkStatisticsClass))
#define GTK_IS_STATISTICS(obj) (G_TYPE_CHECK_INSTANCE_TYPE
((obj), GTK_TYPE_STATISTICS))
#define GTK_IS_STATISTICS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE
((klass), GTK_TYPE_STATISTICS))
#define GTK_STATISTICS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS
((obj), GTK_TYPE_STATISTICS, GtkStatisticsClass))
+typedef struct _GtkStatistics GtkStatistics;
+typedef struct _GtkStatisticsPrivate GtkStatisticsPrivate;
+typedef struct _GtkStatisticsClass GtkStatisticsClass;
-typedef struct _GtkStatistics GtkStatistics;
-typedef struct _GtkStatisticsPrivate GtkStatisticsPrivate;
-typedef struct _GtkStatisticsClass GtkStatisticsClass;
-
struct _GtkStatistics
{
GtkWidget widget;
- /*< private >*/
+ /*< private > */
GtkStatisticsPrivate *priv;
};
@@ -63,18 +61,15 @@
};
-GType gtk_statistics_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_statistics_new (void);
-void gtk_statistics_add_line (GtkStatistics *statistics,
- const char *id,
- const char *label,
- const char *color_name);
-void gtk_statistics_update_value (GtkStatistics *statistics,
- const char *id,
- uint64_t x,
- uint64_t y);
+GType
+gtk_statistics_get_type (void)
+ G_GNUC_CONST;
+ GtkWidget *gtk_statistics_new (void);
+ void gtk_statistics_add_line (GtkStatistics * statistics, const char *id,
+ const char *label, const char *color_name);
+ void gtk_statistics_update_value (GtkStatistics * statistics, const char *id,
+ uint64_t x, uint64_t y);
G_END_DECLS
-
-#endif
+#endif
Modified: gnunet-gtk/src/statistics/gtk_statistics_demo.c
===================================================================
--- gnunet-gtk/src/statistics/gtk_statistics_demo.c 2011-12-26 20:03:46 UTC
(rev 18835)
+++ gnunet-gtk/src/statistics/gtk_statistics_demo.c 2011-12-26 20:04:58 UTC
(rev 18836)
@@ -7,63 +7,51 @@
* Update view (add more points).
*/
static gboolean
-update (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+update (GtkWidget * widget, GdkEvent * event, gpointer user_data)
{
static unsigned int i = 600;
struct GtkStatistics *statistics = user_data;
- gtk_statistics_update_value (GTK_STATISTICS (statistics),
- "sin",
- i,
- (uint64_t) (500 * (1.0 + sin(i/100.0))));
- gtk_statistics_update_value (GTK_STATISTICS (statistics),
- "cos",
- i * 2,
- (uint64_t) (i * (1.0 + cos(i/100.0))));
+ gtk_statistics_update_value (GTK_STATISTICS (statistics), "sin", i,
+ (uint64_t) (500 * (1.0 + sin (i / 100.0))));
+ gtk_statistics_update_value (GTK_STATISTICS (statistics), "cos", i * 2,
+ (uint64_t) (i * (1.0 + cos (i / 100.0))));
i++;
return FALSE;
}
-int main (int argc, char ** argv)
+int
+main (int argc, char **argv)
{
GtkWidget *window;
GtkWidget *statistics;
unsigned int i;
- gtk_init(&argc, &argv);
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(window), "STATISTICS widget");
- gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_default_size(GTK_WINDOW(window), 400, 200);
- g_signal_connect(G_OBJECT(window), "destroy",
- G_CALLBACK(gtk_main_quit), NULL);
- statistics = gtk_statistics_new();
- gtk_statistics_add_line (GTK_STATISTICS (statistics),
- "sin",
- "sin",
- "red");
- for (i=0;i<600;i++)
- gtk_statistics_update_value (GTK_STATISTICS (statistics),
- "sin",
- i,
- (uint64_t) (500 * (1.0 + sin(i/100.0))));
- gtk_statistics_add_line (GTK_STATISTICS (statistics),
- "cos",
- "cos",
- "blue");
- for (i=0;i<600;i++)
- gtk_statistics_update_value (GTK_STATISTICS (statistics),
- "cos",
- i * 2,
- (uint64_t) (i * (1.0 + cos(i/100.0))));
- g_signal_connect (G_OBJECT(window), "motion-notify-event", G_CALLBACK
(update), statistics);
- gtk_container_add(GTK_CONTAINER(window), statistics);
+ gtk_init (&argc, &argv);
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title (GTK_WINDOW (window), "STATISTICS widget");
+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+ gtk_window_set_default_size (GTK_WINDOW (window), 400, 200);
+ g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit),
+ NULL);
+ statistics = gtk_statistics_new ();
+ gtk_statistics_add_line (GTK_STATISTICS (statistics), "sin", "sin", "red");
+ for (i = 0; i < 600; i++)
+ gtk_statistics_update_value (GTK_STATISTICS (statistics), "sin", i,
+ (uint64_t) (500 * (1.0 + sin (i / 100.0))));
+ gtk_statistics_add_line (GTK_STATISTICS (statistics), "cos", "cos", "blue");
+ for (i = 0; i < 600; i++)
+ gtk_statistics_update_value (GTK_STATISTICS (statistics), "cos", i * 2,
+ (uint64_t) (i * (1.0 + cos (i / 100.0))));
+ g_signal_connect (G_OBJECT (window), "motion-notify-event",
+ G_CALLBACK (update), statistics);
+ gtk_container_add (GTK_CONTAINER (window), statistics);
gtk_widget_add_events (GTK_WIDGET (window), GDK_POINTER_MOTION_MASK);
- gtk_widget_show(statistics);
- gtk_widget_show_all(window);
- gtk_main();
+ gtk_widget_show (statistics);
+ gtk_widget_show_all (window);
+ gtk_main ();
return 0;
}
Modified: gnunet-gtk/src/statistics/statistics.c
===================================================================
--- gnunet-gtk/src/statistics/statistics.c 2011-12-26 20:03:46 UTC (rev
18835)
+++ gnunet-gtk/src/statistics/statistics.c 2011-12-26 20:04:58 UTC (rev
18836)
@@ -84,40 +84,37 @@
g->draw_height = g->disp->allocation.height;
if (!g->pixmap)
- g->pixmap = gdk_pixmap_new (g->disp->window,
- g->draw_width, g->draw_height,
- gtk_widget_get_visual (g->disp)->depth);
+ g->pixmap =
+ gdk_pixmap_new (g->disp->window, g->draw_width, g->draw_height,
+ gtk_widget_get_visual (g->disp)->depth);
/* Create GC if necessary. */
if (!g->gc)
- {
- g->gc = gdk_gc_new (g->disp->window);
- gdk_gc_copy (g->gc, g->disp->style->white_gc);
- }
+ {
+ g->gc = gdk_gc_new (g->disp->window);
+ gdk_gc_copy (g->gc, g->disp->style->white_gc);
+ }
/* Allocate colors. */
if (!g->colors_allocated)
- {
- GdkColormap *colormap;
+ {
+ GdkColormap *colormap;
- colormap = gdk_window_get_colormap (g->disp->window);
- for (i = 0; i < 2 + g->count; i++)
- gdk_color_alloc (colormap, &(g->colors[i]));
+ colormap = gdk_window_get_colormap (g->disp->window);
+ for (i = 0; i < 2 + g->count; i++)
+ gdk_color_alloc (colormap, &(g->colors[i]));
- g->colors_allocated = 1;
- }
+ g->colors_allocated = 1;
+ }
/* Erase Rectangle */
gdk_gc_set_foreground (g->gc, &(g->colors[0]));
- gdk_draw_rectangle (g->pixmap,
- g->gc,
- TRUE, 0, 0,
- g->disp->allocation.width, g->disp->allocation.height);
+ gdk_draw_rectangle (g->pixmap, g->gc, TRUE, 0, 0, g->disp->allocation.width,
+ g->disp->allocation.height);
/* draw frame */
gdk_gc_set_foreground (g->gc, &(g->colors[1]));
- gdk_draw_rectangle (g->pixmap,
- g->gc,
- FALSE, 0, 0, g->draw_width, g->disp->allocation.height);
+ gdk_draw_rectangle (g->pixmap, g->gc, FALSE, 0, 0, g->draw_width,
+ g->disp->allocation.height);
max = 0.26; /* force showing at least the 25% line */
for (i = 0; i < g->num_points - 1; i++)
@@ -127,99 +124,94 @@
max = max * 1.01; /* leave top 1% free */
font = gdk_font_load ("fixed"); /* deprecated, but pango is far more
than
- what we need here -- fix later? */
+ * what we need here -- fix later? */
/* draw lines at 25%, 50%, 75% and 100% of max */
dely = g->draw_height / max / 4;
for (i = 1; i < 5; i++)
+ {
+ gint y1 = g->draw_height + 1 - i * dely;
+
+ if ((dely < 30) && (i != 4))
+ continue; /* only print additional
+ * lines if there is enough space! */
+ if (y1 > 0)
{
- gint y1 = g->draw_height + 1 - i * dely;
- if ((dely < 30) && (i != 4))
- continue; /* only print additional
- lines if there is enough space! */
- if (y1 > 0)
- {
- const gchar *label[] = {
- NULL,
- " 25%",
- " 50%",
- " 75%",
- "100%",
- };
- gdk_draw_string (g->pixmap, font, g->gc, 10, y1 - 8, label[i]);
- gdk_draw_line (g->pixmap, g->gc, 0, y1, g->draw_width, y1);
- if (i == 4)
- {
- /* extra-thick line at 100% */
- gdk_draw_line (g->pixmap, g->gc,
- 0, y1 - 1, g->draw_width, y1 - 1);
- gdk_draw_line (g->pixmap, g->gc,
- 0, y1 + 1, g->draw_width, y1 + 1);
+ const gchar *label[] = {
+ NULL,
+ " 25%",
+ " 50%",
+ " 75%",
+ "100%",
+ };
+ gdk_draw_string (g->pixmap, font, g->gc, 10, y1 - 8, label[i]);
+ gdk_draw_line (g->pixmap, g->gc, 0, y1, g->draw_width, y1);
+ if (i == 4)
+ {
+ /* extra-thick line at 100% */
+ gdk_draw_line (g->pixmap, g->gc, 0, y1 - 1, g->draw_width, y1 - 1);
+ gdk_draw_line (g->pixmap, g->gc, 0, y1 + 1, g->draw_width, y1 + 1);
- }
- }
+ }
}
- gdk_gc_set_line_attributes (g->gc,
- 2,
- GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_MITER);
+ }
+ gdk_gc_set_line_attributes (g->gc, 2, GDK_LINE_SOLID, GDK_CAP_ROUND,
+ GDK_JOIN_MITER);
delx = (float) g->draw_width / (g->num_points - 1);
for (j = 0; j < g->count; j++)
+ {
+ gdk_gc_set_foreground (g->gc, &(g->colors[j + 2]));
+ for (i = 0; i < g->num_points - 1; i++)
{
- gdk_gc_set_foreground (g->gc, &(g->colors[j + 2]));
- for (i = 0; i < g->num_points - 1; i++)
+ gint x1 = i * delx;
+ gint x2 = (i + 1) * delx;
+ gint y1 = g->data[i][j] / max * g->draw_height - 1;
+ gint y2 = g->data[i + 1][j] / max * g->draw_height - 1;
+
+ if ((g->data[i][j] != -1) && (g->data[i + 1][j] != -1))
+ {
+ if (stats[g->statIdx].fill <= j)
{
- gint x1 = i * delx;
- gint x2 = (i + 1) * delx;
- gint y1 = g->data[i][j] / max * g->draw_height - 1;
- gint y2 = g->data[i + 1][j] / max * g->draw_height - 1;
+ gdk_draw_line (g->pixmap, g->gc, g->draw_width - x2,
+ g->draw_height - y2, g->draw_width - x1,
+ g->draw_height - y1);
+ }
+ else
+ {
+ GdkPoint points[4];
- if ((g->data[i][j] != -1) && (g->data[i + 1][j] != -1))
- {
- if (stats[g->statIdx].fill <= j)
- {
- gdk_draw_line (g->pixmap, g->gc,
- g->draw_width - x2,
- g->draw_height - y2,
- g->draw_width - x1, g->draw_height - y1);
- }
- else
- {
- GdkPoint points[4];
+ points[0].x = g->draw_width - x2;
+ points[0].y = g->draw_height - y2;
+ points[1].x = g->draw_width - x1;
+ points[1].y = g->draw_height - y1;
+ points[2].x = g->draw_width - x1;
+ points[3].x = g->draw_width - x2;
+ if (j == 0)
+ {
+ points[2].y = g->draw_height;
+ points[3].y = g->draw_height;
+ }
+ else
+ {
+ gint ly1 = g->data[i][j - 1] / max * g->draw_height - 1;
+ gint ly2 = g->data[i + 1][j - 1] / max * g->draw_height - 1;
- points[0].x = g->draw_width - x2;
- points[0].y = g->draw_height - y2;
- points[1].x = g->draw_width - x1;
- points[1].y = g->draw_height - y1;
- points[2].x = g->draw_width - x1;
- points[3].x = g->draw_width - x2;
- if (j == 0)
- {
- points[2].y = g->draw_height;
- points[3].y = g->draw_height;
- }
- else
- {
- gint ly1 = g->data[i][j - 1] / max * g->draw_height - 1;
- gint ly2 =
- g->data[i + 1][j - 1] / max * g->draw_height - 1;
- points[2].y = g->draw_height - ly1;
- points[3].y = g->draw_height - ly2;
- }
- gdk_draw_polygon (g->pixmap, g->gc, 1, points, 4);
- }
- }
+ points[2].y = g->draw_height - ly1;
+ points[3].y = g->draw_height - ly2;
+ }
+ gdk_draw_polygon (g->pixmap, g->gc, 1, points, 4);
}
+ }
}
+ }
- gdk_gc_set_line_attributes (g->gc, 1,
- GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_MITER);
+ gdk_gc_set_line_attributes (g->gc, 1, GDK_LINE_SOLID, GDK_CAP_ROUND,
+ GDK_JOIN_MITER);
gdk_draw_pixmap (g->disp->window,
- g->disp->style->fg_gc[GTK_WIDGET_STATE (g->disp)],
- g->pixmap,
- 0, 0,
- 0, 0,
- g->disp->allocation.width, g->disp->allocation.height);
+ g->disp->style->fg_gc[GTK_WIDGET_STATE (g->disp)],
g->pixmap,
+ 0, 0, 0, 0, g->disp->allocation.width,
+ g->disp->allocation.height);
}
@@ -246,21 +238,22 @@
load_graph_unalloc (LoadGraph * g)
{
unsigned int i;
+
if (!g->allocated)
return;
for (i = 0; i < g->num_points; i++)
- {
- GNUNET_free (g->data[i]);
- GNUNET_free (g->odata[i]);
- }
+ {
+ GNUNET_free (g->data[i]);
+ GNUNET_free (g->odata[i]);
+ }
GNUNET_free (g->data);
GNUNET_free (g->odata);
g->data = g->odata = NULL;
if (g->pixmap)
- {
- gdk_pixmap_unref (g->pixmap);
- g->pixmap = NULL;
- }
+ {
+ gdk_pixmap_unref (g->pixmap);
+ g->pixmap = NULL;
+ }
g->allocated = FALSE;
}
@@ -277,10 +270,10 @@
g->odata = GNUNET_malloc (sizeof (gfloat *) * g->num_points);
g->data_size = sizeof (gfloat);
for (i = 0; i < g->num_points; i++)
- {
- g->data[i] = GNUNET_malloc (g->data_size * g->count);
- g->odata[i] = GNUNET_malloc (g->data_size * g->count);
- }
+ {
+ g->data[i] = GNUNET_malloc (g->data_size * g->count);
+ g->odata[i] = GNUNET_malloc (g->data_size * g->count);
+ }
for (i = 0; i < g->num_points; i++)
for (j = 0; j < g->count; j++)
g->data[i][j] = -1;
@@ -288,48 +281,42 @@
}
static gint
-load_graph_configure (GtkWidget * widget,
- GdkEventConfigure * event, gpointer data_ptr)
+load_graph_configure (GtkWidget * widget, GdkEventConfigure * event,
+ gpointer data_ptr)
{
LoadGraph *c = (LoadGraph *) data_ptr;
if (c->pixmap)
- {
- gdk_pixmap_unref (c->pixmap);
- c->pixmap = NULL;
- }
+ {
+ gdk_pixmap_unref (c->pixmap);
+ c->pixmap = NULL;
+ }
if (!c->pixmap)
- c->pixmap = gdk_pixmap_new (widget->window,
- widget->allocation.width,
- widget->allocation.height,
- gtk_widget_get_visual (c->disp)->depth);
- gdk_draw_rectangle (c->pixmap,
- widget->style->black_gc,
- TRUE, 0, 0,
+ c->pixmap =
+ gdk_pixmap_new (widget->window, widget->allocation.width,
+ widget->allocation.height,
+ gtk_widget_get_visual (c->disp)->depth);
+ gdk_draw_rectangle (c->pixmap, widget->style->black_gc, TRUE, 0, 0,
widget->allocation.width, widget->allocation.height);
gdk_draw_pixmap (widget->window,
- c->disp->style->fg_gc[GTK_WIDGET_STATE (widget)],
- c->pixmap,
- 0, 0,
- 0, 0,
- c->disp->allocation.width, c->disp->allocation.height);
+ c->disp->style->fg_gc[GTK_WIDGET_STATE (widget)], c->pixmap,
+ 0, 0, 0, 0, c->disp->allocation.width,
+ c->disp->allocation.height);
load_graph_draw (c);
return TRUE;
}
static gint
-load_graph_expose (GtkWidget * widget,
- GdkEventExpose * event, gpointer data_ptr)
+load_graph_expose (GtkWidget * widget, GdkEventExpose * event,
+ gpointer data_ptr)
{
LoadGraph *g = (LoadGraph *) data_ptr;
gdk_draw_pixmap (widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
- g->pixmap,
- event->area.x, event->area.y,
- event->area.x, event->area.y,
+ widget->style->fg_gc[GTK_WIDGET_STATE (widget)], g->pixmap,
+ event->area.x, event->area.y, event->area.x, event->area.y,
event->area.width, event->area.height);
return FALSE;
}
@@ -340,10 +327,10 @@
if (!g)
return;
if (g->timer_index != -1)
- {
- gtk_timeout_remove (g->timer_index);
- g->timer_index = -1;
- }
+ {
+ gtk_timeout_remove (g->timer_index);
+ g->timer_index = -1;
+ }
g->draw = FALSE;
}
@@ -351,6 +338,7 @@
load_graph_destroy (GtkWidget * widget, gpointer data_ptr)
{
LoadGraph *g = (LoadGraph *) data_ptr;
+
load_graph_stop (g);
if (g->timer_index != -1)
gtk_timeout_remove (g->timer_index);
@@ -366,10 +354,10 @@
unsigned int i;
if (stats[statIdx].count > MAX_COLOR)
- {
- GNUNET_GE_BREAK (NULL, 0);
- return NULL;
- }
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ return NULL;
+ }
g = GNUNET_malloc (sizeof (LoadGraph));
g->statIdx = statIdx;
@@ -387,13 +375,12 @@
gtk_widget_show (g->main_widget);
g->disp = gtk_drawing_area_new ();
gtk_widget_show (g->disp);
- gtk_signal_connect (GTK_OBJECT (g->disp),
- "expose_event", GTK_SIGNAL_FUNC (load_graph_expose), g);
- gtk_signal_connect (GTK_OBJECT (g->disp),
- "configure_event",
+ gtk_signal_connect (GTK_OBJECT (g->disp), "expose_event",
+ GTK_SIGNAL_FUNC (load_graph_expose), g);
+ gtk_signal_connect (GTK_OBJECT (g->disp), "configure_event",
GTK_SIGNAL_FUNC (load_graph_configure), g);
- gtk_signal_connect (GTK_OBJECT (g->disp),
- "destroy", GTK_SIGNAL_FUNC (load_graph_destroy), g);
+ gtk_signal_connect (GTK_OBJECT (g->disp), "destroy",
+ GTK_SIGNAL_FUNC (load_graph_destroy), g);
gtk_widget_add_events (g->disp, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);
gtk_box_pack_start (GTK_BOX (g->main_widget), g->disp, TRUE, TRUE, 0);
load_graph_alloc (g);
@@ -419,8 +406,8 @@
gtk_container_set_border_width (GTK_CONTAINER (mem_frame), GNOME_PAD_SMALL);
gtk_widget_show (mem_frame);
if (mem_graph->timer_index == -1)
- mem_graph->timer_index
- = gtk_timeout_add (mem_graph->speed, &load_graph_update, mem_graph);
+ mem_graph->timer_index =
+ gtk_timeout_add (mem_graph->speed, &load_graph_update, mem_graph);
mem_graph->draw = TRUE;
return mem_frame;
}
@@ -430,8 +417,7 @@
void
-init_stats (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg)
+init_stats (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
{
GtkWidget *statusConnexionsBox;
GtkWidget *statusConnexionsLabel;
@@ -442,25 +428,22 @@
int i;
statusConnexionsLabel =
- glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "statusConnexionsLabel");
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "statusConnexionsLabel");
gtk_label_set_width_chars (GTK_LABEL (statusConnexionsLabel),
g_utf8_strlen (_("Connected to %Lu peers"),
40) - 1);
statusConnexionsBox =
- glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "statusConnexionsBox");
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "statusConnexionsBox");
gtk_widget_set_sensitive (statusConnexionsBox, TRUE);
- GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNET-GTK",
- "STATS-INTERVAL",
- 1,
- 99 * GNUNET_CRON_YEARS,
+ GNUNET_GC_get_configuration_value_number (cfg, "GNUNET-GTK",
"STATS-INTERVAL",
+ 1, 99 * GNUNET_CRON_YEARS,
30 * GNUNET_CRON_SECONDS,
&UPDATE_INTERVAL);
init_functions (ectx, cfg);
notebook =
- glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statsNotebook");
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statsNotebook");
memset (&config, 0, sizeof (ProcConfig));
gdk_color_parse ("black", &config.bg_color);
gdk_color_parse ("gray", &config.frame_color);
@@ -473,14 +456,14 @@
GNUNET_GE_ASSERT (ectx, MAX_COLOR == 6);
i = -1;
while (stats[++i].paneName != NULL)
- {
- sys_box = create_sys_view (i, &config);
- if (sys_box == NULL)
- continue; /* oops */
+ {
+ sys_box = create_sys_view (i, &config);
+ if (sys_box == NULL)
+ continue; /* oops */
- label = gtk_label_new (gettext (stats[i].paneName));
- gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sys_box, label);
- }
+ label = gtk_label_new (gettext (stats[i].paneName));
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sys_box, label);
+ }
gtk_widget_show (notebook);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18836 - in gnunet-gtk/src: fs include lib peerinfo setup statistics,
gnunet <=