diff options
author | Christian Grothoff <christian@grothoff.org> | 2008-07-29 18:02:36 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2008-07-29 18:02:36 +0000 |
commit | ea031bfd782151a584ee2af07db201b693d97d2f (patch) | |
tree | 49b6a2053f5ac94d0c3addc29b4b74c30fd906cf | |
parent | df9ac9bd08bb8507bd6e416f2f509f37c7113a90 (diff) | |
download | gnunet-gtk-ea031bfd782151a584ee2af07db201b693d97d2f.tar.gz gnunet-gtk-ea031bfd782151a584ee2af07db201b693d97d2f.zip |
fixes
-rw-r--r-- | TODO | 3 | ||||
-rw-r--r-- | gnunet-gtk.glade | 2 | ||||
-rw-r--r-- | src/plugins/fs/fs.c | 23 | ||||
-rw-r--r-- | src/plugins/fs/namespace_create.c | 3 | ||||
-rw-r--r-- | src/plugins/fs/namespace_search.c | 2 | ||||
-rw-r--r-- | src/plugins/fs/search.c | 20 |
6 files changed, 43 insertions, 10 deletions
@@ -1,6 +1,9 @@ | |||
1 | This is just the current plan, plans change. | 1 | This is just the current plan, plans change. |
2 | 2 | ||
3 | 0.8.1 [8'08] (aka "growth"): | 3 | 0.8.1 [8'08] (aka "growth"): |
4 | - bugs: | ||
5 | * manual entry of namespace name in search tab does not | ||
6 | work (results in global search) | ||
4 | - improve collection handling | 7 | - improve collection handling |
5 | * show content of current collection somewhere | 8 | * show content of current collection somewhere |
6 | * add 'publish now' button / menu entry | 9 | * add 'publish now' button / menu entry |
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade index ffd04bf3..f4807526 100644 --- a/gnunet-gtk.glade +++ b/gnunet-gtk.glade | |||
@@ -1005,6 +1005,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea | |||
1005 | <property name="adjustment">1 0 999999 1 10 10</property> | 1005 | <property name="adjustment">1 0 999999 1 10 10</property> |
1006 | <property name="climb_rate">1</property> | 1006 | <property name="climb_rate">1</property> |
1007 | <property name="numeric">True</property> | 1007 | <property name="numeric">True</property> |
1008 | <signal name="value_changed" handler="on_anonymity_spin_changed_"/> | ||
1008 | </widget> | 1009 | </widget> |
1009 | <packing> | 1010 | <packing> |
1010 | <property name="expand">False</property> | 1011 | <property name="expand">False</property> |
@@ -1602,6 +1603,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea | |||
1602 | <property name="adjustment">1 0 10000 1 10 10</property> | 1603 | <property name="adjustment">1 0 10000 1 10 10</property> |
1603 | <property name="climb_rate">1</property> | 1604 | <property name="climb_rate">1</property> |
1604 | <property name="numeric">True</property> | 1605 | <property name="numeric">True</property> |
1606 | <signal name="value_changed" handler="on_anonymity_spin_changed_"/> | ||
1605 | </widget> | 1607 | </widget> |
1606 | </child> | 1608 | </child> |
1607 | </widget> | 1609 | </widget> |
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c index c3aa10ed..b9506106 100644 --- a/src/plugins/fs/fs.c +++ b/src/plugins/fs/fs.c | |||
@@ -82,7 +82,8 @@ void | |||
82 | on_anonymity_spin_changed_fs (GtkWidget * w, gpointer dummy) | 82 | on_anonymity_spin_changed_fs (GtkWidget * w, gpointer dummy) |
83 | { | 83 | { |
84 | gint val; | 84 | gint val; |
85 | GdkColor color; | 85 | GdkColor bcolor; |
86 | GdkColor fcolor; | ||
86 | GtkSpinButton *spin; | 87 | GtkSpinButton *spin; |
87 | 88 | ||
88 | spin = GTK_SPIN_BUTTON (w); | 89 | spin = GTK_SPIN_BUTTON (w); |
@@ -95,15 +96,23 @@ on_anonymity_spin_changed_fs (GtkWidget * w, gpointer dummy) | |||
95 | if (val == 0) | 96 | if (val == 0) |
96 | { | 97 | { |
97 | if ((TRUE == gdk_color_parse ("red", | 98 | if ((TRUE == gdk_color_parse ("red", |
98 | &color)) && | 99 | &bcolor)) && |
99 | (TRUE == gdk_colormap_alloc_color (gdk_colormap_get_system (), | 100 | (TRUE == gdk_colormap_alloc_color (gdk_colormap_get_system (), |
100 | &color, FALSE, TRUE))) | 101 | &bcolor, FALSE, TRUE)) && |
101 | gtk_widget_modify_base (w, GTK_STATE_NORMAL, &color); | 102 | (TRUE == gdk_color_parse ("black", |
103 | &fcolor)) && | ||
104 | (TRUE == gdk_colormap_alloc_color (gdk_colormap_get_system (), | ||
105 | &fcolor, FALSE, TRUE))) | ||
106 | { | ||
107 | gtk_widget_modify_base (w, GTK_STATE_NORMAL, &bcolor); | ||
108 | gtk_widget_modify_text (w, GTK_STATE_NORMAL, &fcolor); | ||
109 | } | ||
102 | } | 110 | } |
103 | else | 111 | else |
104 | gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL); | 112 | { |
105 | 113 | gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL); | |
106 | 114 | gtk_widget_modify_text (w, GTK_STATE_NORMAL, NULL); | |
115 | } | ||
107 | } | 116 | } |
108 | 117 | ||
109 | static void * | 118 | static void * |
diff --git a/src/plugins/fs/namespace_create.c b/src/plugins/fs/namespace_create.c index 5df9b5b2..9738c7ea 100644 --- a/src/plugins/fs/namespace_create.c +++ b/src/plugins/fs/namespace_create.c | |||
@@ -270,7 +270,8 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2) | |||
270 | gtk_widget_destroy (dialog); | 270 | gtk_widget_destroy (dialog); |
271 | } | 271 | } |
272 | GNUNET_meta_data_destroy (meta); | 272 | GNUNET_meta_data_destroy (meta); |
273 | GNUNET_ECRS_uri_destroy (keywordURI); | 273 | if (keywordURI != NULL) |
274 | GNUNET_ECRS_uri_destroy (keywordURI); | ||
274 | } | 275 | } |
275 | gtk_widget_destroy (dialog); | 276 | gtk_widget_destroy (dialog); |
276 | UNREF (metaXML); | 277 | UNREF (metaXML); |
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c index 3dbf7862..0385a68b 100644 --- a/src/plugins/fs/namespace_search.c +++ b/src/plugins/fs/namespace_search.c | |||
@@ -184,6 +184,8 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy, | |||
184 | } | 184 | } |
185 | else | 185 | else |
186 | { | 186 | { |
187 | /* FIXME: may still be namespace selected -- | ||
188 | where user manually entered NS name! */ | ||
187 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0); | 189 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0); |
188 | gtk_widget_set_sensitive (spin, FALSE); | 190 | gtk_widget_set_sensitive (spin, FALSE); |
189 | } | 191 | } |
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c index 73c5052f..deff31da 100644 --- a/src/plugins/fs/search.c +++ b/src/plugins/fs/search.c | |||
@@ -76,10 +76,21 @@ updateResultsCount (SearchList * searchContext) | |||
76 | searchContext->searchString, | 76 | searchContext->searchString, |
77 | strlen (searchContext->searchString) > 20 ? "..." : "", | 77 | strlen (searchContext->searchString) > 20 ? "..." : "", |
78 | searchContext->resultsReceived); | 78 | searchContext->resultsReceived); |
79 | if (new_title == NULL) | ||
80 | new_title = | ||
81 | g_strdup_printf (_("invalid characters (%u)"), | ||
82 | searchContext->resultsReceived); | ||
79 | label = GTK_LABEL (glade_xml_get_widget (searchContext->labelXML, | 83 | label = GTK_LABEL (glade_xml_get_widget (searchContext->labelXML, |
80 | "searchTabLabel")); | 84 | "searchTabLabel")); |
81 | gtk_label_set (label, new_title); | 85 | if (new_title != NULL) |
82 | GNUNET_free (new_title); | 86 | { |
87 | gtk_label_set (label, new_title); | ||
88 | GNUNET_free (new_title); | ||
89 | } | ||
90 | else | ||
91 | { | ||
92 | gtk_label_set (label, _("Internal error")); | ||
93 | } | ||
83 | } | 94 | } |
84 | 95 | ||
85 | static GdkPixbuf * | 96 | static GdkPixbuf * |
@@ -1154,6 +1165,11 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton) | |||
1154 | if (nsName != NULL) | 1165 | if (nsName != NULL) |
1155 | free (nsName); | 1166 | free (nsName); |
1156 | } | 1167 | } |
1168 | else | ||
1169 | { | ||
1170 | /* FIXME: may still be namespace-search | ||
1171 | -- where user manually entered NS name*/ | ||
1172 | } | ||
1157 | if (fsss.uri == NULL) | 1173 | if (fsss.uri == NULL) |
1158 | fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString); | 1174 | fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString); |
1159 | if (fsss.uri == NULL) | 1175 | if (fsss.uri == NULL) |