aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 14:55:37 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 14:55:37 +0000
commit9de75a32f657bcd95bf80e77395dbc48b83e88f2 (patch)
tree0de9875239f2694397881465153cf3a3c3c1536f
parent2e50a00a6af5b337df91fb66f2c4c36ec32412c4 (diff)
downloadgnunet-gtk-9de75a32f657bcd95bf80e77395dbc48b83e88f2.tar.gz
gnunet-gtk-9de75a32f657bcd95bf80e77395dbc48b83e88f2.zip
renaming
-rw-r--r--src/fs/gnunet-fs-gtk-about.c4
-rw-r--r--src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c6
-rw-r--r--src/fs/gnunet-fs-gtk-common.c6
-rw-r--r--src/fs/gnunet-fs-gtk-common.h27
-rw-r--r--src/fs/gnunet-fs-gtk-download.c13
-rw-r--r--src/fs/gnunet-fs-gtk-download.h11
-rw-r--r--src/fs/gnunet-fs-gtk-edit_publish_dialog.c24
-rw-r--r--src/fs/gnunet-fs-gtk-edit_publish_dialog.h20
-rw-r--r--src/fs/gnunet-fs-gtk-event_handler.c15
-rw-r--r--src/fs/gnunet-fs-gtk-event_handler.h6
-rw-r--r--src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c10
-rw-r--r--src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c8
-rw-r--r--src/fs/gnunet-fs-gtk-main_window_file_download.c12
-rw-r--r--src/fs/gnunet-fs-gtk-main_window_file_publish.c24
-rw-r--r--src/fs/gnunet-fs-gtk-main_window_file_search.c8
-rw-r--r--src/fs/gnunet-fs-gtk-main_window_open_directory.c10
-rw-r--r--src/fs/gnunet-fs-gtk-main_window_view_toggles.c6
-rw-r--r--src/fs/gnunet-fs-gtk.c8
18 files changed, 118 insertions, 100 deletions
diff --git a/src/fs/gnunet-fs-gtk-about.c b/src/fs/gnunet-fs-gtk-about.c
index 9e1bad52..297ce718 100644
--- a/src/fs/gnunet-fs-gtk-about.c
+++ b/src/fs/gnunet-fs-gtk-about.c
@@ -19,7 +19,7 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/fs/about.c 22 * @file src/fs/gnunet-fs-gtk-about.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 * @author Igor Wronsky 24 * @author Igor Wronsky
25 * 25 *
@@ -39,4 +39,4 @@ GNUNET_GTK_main_menu_help_about_activate_cb (GtkWidget * dummy, gpointer data)
39} 39}
40 40
41 41
42/* end of about.c */ 42/* end of gnunet-fs-gtk-about.c */
diff --git a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
index fa4b4eeb..a8dd7b04 100644
--- a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
+++ b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
@@ -19,13 +19,13 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/fs_anonymtiy_spin_buttons.c 22 * @file src/fs/gnunet-fs-gtk-anonymtiy_spin_buttons.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 * 24 *
25 * This file contains callbacks to turn spin buttons red when the 25 * This file contains callbacks to turn spin buttons red when the
26 * value reaches zero. 26 * value reaches zero.
27 */ 27 */
28#include "common.h" 28#include "gnunet-fs-gtk-common.h"
29 29
30 30
31/** 31/**
@@ -70,4 +70,4 @@ GNUNET_GTK_anonymity_spin_button_value_changed_cb (GtkWidget *w,
70} 70}
71 71
72 72
73/* end of fs_anonymtiy_spin_buttons.c */ 73/* end of gnunet-fs-gtk-anonymtiy_spin_buttons.c */
diff --git a/src/fs/gnunet-fs-gtk-common.c b/src/fs/gnunet-fs-gtk-common.c
index f586a3d4..55318f01 100644
--- a/src/fs/gnunet-fs-gtk-common.c
+++ b/src/fs/gnunet-fs-gtk-common.c
@@ -19,11 +19,11 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/fs/common.c 22 * @file src/fs/gnunet-fs-gtk-common.c
23 * @brief Common functions used in various places 23 * @brief Common functions used in various places
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "common.h" 26#include "gnunet-fs-gtk-common.h"
27 27
28/** 28/**
29 * Add meta data to list store. 29 * Add meta data to list store.
@@ -180,4 +180,4 @@ GNUNET_FS_GTK_mmap_and_scan (const char *filename,
180} 180}
181 181
182 182
183/* end of common.c */ 183/* end of gnunet-fs-gtk-common.c */
diff --git a/src/fs/gnunet-fs-gtk-common.h b/src/fs/gnunet-fs-gtk-common.h
index e316768b..a24d0126 100644
--- a/src/fs/gnunet-fs-gtk-common.h
+++ b/src/fs/gnunet-fs-gtk-common.h
@@ -19,32 +19,45 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/fs/common.h 22 * @file src/fs/gnunet-fs-gtk-common.h
23 * @brief Common includes for all gnunet-gtk source files 23 * @brief Common includes for all gnunet-gtk source files
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#ifndef COMMON_H 26#ifndef GNUNET_FS_GTK_COMMON_H
27#define COMMON_H 27#define GNUNET_FS_GTK_COMMON_H
28 28
29#include "gnunet_gtk.h" 29#include "gnunet_gtk.h"
30#include <gnunet/gnunet_fs_service.h> 30#include <gnunet/gnunet_fs_service.h>
31#include <extractor.h> 31#include <extractor.h>
32 32
33 33
34 34/**
35 * Obtain pixbuf from thumbnail data in meta data.
36 *
37 * @param meta input meta data
38 * @return NULL on error, otherwise the embedded thumbnail
39 */
35GdkPixbuf * 40GdkPixbuf *
36GNUNET_FS_GTK_get_thumbnail_from_meta_data (const struct GNUNET_CONTAINER_MetaData *meta); 41GNUNET_FS_GTK_get_thumbnail_from_meta_data (const struct GNUNET_CONTAINER_MetaData *meta);
37 42
43
38/** 44/**
45 * FIXME: odd API...
39 * Setup the expiration year adjustment to start with the 46 * Setup the expiration year adjustment to start with the
40 * next year and default to next year plus one. 47 * next year and default to next year plus one.
48 *
49 * @param builder
41 */ 50 */
42void 51void
43GNUNET_FS_GTK_setup_expiration_year_adjustment (GtkBuilder *builder); 52GNUNET_FS_GTK_setup_expiration_year_adjustment (GtkBuilder *builder);
44 53
54
45/** 55/**
46 * Convert the year from the spin button to an expiration 56 * Convert the year from the spin button to an expiration
47 * time (on midnight, January 1st of that year). 57 * time (on midnight, January 1st of that year).
58 *
59 * @param spin button with the year
60 * @param time converted from the spin button
48 */ 61 */
49struct GNUNET_TIME_Absolute 62struct GNUNET_TIME_Absolute
50GNUNET_FS_GTK_get_expiration_time (GtkSpinButton *spin); 63GNUNET_FS_GTK_get_expiration_time (GtkSpinButton *spin);
@@ -53,6 +66,10 @@ GNUNET_FS_GTK_get_expiration_time (GtkSpinButton *spin);
53/** 66/**
54 * mmap the given file and run the GNUNET_FS_directory_list_contents 67 * mmap the given file and run the GNUNET_FS_directory_list_contents
55 * function on it. 68 * function on it.
69 *
70 * @param filename name with the directory
71 * @param dep function to call on each entry
72 * @param dep_cls closure for 'dep'
56 */ 73 */
57void 74void
58GNUNET_FS_GTK_mmap_and_scan (const char *filename, 75GNUNET_FS_GTK_mmap_and_scan (const char *filename,
@@ -86,4 +103,4 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls,
86 size_t data_len); 103 size_t data_len);
87 104
88#endif 105#endif
89/* end of common.h */ 106/* end of gnunet-fs-gtk-common.h */
diff --git a/src/fs/gnunet-fs-gtk-download.c b/src/fs/gnunet-fs-gtk-download.c
index 6a0e172c..180a48ec 100644
--- a/src/fs/gnunet-fs-gtk-download.c
+++ b/src/fs/gnunet-fs-gtk-download.c
@@ -19,16 +19,17 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/download.c 22 * @file src/fs/gnunet-fs-gtk-download.c
23 * @brief functions for downloading 23 * @brief functions for downloading
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "download.h" 26#include "gnunet-fs-gtk-download.h"
27#include "gnunet-fs-gtk.h" 27#include "gnunet-fs-gtk.h"
28#include "fs_event_handler.h" 28#include "gnunet-fs-gtk-event_handler.h"
29
29 30
30void 31void
31GNUNET_GTK_open_download_as_dialog (struct DownloadContext *dc) 32GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
32{ 33{
33 GtkWidget *ad; 34 GtkWidget *ad;
34 GtkBuilder *builder; 35 GtkBuilder *builder;
@@ -39,7 +40,7 @@ GNUNET_GTK_open_download_as_dialog (struct DownloadContext *dc)
39 struct DownloadEntry *de; 40 struct DownloadEntry *de;
40 GtkWidget *cb; 41 GtkWidget *cb;
41 42
42 builder = GNUNET_GTK_get_new_builder ("download_as.glade"); 43 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_download_as_dialog.glade");
43 if (builder == NULL) 44 if (builder == NULL)
44 { 45 {
45 if (dc->rr != NULL) 46 if (dc->rr != NULL)
@@ -133,4 +134,4 @@ GNUNET_GTK_open_download_as_dialog (struct DownloadContext *dc)
133 GNUNET_free (dc); 134 GNUNET_free (dc);
134} 135}
135 136
136/* end of download.c */ 137/* end of gnunet-fs-gtk-download.c */
diff --git a/src/fs/gnunet-fs-gtk-download.h b/src/fs/gnunet-fs-gtk-download.h
index e2c8767b..3f32fbb6 100644
--- a/src/fs/gnunet-fs-gtk-download.h
+++ b/src/fs/gnunet-fs-gtk-download.h
@@ -19,14 +19,14 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/download.h 22 * @file src/fs/gnunet-fs-gtk-download.h
23 * @brief functions for downloading 23 * @brief functions for downloading
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26 26
27#ifndef DOWNLOAD_H 27#ifndef GNUNET_FS_GTK_DOWNLOAD_H
28#define DOWNLOAD_H 28#define GNUNET_FS_GTK_DOWNLOAD_H
29#include "common.h" 29#include "gnunet-fs-gtk-common.h"
30 30
31/** 31/**
32 * Information we keep for a download. 32 * Information we keep for a download.
@@ -78,6 +78,7 @@ struct DownloadContext
78 78
79 79
80void 80void
81GNUNET_GTK_open_download_as_dialog (struct DownloadContext *dc); 81GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc);
82
82 83
83#endif 84#endif
diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index ab7b968d..3e960cf4 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -19,11 +19,11 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/edit_publish_dialog.c 22 * @file src/fs/gnunet-fs-gtk-edit_publish_dialog.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "common.h" 25#include "gnunet-fs-gtk-common.h"
26#include "edit_publish_dialog.h" 26#include "gnunet-fs-gtk-edit_publish_dialog.h"
27#include <gnunet/gnunet_util_lib.h> 27#include <gnunet/gnunet_util_lib.h>
28 28
29/** 29/**
@@ -677,11 +677,11 @@ file_information_update (void *cls,
677 * Open the dialog to edit file information data. 677 * Open the dialog to edit file information data.
678 */ 678 */
679void 679void
680GNUNET_GTK_edit_publish_dialog (int *do_index, 680GNUNET_FS_GTK_edit_publish_dialog (int *do_index,
681 char **short_fn, 681 char **short_fn,
682 guint *anonymity_level, 682 guint *anonymity_level,
683 guint *priority, 683 guint *priority,
684 struct GNUNET_FS_FileInformation *fip) 684 struct GNUNET_FS_FileInformation *fip)
685{ 685{
686 GtkWidget *ad; 686 GtkWidget *ad;
687 GtkListStore *ls; 687 GtkListStore *ls;
@@ -692,7 +692,7 @@ GNUNET_GTK_edit_publish_dialog (int *do_index,
692 GtkTreeSelection *sel; 692 GtkTreeSelection *sel;
693 693
694 GNUNET_assert (builder == NULL); 694 GNUNET_assert (builder == NULL);
695 builder = GNUNET_GTK_get_new_builder ("publish_edit_dialog.glade"); 695 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_edit_dialog.glade");
696 if (builder == NULL) 696 if (builder == NULL)
697 { 697 {
698 GNUNET_break (0); 698 GNUNET_break (0);
@@ -704,9 +704,9 @@ GNUNET_GTK_edit_publish_dialog (int *do_index,
704 { 704 {
705 /* indexing does not apply to directories */ 705 /* indexing does not apply to directories */
706 gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, 706 gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
707 "GNUNET_GTK_edit_file_information_index_check_button"))); 707 "GNUNET_GTK_edit_file_information_index_check_button")));
708 gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, 708 gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
709 "GNUNET_GTK_edit_file_information_index_label"))); 709 "GNUNET_GTK_edit_file_information_index_label")));
710 710
711 } 711 }
712 712
@@ -768,4 +768,4 @@ GNUNET_GTK_edit_publish_dialog (int *do_index,
768 builder = NULL; 768 builder = NULL;
769} 769}
770 770
771/* end of edit_publish_dialog.c */ 771/* end of gnunet-fs-gtk-edit_publish_dialog.c */
diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.h b/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
index c13f6abe..1ba1a5ed 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
@@ -19,23 +19,23 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/edit_publish_dialog.h 22 * @file src/fs/gnunet-fs-gtk-edit_publish_dialog.h
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#ifndef EDIT_PUBLISH_DIALOG_H 25#ifndef GNUNET_FS_GTK_EDIT_PUBLISH_DIALOG_H
26#define EDIT_PUBLISH_DIALOG_H 26#define GNUNET_FS_GTK_EDIT_PUBLISH_DIALOG_H
27 27
28#include "common.h" 28#include "gnunet-fs-gtk-common.h"
29#include <gnunet/gnunet_util_lib.h> 29#include <gnunet/gnunet_util_lib.h>
30#include <gnunet/gnunet_fs_service.h> 30#include <gnunet/gnunet_fs_service.h>
31 31
32 32
33void 33void
34GNUNET_GTK_edit_publish_dialog (int *do_index, 34GNUNET_FS_GTK_edit_publish_dialog (int *do_index,
35 char **short_fn, 35 char **short_fn,
36 guint *anonymity_level, 36 guint *anonymity_level,
37 guint *priority, 37 guint *priority,
38 struct GNUNET_FS_FileInformation *fip); 38 struct GNUNET_FS_FileInformation *fip);
39 39
40#endif 40#endif
41/* end of edit_publish_dialog.h */ 41/* end of gnunet-fs-gtk-edit_publish_dialog.h */
diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 05463f34..3b53fca5 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -19,14 +19,13 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/fs_event_handler.c 22 * @file src/fs/gnunet-fs-gtk-event_handler.c
23 * @brief Main event handler for file-sharing 23 * @brief Main event handler for file-sharing
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "common.h"
27#include "gnunet-fs-gtk.h" 26#include "gnunet-fs-gtk.h"
28#include "download.h" 27#include "gnunet-fs-gtk-download.h"
29#include "fs_event_handler.h" 28#include "gnunet-fs-gtk-event_handler.h"
30#include <string.h> 29#include <string.h>
31 30
32static struct SearchTab *search_tab_head; 31static struct SearchTab *search_tab_head;
@@ -691,7 +690,7 @@ start_download (GtkTreeView *tree_view,
691 dlc->rr = gtk_tree_row_reference_new (tm, path); 690 dlc->rr = gtk_tree_row_reference_new (tm, path);
692 dlc->sr = sr->result; 691 dlc->sr = sr->result;
693 dlc->anonymity = -1; 692 dlc->anonymity = -1;
694 GNUNET_GTK_open_download_as_dialog (dlc); 693 GNUNET_FS_GTK_open_download_as_dialog (dlc);
695 g_free (mime); 694 g_free (mime);
696} 695}
697 696
@@ -1205,7 +1204,7 @@ setup_search (struct GNUNET_FS_SearchContext *sc,
1205 else 1204 else
1206 tab->query_txt = GNUNET_FS_uri_to_string (query); 1205 tab->query_txt = GNUNET_FS_uri_to_string (query);
1207 } 1206 }
1208 tab->builder = GNUNET_GTK_get_new_builder ("search_tab.glade"); 1207 tab->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_tab.glade");
1209 tab->ts = GTK_TREE_STORE (gtk_builder_get_object (tab->builder, 1208 tab->ts = GTK_TREE_STORE (gtk_builder_get_object (tab->builder,
1210 "GNUNET_GTK_file_sharing_result_tree_store")); 1209 "GNUNET_GTK_file_sharing_result_tree_store"));
1211 /* load frame */ 1210 /* load frame */
@@ -1707,7 +1706,7 @@ setup_publish (struct GNUNET_FS_PublishContext *pc,
1707 GNUNET_CONTAINER_DLL_insert (publish_tab_head, 1706 GNUNET_CONTAINER_DLL_insert (publish_tab_head,
1708 publish_tab_tail, 1707 publish_tab_tail,
1709 tab); 1708 tab);
1710 tab->builder = GNUNET_GTK_get_new_builder ("publish_tab.glade"); 1709 tab->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_tab.glade");
1711 df = GTK_WINDOW (gtk_builder_get_object (tab->builder, 1710 df = GTK_WINDOW (gtk_builder_get_object (tab->builder,
1712 "_publish_frame_window")); 1711 "_publish_frame_window"));
1713 tab->frame = gtk_bin_get_child (GTK_BIN (df)); 1712 tab->frame = gtk_bin_get_child (GTK_BIN (df));
@@ -2025,4 +2024,4 @@ GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
2025 2024
2026 2025
2027 2026
2028/* end of fs_event_handler.c */ 2027/* end of gnunet-fs-gtk-event_handler.c */
diff --git a/src/fs/gnunet-fs-gtk-event_handler.h b/src/fs/gnunet-fs-gtk-event_handler.h
index a86ff339..8fe038bb 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.h
+++ b/src/fs/gnunet-fs-gtk-event_handler.h
@@ -19,11 +19,11 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/fs_event_handler.h 22 * @file src/fs/gnunet-fs-gtk-event_handler.h
23 * @brief Main event handler for file-sharing 23 * @brief Main event handler for file-sharing
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "common.h" 26#include "gnunet-fs-gtk-common.h"
27 27
28 28
29struct SearchResult; 29struct SearchResult;
@@ -195,4 +195,4 @@ void* GNUNET_GTK_fs_event_handler (void *cls,
195 const struct GNUNET_FS_ProgressInfo *info); 195 const struct GNUNET_FS_ProgressInfo *info);
196 196
197 197
198/* end of fs_event_handler.h */ 198/* end of gnunet-fs-gtk-event_handler.h */
diff --git a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
index 88a8f2b3..0a157a42 100644
--- a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
@@ -19,10 +19,10 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/main_window_adv_pseudonym.c 22 * @file src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "common.h" 25#include "gnunet-fs-gtk-common.h"
26#include "gnunet-fs-gtk.h" 26#include "gnunet-fs-gtk.h"
27 27
28static GtkBuilder *builder; 28static GtkBuilder *builder;
@@ -413,7 +413,7 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
413 guint type; 413 guint type;
414 guint max_type; 414 guint max_type;
415 415
416 builder = GNUNET_GTK_get_new_builder ("select_pseudonym_dialog.glade"); 416 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_select_pseudonym_dialog.glade");
417 if (builder == NULL) 417 if (builder == NULL)
418 { 418 {
419 GNUNET_break (0); 419 GNUNET_break (0);
@@ -464,7 +464,7 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
464 builder = NULL; 464 builder = NULL;
465 465
466 466
467 builder = GNUNET_GTK_get_new_builder ("advertise_pseudonym_dialog.glade"); 467 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_advertise_pseudonym_dialog.glade");
468 if (builder == NULL) 468 if (builder == NULL)
469 { 469 {
470 GNUNET_break (0); 470 GNUNET_break (0);
@@ -585,4 +585,4 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
585} 585}
586 586
587 587
588/* end of main_window_adv_pseudonym.c */ 588/* end of gnunet-fs-gtk-main_window_adv_pseudonym.c */
diff --git a/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c b/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
index 9faf0bae..e724d4dd 100644
--- a/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
@@ -19,11 +19,11 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/main_window_create_pseudonym.c 22 * @file src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 * 24 *
25 */ 25 */
26#include "common.h" 26#include "gnunet-fs-gtk-common.h"
27#include "gnunet-fs-gtk.h" 27#include "gnunet-fs-gtk.h"
28 28
29/** 29/**
@@ -37,7 +37,7 @@ GNUNET_GTK_main_menu_create_pseudonym_activate_cb (GtkWidget * dummy,
37 const char *name; 37 const char *name;
38 struct GNUNET_FS_Namespace *ns; 38 struct GNUNET_FS_Namespace *ns;
39 39
40 builder = GNUNET_GTK_get_new_builder ("create_namespace_dialog.glade"); 40 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_create_namespace_dialog.glade");
41 if (builder == NULL) 41 if (builder == NULL)
42 { 42 {
43 GNUNET_break (0); 43 GNUNET_break (0);
@@ -62,4 +62,4 @@ GNUNET_GTK_main_menu_create_pseudonym_activate_cb (GtkWidget * dummy,
62} 62}
63 63
64 64
65/* end of main_window_create_pseudonym.c */ 65/* end of gnunet-fs-gtk-main_window_create_pseudonym.c */
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_download.c b/src/fs/gnunet-fs-gtk-main_window_file_download.c
index 0a41bfba..dd68707a 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_download.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_download.c
@@ -19,11 +19,11 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/main_window_file_download.c 22 * @file src/fs/gnunet-fs-gtk-main_window_file_download.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "common.h" 25#include "gnunet-fs-gtk-common.h"
26#include "download.h" 26#include "gnunet-fs-gtk-download.h"
27#include "gnunet-fs-gtk.h" 27#include "gnunet-fs-gtk.h"
28 28
29static GtkBuilder *builder; 29static GtkBuilder *builder;
@@ -68,7 +68,7 @@ GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy,
68 struct DownloadContext *dc; 68 struct DownloadContext *dc;
69 69
70 GNUNET_assert (builder == NULL); 70 GNUNET_assert (builder == NULL);
71 builder = GNUNET_GTK_get_new_builder ("open_url_dialog.glade"); 71 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_url_dialog.glade");
72 if (builder == NULL) 72 if (builder == NULL)
73 { 73 {
74 GNUNET_break (0); 74 GNUNET_break (0);
@@ -120,11 +120,11 @@ GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy,
120 dc = GNUNET_malloc (sizeof (struct DownloadContext)); 120 dc = GNUNET_malloc (sizeof (struct DownloadContext));
121 dc->uri = uri; 121 dc->uri = uri;
122 dc->anonymity = anonymity; 122 dc->anonymity = anonymity;
123 GNUNET_GTK_open_download_as_dialog (dc); 123 GNUNET_FS_GTK_open_download_as_dialog (dc);
124 return; 124 return;
125 } 125 }
126 GNUNET_break (0); 126 GNUNET_break (0);
127 GNUNET_FS_uri_destroy (uri); 127 GNUNET_FS_uri_destroy (uri);
128} 128}
129 129
130/* end of main_window_file_download.c */ 130/* end of gnunet-fs-gtk-main_window_file_download.c */
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index 2fa46ec5..ee134dd5 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -19,12 +19,12 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/main_window_file_publish.c 22 * @file src/fs/gnunet-fs-gtk-main_window_file_publish.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "common.h" 25#include "gnunet-fs-gtk-common.h"
26#include "gnunet-fs-gtk.h" 26#include "gnunet-fs-gtk.h"
27#include "edit_publish_dialog.h" 27#include "gnunet-fs-gtk-edit_publish_dialog.h"
28#include <gnunet/gnunet_util_lib.h> 28#include <gnunet/gnunet_util_lib.h>
29 29
30#define MARKER_DIR_FILE_SIZE "-" 30#define MARKER_DIR_FILE_SIZE "-"
@@ -1353,7 +1353,7 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
1353 int do_index; 1353 int do_index;
1354 GtkSpinButton *sb; 1354 GtkSpinButton *sb;
1355 1355
1356 builder = GNUNET_GTK_get_new_builder ("publish-file-dialog.glade"); 1356 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_file_dialog.glade");
1357 if (builder == NULL) 1357 if (builder == NULL)
1358 { 1358 {
1359 GNUNET_break (0); 1359 GNUNET_break (0);
@@ -1421,11 +1421,11 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
1421 4, &priority, 1421 4, &priority,
1422 5, &fip, 1422 5, &fip,
1423 -1); 1423 -1);
1424 GNUNET_GTK_edit_publish_dialog (&do_index, 1424 GNUNET_FS_GTK_edit_publish_dialog (&do_index,
1425 &short_fn, 1425 &short_fn,
1426 &anonymity_level, 1426 &anonymity_level,
1427 &priority, 1427 &priority,
1428 fip); 1428 fip);
1429 gtk_tree_store_set (GTK_TREE_STORE (tm), 1429 gtk_tree_store_set (GTK_TREE_STORE (tm),
1430 &iter, 1430 &iter,
1431 1, do_index, 1431 1, do_index,
@@ -1508,7 +1508,7 @@ GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
1508 GtkSpinButton *sb; 1508 GtkSpinButton *sb;
1509 struct GNUNET_FS_BlockOptions bo; 1509 struct GNUNET_FS_BlockOptions bo;
1510 1510
1511 builder = GNUNET_GTK_get_new_builder ("publish-directory-dialog.glade"); 1511 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_directory_dialog.glade");
1512 if (builder == NULL) 1512 if (builder == NULL)
1513 { 1513 {
1514 GNUNET_break (0); 1514 GNUNET_break (0);
@@ -1841,7 +1841,7 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy,
1841 gchar *namespace_uid; 1841 gchar *namespace_uid;
1842 1842
1843 GNUNET_assert (master_builder == NULL); 1843 GNUNET_assert (master_builder == NULL);
1844 master_builder = GNUNET_GTK_get_new_builder ("publish_dialog.glade"); 1844 master_builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_dialog.glade");
1845 if (master_builder == NULL) 1845 if (master_builder == NULL)
1846 return; 1846 return;
1847 tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder, 1847 tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
@@ -1930,4 +1930,4 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy,
1930} 1930}
1931 1931
1932 1932
1933/* end of main_window_file_publish.c */ 1933/* end of gnunet-fs-gtk-main_window_file_publish.c */
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_search.c b/src/fs/gnunet-fs-gtk-main_window_file_search.c
index bef1d2b7..2fec7fcc 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_search.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_search.c
@@ -19,10 +19,10 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/main_window_file_search.c 22 * @file src/fs/gnunet-fs-gtk-main_window_file_search.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "common.h" 25#include "gnunet-fs-gtk-common.h"
26#include "gnunet-fs-gtk.h" 26#include "gnunet-fs-gtk.h"
27 27
28/** 28/**
@@ -207,7 +207,7 @@ GNUNET_GTK_main_menu_file_search_activate_cb (GtkWidget * dummy,
207 GNUNET_HashCode *nsid; 207 GNUNET_HashCode *nsid;
208 208
209 GNUNET_assert (builder == NULL); 209 GNUNET_assert (builder == NULL);
210 builder = GNUNET_GTK_get_new_builder ("search_dialog.glade"); 210 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_dialog.glade");
211 if (builder == NULL) 211 if (builder == NULL)
212 return; 212 return;
213 ad = GTK_WIDGET (gtk_builder_get_object (builder, 213 ad = GTK_WIDGET (gtk_builder_get_object (builder,
@@ -240,4 +240,4 @@ GNUNET_GTK_main_menu_file_search_activate_cb (GtkWidget * dummy,
240 builder = NULL; 240 builder = NULL;
241} 241}
242 242
243/* end of main_window_file_search.c */ 243/* end of gnunet-fs-gtk-main_window_file_search.c */
diff --git a/src/fs/gnunet-fs-gtk-main_window_open_directory.c b/src/fs/gnunet-fs-gtk-main_window_open_directory.c
index 9419ef17..aea8814b 100644
--- a/src/fs/gnunet-fs-gtk-main_window_open_directory.c
+++ b/src/fs/gnunet-fs-gtk-main_window_open_directory.c
@@ -19,11 +19,11 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/main_window_open_directory.c 22 * @file src/fs/gnunet-fs-gtk-main_window_open_directory.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "common.h" 25#include "gnunet-fs-gtk-common.h"
26#include "fs_event_handler.h" 26#include "gnunet-fs-gtk-event_handler.h"
27 27
28struct AddChildContext 28struct AddChildContext
29{ 29{
@@ -115,7 +115,7 @@ GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
115 char *filename; 115 char *filename;
116 GtkFileFilter *ff; 116 GtkFileFilter *ff;
117 117
118 builder = GNUNET_GTK_get_new_builder ("open_directory_dialog.glade"); 118 builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_directory_dialog.glade");
119 if (builder == NULL) 119 if (builder == NULL)
120 { 120 {
121 GNUNET_break (0); 121 GNUNET_break (0);
@@ -144,4 +144,4 @@ GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
144 g_free (filename); 144 g_free (filename);
145} 145}
146 146
147/* end of main_window_open_directory.c */ 147/* end of gnunet-fs-gtk-main_window_open_directory.c */
diff --git a/src/fs/gnunet-fs-gtk-main_window_view_toggles.c b/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
index 0cdea23a..1ef930d4 100644
--- a/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
+++ b/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
@@ -19,12 +19,12 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/main_window_view_toggles.c 22 * @file src/fs/gnunet-fs-gtk-main_window_view_toggles.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 * 24 *
25 * This file contains callbacks for the 'view' menu that toggle views. 25 * This file contains callbacks for the 'view' menu that toggle views.
26 */ 26 */
27#include "common.h" 27#include "gnunet-fs-gtk-common.h"
28#include "gnunet-fs-gtk.h" 28#include "gnunet-fs-gtk.h"
29 29
30 30
@@ -87,4 +87,4 @@ GNUNET_GTK_main_menu_view_metadata_toggled_cb (GtkWidget * dummy,
87} 87}
88 88
89 89
90/* end of main_window_view_toggles.c */ 90/* end of gnunet-fs-gtk-main_window_view_toggles.c */
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 2fe466e4..1803504e 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -19,12 +19,12 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/gnunet-gtk.c 22 * @file src/fs/gnunet-fs-gtk.c
23 * @brief Main function of gnunet-gtk 23 * @brief Main function of gnunet-fs-gtk
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "common.h" 26#include "gnunet-fs-gtk-common.h"
27#include "fs_event_handler.h" 27#include "gnunet-fs-gtk-event_handler.h"
28 28
29/** 29/**
30 * Should gnunet-gtk start in tray mode? 30 * Should gnunet-gtk start in tray mode?