aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-08-08 07:19:48 +0000
committerChristian Grothoff <christian@grothoff.org>2013-08-08 07:19:48 +0000
commit0c04264a4aaabe0705c91f732b67062c9c8a5c0d (patch)
treecea8fd29146317d9a8b7d218625f895adb3a335c
parent0b3630b48775eeb6a236a59aea0de90758dc0369 (diff)
downloadgnunet-gtk-0c04264a4aaabe0705c91f732b67062c9c8a5c0d.tar.gz
gnunet-gtk-0c04264a4aaabe0705c91f732b67062c9c8a5c0d.zip
-hide dysfunctional namespace management button, remove dead dialogs, move manager to identity for now
-rw-r--r--contrib/Makefile.am5
-rw-r--r--contrib/gnunet_fs_gtk_main_window.glade220
-rw-r--r--contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade120
-rw-r--r--contrib/gnunet_identity_gtk_namespace_manager.glade (renamed from contrib/gnunet_fs_gtk_namespace_manager.glade)0
-rw-r--r--src/fs/Makefile.am4
-rw-r--r--src/fs/gnunet-fs-gtk.c4
-rw-r--r--src/identity/gnunet-identity-gtk_namespace_manager.c (renamed from src/fs/gnunet-fs-gtk_namespace_manager.c)0
-rw-r--r--src/identity/gnunet-identity-gtk_namespace_manager.h (renamed from src/fs/gnunet-fs-gtk_namespace_manager.h)0
8 files changed, 100 insertions, 253 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 2d7f0be2..ce1c8034 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -30,7 +30,6 @@ pkgdata_DATA = \
30 gnunet_fs_gtk_about_window.glade \ 30 gnunet_fs_gtk_about_window.glade \
31 gnunet_fs_gtk_download_as_dialog.glade \ 31 gnunet_fs_gtk_download_as_dialog.glade \
32 gnunet_fs_gtk_main_window.glade \ 32 gnunet_fs_gtk_main_window.glade \
33 gnunet_fs_gtk_namespace_manager.glade \
34 gnunet_fs_gtk_edit_publication.glade \ 33 gnunet_fs_gtk_edit_publication.glade \
35 gnunet_fs_gtk_open_directory_dialog.glade \ 34 gnunet_fs_gtk_open_directory_dialog.glade \
36 gnunet_fs_gtk_open_url_dialog.glade \ 35 gnunet_fs_gtk_open_url_dialog.glade \
@@ -39,12 +38,12 @@ pkgdata_DATA = \
39 gnunet_fs_gtk_publish_file_dialog.glade \ 38 gnunet_fs_gtk_publish_file_dialog.glade \
40 gnunet_fs_gtk_publish_tab.glade \ 39 gnunet_fs_gtk_publish_tab.glade \
41 gnunet_fs_gtk_search_tab.glade \ 40 gnunet_fs_gtk_search_tab.glade \
42 gnunet_fs_gtk_select_pseudonym_dialog.glade \
43 gnunet_fs_gtk_unindex.glade \ 41 gnunet_fs_gtk_unindex.glade \
44 gnunet_fs_gtk_progress_dialog.glade \ 42 gnunet_fs_gtk_progress_dialog.glade \
45 gnunet_gtk_status_bar_menu.glade \ 43 gnunet_gtk_status_bar_menu.glade \
46 gnunet_identity_gtk_create_ego_dialog.glade \ 44 gnunet_identity_gtk_create_ego_dialog.glade \
47 gnunet_identity_gtk_organizer_ego_dialog.glade \ 45 gnunet_identity_gtk_organize_ego_dialog.glade \
46 gnunet_identity_gtk_namespace_manager.glade \
48 gnunet_peerinfo_gtk_about_window.glade \ 47 gnunet_peerinfo_gtk_about_window.glade \
49 gnunet_peerinfo_gtk_main_window.glade \ 48 gnunet_peerinfo_gtk_main_window.glade \
50 gnunet_statistics_gtk_about_window.glade \ 49 gnunet_statistics_gtk_about_window.glade \
diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index 402f25da..4065685d 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -1,6 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy toplevel-contextual -->
4 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment"> 5 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
5 <property name="upper">100</property> 6 <property name="upper">100</property>
6 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -139,65 +140,6 @@
139 <property name="can_focus">False</property> 140 <property name="can_focus">False</property>
140 <property name="stock">gtk-go-down</property> 141 <property name="stock">gtk-go-down</property>
141 </object> 142 </object>
142 <object class="GtkImage" id="find_and_replace_stock_image">
143 <property name="visible">True</property>
144 <property name="can_focus">False</property>
145 <property name="stock">gtk-find-and-replace</property>
146 </object>
147 <object class="GtkImage" id="find_stock_image">
148 <property name="visible">True</property>
149 <property name="can_focus">False</property>
150 <property name="stock">gtk-find</property>
151 </object>
152 <object class="GtkImage" id="index_stock_image">
153 <property name="visible">True</property>
154 <property name="can_focus">False</property>
155 <property name="stock">gtk-index</property>
156 </object>
157 <object class="GtkListStore" id="main_window_search_mime_liststore">
158 <columns>
159 <!-- column-name MIME -->
160 <column type="gchararray"/>
161 <!-- column-name Type -->
162 <column type="gchararray"/>
163 <!-- column-name Extension -->
164 <column type="gchararray"/>
165 <!-- column-name Lossyness -->
166 <column type="gchararray"/>
167 <!-- column-name Freedom -->
168 <column type="gchararray"/>
169 </columns>
170 <data>
171 <row>
172 <col id="0"> </col>
173 <col id="1" translatable="yes">Any</col>
174 <col id="2" translatable="yes"> </col>
175 <col id="3" translatable="yes"> </col>
176 <col id="4" translatable="yes"> </col>
177 </row>
178 <row>
179 <col id="0">plain/text</col>
180 <col id="1" translatable="yes">Text</col>
181 <col id="2">txt</col>
182 <col id="3" translatable="yes">N/A</col>
183 <col id="4" translatable="yes">N/A</col>
184 </row>
185 <row>
186 <col id="0">application/zip</col>
187 <col id="1" translatable="yes">Zip</col>
188 <col id="2">zip</col>
189 <col id="3" translatable="yes">lossless</col>
190 <col id="4" translatable="yes">free</col>
191 </row>
192 <row>
193 <col id="0">audio/mpeg</col>
194 <col id="1" translatable="yes">MPEG audio</col>
195 <col id="2">mp3, mp2, mpeg</col>
196 <col id="3" translatable="yes">lossy</col>
197 <col id="4" translatable="yes">non-free</col>
198 </row>
199 </data>
200 </object>
201 <object class="GtkWindow" id="GNUNET_GTK_main_window"> 143 <object class="GtkWindow" id="GNUNET_GTK_main_window">
202 <property name="can_focus">False</property> 144 <property name="can_focus">False</property>
203 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> 145 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
@@ -321,36 +263,6 @@
321 </object> 263 </object>
322 </child> 264 </child>
323 <child> 265 <child>
324 <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_main_menu_file_sep2">
325 <property name="visible">True</property>
326 <property name="can_focus">False</property>
327 </object>
328 </child>
329 <child>
330 <object class="GtkImageMenuItem" id="GNUNET_GTK_main_menu_file_manage_pseudonyms">
331 <property name="label" translatable="yes">_Manage namespaces</property>
332 <property name="visible">True</property>
333 <property name="can_focus">False</property>
334 <property name="tooltip_text" translatable="yes">Opens namespace manager dialog to adjust the list of namespaces you want to search in, as well as get detailed information about all discovered namespaces.</property>
335 <property name="use_underline">True</property>
336 <property name="image">find_and_replace_stock_image</property>
337 <property name="use_stock">False</property>
338 <signal name="activate" handler="GNUNET_GTK_main_menu_file_manage_pseudonyms_activate_cb" swapped="no"/>
339 </object>
340 </child>
341 <child>
342 <object class="GtkImageMenuItem" id="GNUNET_GTK_main_menu_file_organize_namespaces">
343 <property name="label" translatable="yes">Organize _your own namespaces</property>
344 <property name="visible">True</property>
345 <property name="can_focus">False</property>
346 <property name="tooltip_text" translatable="yes">Opens namespace organizer dialog to adjust the list of your own namespaces and select the one that you will publish in.</property>
347 <property name="use_underline">True</property>
348 <property name="image">index_stock_image</property>
349 <property name="use_stock">False</property>
350 <signal name="activate" handler="GNUNET_GTK_main_menu_file_organize_namespaces_activate_cb" swapped="no"/>
351 </object>
352 </child>
353 <child>
354 <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_main_menu_file_sep3"> 266 <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_main_menu_file_sep3">
355 <property name="visible">True</property> 267 <property name="visible">True</property>
356 <property name="can_focus">False</property> 268 <property name="can_focus">False</property>
@@ -973,9 +885,9 @@
973 <object class="GtkTreeView" id="GNUNET_GTK_main_window_metadata_treeview"> 885 <object class="GtkTreeView" id="GNUNET_GTK_main_window_metadata_treeview">
974 <property name="visible">True</property> 886 <property name="visible">True</property>
975 <property name="can_focus">True</property> 887 <property name="can_focus">True</property>
888 <property name="model">GNUNET_GTK_meta_data_list_store</property>
976 <property name="hadjustment">adjustment1</property> 889 <property name="hadjustment">adjustment1</property>
977 <property name="vadjustment">adjustment2</property> 890 <property name="vadjustment">adjustment2</property>
978 <property name="model">GNUNET_GTK_meta_data_list_store</property>
979 <property name="search_column">0</property> 891 <property name="search_column">0</property>
980 <property name="rubber_banding">True</property> 892 <property name="rubber_banding">True</property>
981 <property name="enable_grid_lines">both</property> 893 <property name="enable_grid_lines">both</property>
@@ -1039,6 +951,26 @@
1039 </object> 951 </object>
1040 </child> 952 </child>
1041 </object> 953 </object>
954 <object class="GtkAdjustment" id="expiration_year_adjustment">
955 <property name="upper">9999</property>
956 <property name="step_increment">1</property>
957 <property name="page_increment">10</property>
958 </object>
959 <object class="GtkImage" id="find_and_replace_stock_image">
960 <property name="visible">True</property>
961 <property name="can_focus">False</property>
962 <property name="stock">gtk-find-and-replace</property>
963 </object>
964 <object class="GtkImage" id="find_stock_image">
965 <property name="visible">True</property>
966 <property name="can_focus">False</property>
967 <property name="stock">gtk-find</property>
968 </object>
969 <object class="GtkImage" id="index_stock_image">
970 <property name="visible">True</property>
971 <property name="can_focus">False</property>
972 <property name="stock">gtk-index</property>
973 </object>
1042 <object class="GtkTreeStore" id="main_window_search_namespace_treestore"> 974 <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
1043 <columns> 975 <columns>
1044 <!-- column-name Name --> 976 <!-- column-name Name -->
@@ -1064,6 +996,79 @@
1064 </object> 996 </object>
1065 </child> 997 </child>
1066 </object> 998 </object>
999 <object class="GtkSizeGroup" id="GNUNET_FS_GTK_download_frame_vsize_group">
1000 <property name="mode">vertical</property>
1001 <property name="ignore_hidden">True</property>
1002 <widgets>
1003 <widget name="GNUNET_GTK_search_frame_download_location_label"/>
1004 <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
1005 <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
1006 <widget name="GNUNET_GTK_search_frame_download_location_chooser"/>
1007 <widget name="GNUNET_GTK_search_frame_download_filename_entry"/>
1008 <widget name="GNUNET_GTK_search_frame_download_filename_change_button"/>
1009 <widget name="main_window_download_anonymity_combobox_alignment"/>
1010 <widget name="GNUNET_GTK_search_frame_download_recursive_checkbox"/>
1011 </widgets>
1012 </object>
1013 <object class="GtkSizeGroup" id="GNUNET_GTK_download_frame_labels_size_group">
1014 <widgets>
1015 <widget name="GNUNET_GTK_search_frame_download_location_label"/>
1016 <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
1017 <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
1018 </widgets>
1019 </object>
1020 <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
1021 <property name="mode">vertical</property>
1022 <widgets>
1023 <widget name="main_window_search_entry"/>
1024 <widget name="main_window_search_anonymity_combobox"/>
1025 <widget name="main_window_search_mime_combobox"/>
1026 </widgets>
1027 </object>
1028 <object class="GtkListStore" id="main_window_search_mime_liststore">
1029 <columns>
1030 <!-- column-name MIME -->
1031 <column type="gchararray"/>
1032 <!-- column-name Type -->
1033 <column type="gchararray"/>
1034 <!-- column-name Extension -->
1035 <column type="gchararray"/>
1036 <!-- column-name Lossyness -->
1037 <column type="gchararray"/>
1038 <!-- column-name Freedom -->
1039 <column type="gchararray"/>
1040 </columns>
1041 <data>
1042 <row>
1043 <col id="0"> </col>
1044 <col id="1" translatable="yes">Any</col>
1045 <col id="2" translatable="yes"> </col>
1046 <col id="3" translatable="yes"> </col>
1047 <col id="4" translatable="yes"> </col>
1048 </row>
1049 <row>
1050 <col id="0">plain/text</col>
1051 <col id="1" translatable="yes">Text</col>
1052 <col id="2">txt</col>
1053 <col id="3" translatable="yes">N/A</col>
1054 <col id="4" translatable="yes">N/A</col>
1055 </row>
1056 <row>
1057 <col id="0">application/zip</col>
1058 <col id="1" translatable="yes">Zip</col>
1059 <col id="2">zip</col>
1060 <col id="3" translatable="yes">lossless</col>
1061 <col id="4" translatable="yes">free</col>
1062 </row>
1063 <row>
1064 <col id="0">audio/mpeg</col>
1065 <col id="1" translatable="yes">MPEG audio</col>
1066 <col id="2">mp3, mp2, mpeg</col>
1067 <col id="3" translatable="yes">lossy</col>
1068 <col id="4" translatable="yes">non-free</col>
1069 </row>
1070 </data>
1071 </object>
1067 <object class="GtkWindow" id="namespace_selector_window"> 1072 <object class="GtkWindow" id="namespace_selector_window">
1068 <property name="can_focus">False</property> 1073 <property name="can_focus">False</property>
1069 <property name="events">GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property> 1074 <property name="events">GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
@@ -1129,7 +1134,6 @@
1129 <child> 1134 <child>
1130 <object class="GtkButton" id="namespace_selector_manage_namespaces_button"> 1135 <object class="GtkButton" id="namespace_selector_manage_namespaces_button">
1131 <property name="label" translatable="yes">_Manage namespaces</property> 1136 <property name="label" translatable="yes">_Manage namespaces</property>
1132 <property name="visible">True</property>
1133 <property name="can_focus">True</property> 1137 <property name="can_focus">True</property>
1134 <property name="receives_default">False</property> 1138 <property name="receives_default">False</property>
1135 <property name="use_underline">True</property> 1139 <property name="use_underline">True</property>
@@ -1154,40 +1158,6 @@
1154 <property name="can_focus">False</property> 1158 <property name="can_focus">False</property>
1155 <property name="stock">gtk-open</property> 1159 <property name="stock">gtk-open</property>
1156 </object> 1160 </object>
1157 <object class="GtkSizeGroup" id="GNUNET_GTK_download_frame_labels_size_group">
1158 <widgets>
1159 <widget name="GNUNET_GTK_search_frame_download_location_label"/>
1160 <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
1161 <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
1162 </widgets>
1163 </object>
1164 <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
1165 <property name="mode">vertical</property>
1166 <widgets>
1167 <widget name="main_window_search_entry"/>
1168 <widget name="main_window_search_anonymity_combobox"/>
1169 <widget name="main_window_search_mime_combobox"/>
1170 </widgets>
1171 </object>
1172 <object class="GtkSizeGroup" id="GNUNET_FS_GTK_download_frame_vsize_group">
1173 <property name="mode">vertical</property>
1174 <property name="ignore_hidden">True</property>
1175 <widgets>
1176 <widget name="GNUNET_GTK_search_frame_download_location_label"/>
1177 <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
1178 <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
1179 <widget name="GNUNET_GTK_search_frame_download_location_chooser"/>
1180 <widget name="GNUNET_GTK_search_frame_download_filename_entry"/>
1181 <widget name="GNUNET_GTK_search_frame_download_filename_change_button"/>
1182 <widget name="main_window_download_anonymity_combobox_alignment"/>
1183 <widget name="GNUNET_GTK_search_frame_download_recursive_checkbox"/>
1184 </widgets>
1185 </object>
1186 <object class="GtkAdjustment" id="expiration_year_adjustment">
1187 <property name="upper">9999</property>
1188 <property name="step_increment">1</property>
1189 <property name="page_increment">10</property>
1190 </object>
1191 <object class="GtkAdjustment" id="priority_adjustment"> 1161 <object class="GtkAdjustment" id="priority_adjustment">
1192 <property name="upper">10000000</property> 1162 <property name="upper">10000000</property>
1193 <property name="value">1000</property> 1163 <property name="value">1000</property>
diff --git a/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade b/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
deleted file mode 100644
index 898e9e5e..00000000
--- a/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
+++ /dev/null
@@ -1,120 +0,0 @@
1<?xml version="1.0"?>
2<interface>
3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy toplevel-contextual -->
5 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
6 <columns>
7 <!-- column-name namespace_name -->
8 <column type="gchararray"/>
9 <!-- column-name namespace_handle -->
10 <column type="gpointer"/>
11 </columns>
12 </object>
13 <object class="GtkAdjustment" id="adjustment1">
14 <property name="upper">100</property>
15 <property name="step_increment">1</property>
16 <property name="page_increment">10</property>
17 <property name="page_size">10</property>
18 </object>
19 <object class="GtkAdjustment" id="adjustment2">
20 <property name="upper">100</property>
21 <property name="step_increment">1</property>
22 <property name="page_increment">10</property>
23 <property name="page_size">10</property>
24 </object>
25 <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
26 <property name="border_width">5</property>
27 <property name="title" translatable="yes">Select pseudonym...</property>
28 <property name="modal">True</property>
29 <property name="type_hint">normal</property>
30 <signal name="response" handler="GNUNET_GTK_select_pseudonym_dialog_response_cb"/>
31 <signal name="delete_event" handler="GNUNET_GTK_select_pseudonym_dialog_delete_event_cb"/>
32 <child internal-child="vbox">
33 <object class="GtkVBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox">
34 <property name="visible">True</property>
35 <property name="orientation">vertical</property>
36 <property name="spacing">2</property>
37 <child>
38 <object class="GtkScrolledWindow" id="GNUNET_GTK_select_pseudonym_scrolledwindow">
39 <property name="visible">True</property>
40 <property name="can_focus">True</property>
41 <property name="hadjustment">adjustment1</property>
42 <property name="vadjustment">adjustment2</property>
43 <child>
44 <object class="GtkTreeView" id="GNUNET_GTK_select_pseudonym_tree_view">
45 <property name="visible">True</property>
46 <property name="can_focus">True</property>
47 <property name="model">GNUNET_GTK_select_pseudonym_liststore</property>
48 <property name="hadjustment">adjustment1</property>
49 <property name="vadjustment">adjustment2</property>
50 <child>
51 <object class="GtkTreeViewColumn" id="GNUNET_GTK_select_pseudonym_tree_view_column">
52 <property name="title">Name</property>
53 <property name="expand">True</property>
54 <property name="clickable">True</property>
55 <property name="reorderable">True</property>
56 <property name="sort_indicator">True</property>
57 <property name="sort_column_id">0</property>
58 <child>
59 <object class="GtkCellRendererText" id="GNUNET_GTK_select_pseudonym_name_renderer"/>
60 <attributes>
61 <attribute name="text">0</attribute>
62 </attributes>
63 </child>
64 </object>
65 </child>
66 </object>
67 </child>
68 </object>
69 <packing>
70 <property name="position">1</property>
71 </packing>
72 </child>
73 <child internal-child="action_area">
74 <object class="GtkHButtonBox" id="GNUNET_GTK_select_pseudonym_dialog_action_area">
75 <property name="visible">True</property>
76 <property name="layout_style">end</property>
77 <child>
78 <object class="GtkButton" id="GNUNET_GTK_select_pseudonym_cancel_button">
79 <property name="label">gtk-cancel</property>
80 <property name="visible">True</property>
81 <property name="can_focus">True</property>
82 <property name="receives_default">True</property>
83 <property name="use_stock">True</property>
84 </object>
85 <packing>
86 <property name="expand">False</property>
87 <property name="fill">False</property>
88 <property name="position">0</property>
89 </packing>
90 </child>
91 <child>
92 <object class="GtkButton" id="GNUNET_GTK_select_pseudonym_ok_button">
93 <property name="label">gtk-ok</property>
94 <property name="visible">True</property>
95 <property name="sensitive">False</property>
96 <property name="can_focus">True</property>
97 <property name="receives_default">True</property>
98 <property name="use_stock">True</property>
99 </object>
100 <packing>
101 <property name="expand">False</property>
102 <property name="fill">False</property>
103 <property name="position">1</property>
104 </packing>
105 </child>
106 </object>
107 <packing>
108 <property name="expand">False</property>
109 <property name="pack_type">end</property>
110 <property name="position">0</property>
111 </packing>
112 </child>
113 </object>
114 </child>
115 <action-widgets>
116 <action-widget response="-6">GNUNET_GTK_select_pseudonym_cancel_button</action-widget>
117 <action-widget response="-5">GNUNET_GTK_select_pseudonym_ok_button</action-widget>
118 </action-widgets>
119 </object>
120</interface>
diff --git a/contrib/gnunet_fs_gtk_namespace_manager.glade b/contrib/gnunet_identity_gtk_namespace_manager.glade
index df805f1b..df805f1b 100644
--- a/contrib/gnunet_fs_gtk_namespace_manager.glade
+++ b/contrib/gnunet_identity_gtk_namespace_manager.glade
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 39c8d98e..d17d5dd2 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -28,9 +28,7 @@ gnunet_fs_gtk_SOURCES = \
28 gnunet-fs-gtk_open-uri.c gnunet-fs-gtk_open-uri.h \ 28 gnunet-fs-gtk_open-uri.c gnunet-fs-gtk_open-uri.h \
29 gnunet-fs-gtk_unindex.c gnunet-fs-gtk_unindex.h \ 29 gnunet-fs-gtk_unindex.c gnunet-fs-gtk_unindex.h \
30 gnunet-fs-gtk_publish-dialog.c \ 30 gnunet-fs-gtk_publish-dialog.c \
31 gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \ 31 gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h
32 gnunet-fs-gtk_namespace_manager.c \
33 gnunet-fs-gtk_namespace_manager.h
34 32
35gnunet_fs_gtk_LDADD = \ 33gnunet_fs_gtk_LDADD = \
36 $(top_builddir)/src/lib/libgnunetgtk.la \ 34 $(top_builddir)/src/lib/libgnunetgtk.la \
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index ef5e03a7..2ce26bf0 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -1,10 +1,10 @@
1/* 1/*
2 This file is part of GNUnet. 2 This file is part of GNUnet.
3 (C) 2010, 2012 Christian Grothoff (and other contributing authors) 3 (C) 2010-2013 Christian Grothoff (and other contributing authors)
4 4
5 GNUnet is free software; you can redistribute it and/or modify 5 GNUnet is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published 6 it under the terms of the GNU General Public License as published
7 by the Free Software Foundation; either version 2, or (at your 7 by the Free Software Foundation; either version 3, or (at your
8 option) any later version. 8 option) any later version.
9 9
10 GNUnet is distributed in the hope that it will be useful, but 10 GNUnet is distributed in the hope that it will be useful, but
diff --git a/src/fs/gnunet-fs-gtk_namespace_manager.c b/src/identity/gnunet-identity-gtk_namespace_manager.c
index ca4a14c5..ca4a14c5 100644
--- a/src/fs/gnunet-fs-gtk_namespace_manager.c
+++ b/src/identity/gnunet-identity-gtk_namespace_manager.c
diff --git a/src/fs/gnunet-fs-gtk_namespace_manager.h b/src/identity/gnunet-identity-gtk_namespace_manager.h
index cffa6894..cffa6894 100644
--- a/src/fs/gnunet-fs-gtk_namespace_manager.h
+++ b/src/identity/gnunet-identity-gtk_namespace_manager.h