[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18861 - gnunet-gtk/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18861 - gnunet-gtk/src/fs |
Date: |
Sat, 31 Dec 2011 00:45:36 +0100 |
Author: grothoff
Date: 2011-12-31 00:45:36 +0100 (Sat, 31 Dec 2011)
New Revision: 18861
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
gnunet-gtk/src/fs/gnunet-fs-gtk-download.c
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_publish.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
Log:
-LRN: utf8-ize gnunet-gtk - #2049 - remove loc conversion except for extractor,
as gnunet core already does it
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-common.c 2011-12-30 23:13:56 UTC (rev
18860)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-common.c 2011-12-30 23:45:36 UTC (rev
18861)
@@ -60,9 +60,9 @@
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);
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-download.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-download.c 2011-12-30 23:13:56 UTC (rev
18860)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-download.c 2011-12-30 23:45:36 UTC (rev
18861)
@@ -74,7 +74,7 @@
}
GNUNET_free_non_null (dc->filename);
dc->filename =
- GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (dlc->dialog));
+ GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER
(dlc->dialog));
dc->is_recursive =
(TRUE ==
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cb))) ? GNUNET_YES :
@@ -167,8 +167,7 @@
(builder, "GNUNET_GTK_save_as_dialog"));
if (dc->filename != NULL)
{
- char buf[1024];
- char *buf_utf8;
+ char buf[FILENAME_MAX];
if (NULL != getcwd (buf, sizeof (buf)))
{
@@ -177,12 +176,7 @@
strcat (buf, DIR_SEPARATOR_STR);
strcat (buf, dc->filename);
}
- buf_utf8 = GNUNET_GTK_from_loc_to_utf8 (buf);
- if (buf_utf8 != NULL)
- {
- gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), buf_utf8);
- GNUNET_free (buf_utf8);
- }
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), buf);
}
}
dlc = g_new0 (struct dialog_context, 1);
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c 2011-12-30 23:13:56 UTC
(rev 18860)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c 2011-12-30 23:45:36 UTC
(rev 18861)
@@ -546,7 +546,6 @@
GtkTreeIter iter;
GtkTreePath *path;
struct SearchResult *srp;
- gchar *filename_utf8;
if (de == NULL)
{
@@ -586,15 +585,13 @@
return de;
}
gtk_tree_path_free (path);
- filename_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) filename);
gtk_tree_store_set (de->ts, &iter, 4,
(guint) ((size >
0) ? (100 * completed /
size) : 100) /* progress */ ,
- 6, filename_utf8 /* filename/description */ ,
+ 6, filename /* filename/description */ ,
8, "blue" /* status colour: pending */ ,
-1);
- GNUNET_free_non_null (filename_utf8);
return de;
}
@@ -1637,7 +1634,6 @@
GtkWidget *close_button;
GtkNotebook *notebook;
char *size_fancy;
- char *fn_utf8 = NULL;
if (NULL == parent)
{
@@ -1705,12 +1701,10 @@
ent = GNUNET_malloc (sizeof (struct PublishEntry));
ent->is_top = (parent == NULL) ? GNUNET_YES : GNUNET_NO;
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, 1, size_fancy, 2, "white", 3,
(guint) 0 /* progress */ ,
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);
ent->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (publish_tab->ts),
path);
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-30
23:13:56 UTC (rev 18860)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2011-12-30
23:45:36 UTC (rev 18861)
@@ -49,15 +49,10 @@
{
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,
+ gtk_list_store_insert_with_values (ls, &iter, -1, 0, name, 1,
GNUNET_FS_namespace_create
(GNUNET_FS_GTK_get_fs_handle (), name),
-1);
- GNUNET_free_non_null (name_utf8);
}
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-30 23:13:56 UTC (rev 18860)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
2011-12-30 23:45:36 UTC (rev 18861)
@@ -32,7 +32,6 @@
gpointer user_data)
{
const char *name;
- gchar *name_loc;
struct GNUNET_FS_Namespace *ns;
GtkWidget *ad;
GtkBuilder *builder;
@@ -53,12 +52,10 @@
(builder,
"GNUNET_GTK_create_namespace_name_entry")));
/* FIXME: show busy dialog while doing key creation */
- name_loc = GNUNET_GTK_from_utf8_to_loc ((char *) name);
- if (NULL != name_loc)
+ if (NULL != name)
{
- ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), name_loc);
+ ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), name);
GNUNET_FS_namespace_delete (ns, GNUNET_NO);
- GNUNET_free (name_loc);
}
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
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-30
23:13:56 UTC (rev 18860)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2011-12-30
23:45:36 UTC (rev 18861)
@@ -205,7 +205,6 @@
GtkTreePath *path;
uint64_t file_size;
const char *short_fn;
- char *short_fn_utf8;
struct GNUNET_CONTAINER_MetaData *meta;
struct GNUNET_FS_Uri *ksk_uri;
GtkTreeStore *ts;
@@ -243,11 +242,10 @@
short_fn = filename;
while (NULL != (ss = strstr (short_fn, DIR_SEPARATOR_STR)))
short_fn = 1 + ss;
- short_fn_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) short_fn);
GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet-gtk>",
EXTRACTOR_METATYPE_FILENAME,
EXTRACTOR_METAFORMAT_UTF8, "text/plain",
- short_fn_utf8, strlen (short_fn_utf8) +
1);
+ short_fn, strlen (short_fn) + 1);
ksk_uri = GNUNET_FS_uri_ksk_create_from_meta_data (meta);
gtk_tree_store_insert_before (ts, &pos, iter, NULL);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts), &pos);
@@ -264,9 +262,8 @@
else
file_size_fancy = GNUNET_STRINGS_byte_size_fancy (file_size);
gtk_tree_store_set (ts, &pos, 0, file_size_fancy, 1, (gboolean) do_index, 2,
- short_fn_utf8, 3, (guint) bo->anonymity_level, 4,
+ short_fn, 3, (guint) bo->anonymity_level, 4,
(guint) bo->content_priority, 5, fi, -1);
- GNUNET_free_non_null (short_fn_utf8);
GNUNET_free (file_size_fancy);
update_selectivity (data);
}
@@ -503,7 +500,6 @@
GNUNET_HashCode hc;
const char *short_fn;
const char *ss;
- char *short_fn_utf8;
adc->dir_entry_count++;
pd = GNUNET_malloc (sizeof (struct PublishData));
@@ -515,12 +511,10 @@
short_fn = filename;
while (NULL != (ss = strstr (short_fn, DIR_SEPARATOR_STR)))
short_fn = 1 + ss;
- short_fn_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",
- short_fn, strlen (short_fn_utf8) + 1);
- GNUNET_free_non_null (short_fn_utf8);
+ short_fn, strlen (short_fn) + 1);
gtk_tree_store_insert_before (adc->ts, &pd->iter, adc->parent, NULL);
GNUNET_CRYPTO_hash (filename, strlen (filename), &hc);
@@ -578,7 +572,6 @@
struct GNUNET_FS_Uri *kill_ksk;
const char *ss;
const char *short_fn;
- char *short_fn_utf8;
struct stat sbuf;
if (0 != STAT (filename, &sbuf))
@@ -630,11 +623,9 @@
short_fn = filename;
while (NULL != (ss = strstr (short_fn, DIR_SEPARATOR_STR)))
short_fn = 1 + ss;
- short_fn_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) short_fn);
gtk_tree_store_set (ts, iter, 0, file_size_fancy, 1, (gboolean) do_index, 2,
- short_fn_utf8, 3, (guint) bo->anonymity_level, 4,
+ short_fn, 3, (guint) bo->anonymity_level, 4,
(guint) bo->content_priority, 5, fi, -1);
- GNUNET_free_non_null (short_fn_utf8);
GNUNET_free (file_size_fancy);
}
@@ -1397,7 +1388,7 @@
(builder, "GNUNET_GTK_publish_directory_dialog"));
if (response_id == -5)
{
- filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (ad));
+ filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER
(ad));
sb = GTK_SPIN_BUTTON (gtk_builder_get_object
(builder,
"GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
@@ -1621,15 +1612,13 @@
GtkTreeStore *ts = cls;
struct UpdateableContext uc;
GtkTreeIter iter;
- gchar *name_utf8;
uc.parent = &iter;
uc.namespace_name = name;
uc.ts = ts;
uc.ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), name);
uc.update_called = GNUNET_NO;
- name_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) name);
- gtk_tree_store_insert_with_values (ts, &iter, NULL, G_MAXINT, 0, name_utf8,
1,
+ gtk_tree_store_insert_with_values (ts, &iter, NULL, G_MAXINT, 0, name, 1,
uc.ns, 2, NULL /* last-id */ ,
3, NULL /* last-uri (as string!) */ ,
4, NULL /* meta */ ,
@@ -1638,7 +1627,6 @@
7, TRUE /* update editable */ ,
8, TRUE /* current editable */ ,
-1);
- GNUNET_free_non_null (name_utf8);
uc.seen = GNUNET_CONTAINER_multihashmap_create (128);
GNUNET_FS_namespace_list_updateable (uc.ns, NULL, &add_updateable_to_ts,
&uc);
GNUNET_CONTAINER_multihashmap_destroy (uc.seen);
@@ -1861,7 +1849,7 @@
(builder,
"GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
- filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (ad));
+ filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER
(ad));
add_file_at_iter (user_data, filename, &bo, do_index, NULL);
g_free (filename);
update_selectivity (user_data);
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-30 23:13:56 UTC (rev 18860)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
2011-12-30 23:45:36 UTC (rev 18861)
@@ -92,7 +92,7 @@
{
GtkBuilder *builder;
GtkWidget *ad;
- char *filename, *filename_utf8;
+ char *filename;
struct AddChildContext acc;
builder = GTK_BUILDER (user_data);
@@ -106,15 +106,12 @@
return;
}
- filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (ad));
- filename_utf8 =
- GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (ad));
+ filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (ad));
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
- acc.filename = filename_utf8;
+ acc.filename = filename;
acc.ts = NULL;
GNUNET_FS_GTK_mmap_and_scan (filename, &add_child, &acc);
- g_free (filename_utf8);
g_free (filename);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18861 - gnunet-gtk/src/fs,
gnunet <=