diff options
author | Christian Grothoff <christian@grothoff.org> | 2006-04-02 04:14:43 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2006-04-02 04:14:43 +0000 |
commit | b6f4c5d502bfa20aa8b0c1da81da326027dcf0a9 (patch) | |
tree | b9c8103c6864bc976462663c61fd7156e0178f95 | |
parent | 890516b21d815b74b489bc0250a87aeabd43ca65 (diff) | |
download | gnunet-gtk-b6f4c5d502bfa20aa8b0c1da81da326027dcf0a9.tar.gz gnunet-gtk-b6f4c5d502bfa20aa8b0c1da81da326027dcf0a9.zip |
sync
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | README | 15 | ||||
-rw-r--r-- | TODO | 2 | ||||
-rw-r--r-- | src/plugins/fs/namespace.c | 6 | ||||
-rw-r--r-- | src/plugins/fs/search.c | 62 | ||||
-rw-r--r-- | src/plugins/fs/upload.c | 20 |
6 files changed, 54 insertions, 54 deletions
@@ -1,3 +1,6 @@ | |||
1 | Sat Apr 1 16:24:27 PST 2006 | ||
2 | Improved shutdown code. | ||
3 | |||
1 | Sat Mar 25 10:14:44 PST 2006 | 4 | Sat Mar 25 10:14:44 PST 2006 |
2 | Adding .desktop support. | 5 | Adding .desktop support. |
3 | 6 | ||
@@ -2,24 +2,15 @@ This is the GNUnet GTK user interface. In order to compile or run | |||
2 | this code, you need to first install the main GNUnet codebase. | 2 | this code, you need to first install the main GNUnet codebase. |
3 | 3 | ||
4 | Then you may need to tell configure where the GNUnet installation | 4 | Then you may need to tell configure where the GNUnet installation |
5 | is located: | 5 | is located. The following command will install gnunet-gtk in the |
6 | $HOME directory. | ||
6 | 7 | ||
7 | $ ./configure --prefix=$HOME --with-gnunet=$GNUNET_PREFIX | 8 | $ ./configure --prefix=$HOME --with-gnunet=$GNUNET_PREFIX |
8 | 9 | ||
9 | gnunet-gtk requires GTK 2.6 or higher and libglade 2.5.1 or higher. | 10 | gnunet-gtk requires GTK 2.6 or higher and libglade 2.5.1 or higher. |
10 | glade-2.10 is used to edit the UI. Debian users please note that | 11 | glade-2.10 is used to edit the UI. Debian users please note that |
11 | these versions are currently only available in experimental (!). | 12 | these versions are currently only available in unstable. |
12 | 13 | ||
13 | This software is currently alpha quality: | ||
14 | * we're using glade for the first time | ||
15 | * we're shipping gnunet-gtk seperately from GNUnet | ||
16 | for the first time | ||
17 | * the UI code was largely rewritten | ||
18 | * the GNUnet core was largely rewritten | ||
19 | |||
20 | So, please don't expect everything to just work and report bugs (or | ||
21 | better, send patches :-)). | ||
22 | |||
23 | 14 | ||
24 | Stay tuned | 15 | Stay tuned |
25 | ========== | 16 | ========== |
@@ -10,7 +10,7 @@ | |||
10 | - highlight active downloads in search list [ easy ] | 10 | - highlight active downloads in search list [ easy ] |
11 | 11 | ||
12 | 0.7.2: | 12 | 0.7.2: |
13 | - various minor memory leaks (see FIXME in search.c, | 13 | - various minor memory leaks (see |
14 | #if 0 code in namespace.c) | 14 | #if 0 code in namespace.c) |
15 | 15 | ||
16 | 0.7.3: | 16 | 0.7.3: |
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c index 176dc5fe..2322d2fa 100644 --- a/src/plugins/fs/namespace.c +++ b/src/plugins/fs/namespace.c | |||
@@ -265,7 +265,11 @@ static void clearContentList(void * mdl) { | |||
265 | -1); | 265 | -1); |
266 | ECRS_freeUri(uri); | 266 | ECRS_freeUri(uri); |
267 | ECRS_freeMetaData(meta); | 267 | ECRS_freeMetaData(meta); |
268 | 268 | gtk_list_store_set(GTK_LIST_STORE(model), | |
269 | &iter, | ||
270 | NAMESPACE_URI, NULL, | ||
271 | NAMESPACE_META, NULL, | ||
272 | -1); | ||
269 | } while (gtk_list_store_remove(GTK_LIST_STORE(model), | 273 | } while (gtk_list_store_remove(GTK_LIST_STORE(model), |
270 | &iter)); | 274 | &iter)); |
271 | } | 275 | } |
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c index 9985c4c3..e06a9204 100644 --- a/src/plugins/fs/search.c +++ b/src/plugins/fs/search.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2005 Christian Grothoff (and other contributing authors) | 3 | (C) 2005, 2006 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 |
@@ -192,8 +192,6 @@ static void freeIterSubtree(GtkTreeModel * tree, | |||
192 | freeIterSubtree(tree, &child); | 192 | freeIterSubtree(tree, &child); |
193 | } while (gtk_tree_model_iter_next(tree, | 193 | } while (gtk_tree_model_iter_next(tree, |
194 | iter)); | 194 | iter)); |
195 | |||
196 | |||
197 | } | 195 | } |
198 | 196 | ||
199 | /** | 197 | /** |
@@ -1025,6 +1023,36 @@ void fs_search_start() { | |||
1025 | NULL); | 1023 | NULL); |
1026 | } | 1024 | } |
1027 | 1025 | ||
1026 | static void freeSearchModel(GtkTreeModel * model, | ||
1027 | GtkTreeIter * parent) { | ||
1028 | struct ECRS_URI * u; | ||
1029 | struct ECRS_MetaData * m; | ||
1030 | GtkTreeIter iter; | ||
1031 | |||
1032 | if (gtk_tree_model_iter_children(model, | ||
1033 | &iter, | ||
1034 | parent)) { | ||
1035 | do { | ||
1036 | gtk_tree_model_get(model, | ||
1037 | &iter, | ||
1038 | SEARCH_URI, &u, | ||
1039 | SEARCH_META, &m, | ||
1040 | -1); | ||
1041 | gtk_tree_store_set(GTK_TREE_STORE(model), | ||
1042 | &iter, | ||
1043 | SEARCH_URI, NULL, | ||
1044 | SEARCH_META, NULL, | ||
1045 | -1); | ||
1046 | if (u != NULL) | ||
1047 | ECRS_freeUri(u); | ||
1048 | if (m != NULL) | ||
1049 | ECRS_freeMetaData(m); | ||
1050 | freeSearchModel(model, &iter); | ||
1051 | } while (gtk_tree_model_iter_next(model, | ||
1052 | &iter)); | ||
1053 | } | ||
1054 | } | ||
1055 | |||
1028 | void fs_search_stop() { | 1056 | void fs_search_stop() { |
1029 | SearchList * list; | 1057 | SearchList * list; |
1030 | GtkTreeIter iter; | 1058 | GtkTreeIter iter; |
@@ -1037,33 +1065,7 @@ void fs_search_stop() { | |||
1037 | list = head; | 1065 | list = head; |
1038 | head = head->next; | 1066 | head = head->next; |
1039 | ECRS_freeUri(list->uri); | 1067 | ECRS_freeUri(list->uri); |
1040 | 1068 | freeSearchModel(list->model, NULL); | |
1041 | #if 0 | ||
1042 | /* FIXME - memory leak. The following is still incorrect; | ||
1043 | it does not free entire tree (need to recurse!) | ||
1044 | */ | ||
1045 | if (gtk_tree_model_get_iter_first(head->model, | ||
1046 | &iter)) { | ||
1047 | struct ECRS_MetaData * m; | ||
1048 | do { | ||
1049 | gtk_tree_model_get(head->model, | ||
1050 | &iter, | ||
1051 | SEARCH_URI, &u, | ||
1052 | SEARCH_META, &m, | ||
1053 | -1); | ||
1054 | gtk_tree_store_set(GTK_TREE_STORE(head->model), | ||
1055 | &iter, | ||
1056 | SEARCH_URI, NULL, | ||
1057 | SEARCH_META, NULL, | ||
1058 | -1); | ||
1059 | if (u != NULL) | ||
1060 | ECRS_freeUri(u); | ||
1061 | if (m != NULL) | ||
1062 | ECRS_freeMetaData(m); | ||
1063 | } while (gtk_tree_model_iter_next(head->model, | ||
1064 | &iter)); | ||
1065 | } | ||
1066 | #endif | ||
1067 | FREE(list); | 1069 | FREE(list); |
1068 | } | 1070 | } |
1069 | 1071 | ||
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c index 034bc6f8..202f8253 100644 --- a/src/plugins/fs/upload.c +++ b/src/plugins/fs/upload.c | |||
@@ -502,19 +502,19 @@ void fs_upload_start() { | |||
502 | "value", UPLOAD_PROGRESS, | 502 | "value", UPLOAD_PROGRESS, |
503 | NULL); | 503 | NULL); |
504 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(uploadList), | 504 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(uploadList), |
505 | col - 1), | 505 | col - 1), |
506 | TRUE); | 506 | TRUE); |
507 | renderer = gtk_cell_renderer_text_new(); | 507 | renderer = gtk_cell_renderer_text_new(); |
508 | col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList), | 508 | col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList), |
509 | -1, | 509 | -1, |
510 | _("URI"), | 510 | _("URI"), |
511 | renderer, | 511 | renderer, |
512 | "text", UPLOAD_URISTRING, | 512 | "text", UPLOAD_URISTRING, |
513 | NULL); | 513 | NULL); |
514 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(uploadList), | 514 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(uploadList), |
515 | col - 1), | 515 | col - 1), |
516 | TRUE); | 516 | TRUE); |
517 | 517 | ||
518 | uploadEntry | 518 | uploadEntry |
519 | = glade_xml_get_widget(getMainXML(), | 519 | = glade_xml_get_widget(getMainXML(), |
520 | "uploadFilenameComboBoxEntry"); | 520 | "uploadFilenameComboBoxEntry"); |