update

author: Christian Grothoff <christian@grothoff.org> 2005-06-19 16:14:32 +0000
committer: Christian Grothoff <christian@grothoff.org> 2005-06-19 16:14:32 +0000
commit: 7cb7ccf6b1b35f959ba1f49bd451ed4714b015ed (patch)
tree: 0f650fdcefdfc9baf7b889c1784f18539700b26c /src/upload.c
parent: 44b596fcc39b411b455954eabdf348de8ac11550 (diff)
download: gnunet-gtk-7cb7ccf6b1b35f959ba1f49bd451ed4714b015ed.tar.gz
gnunet-gtk-7cb7ccf6b1b35f959ba1f49bd451ed4714b015ed.zip
1 files changed, 55 insertions, 55 deletions
diff --git a/src/upload.c b/src/upload.c
index d8bf831c..18ac7c73 100644
--- a/src/upload.c
+++ b/src/upload.c
@@ -61,12 +61,12 @@ void displayUploadUpdate(const char * mainName,
    do {        
      gtk_tree_model_get(GTK_TREE_MODEL(summary),
                         &iter,
-                         0, &name,
+                         UPLOAD_FILENAME, &name,
                         -1);
      if (0 == strcmp(name, filename)) {
        gtk_tree_store_set(GTK_TREE_STORE(summary),
                           &iter,
-                           1, progress,
+                           UPLOAD_PROGRESS, progress,
                           -1);
        return;     
      }
@@ -77,12 +77,12 @@ void displayUploadUpdate(const char * mainName,
          do {  
            gtk_tree_model_get(GTK_TREE_MODEL(summary),
                               &child,
-                               0, &name,
+                               UPLOAD_FILENAME, &name,
                               -1);
            if (0 == strcmp(name, filename)) {
              gtk_tree_store_set(GTK_TREE_STORE(summary),
                                 &child,
-                                 1, progress,
+                                 UPLOAD_PROGRESS, progress,
                                 -1);
              return;
            }
@@ -94,9 +94,9 @@ void displayUploadUpdate(const char * mainName,
                              &iter);
        gtk_tree_store_set(GTK_TREE_STORE(summary),
                           &child,
-                           0, filename,
+                           UPLOAD_FILENAME, filename,
-                           1, progress,
+                           UPLOAD_PROGRESS, progress,
-                           2, NULL,
+                           UPLOAD_URISTRING, NULL,
                           -1);
        return;
      }    
@@ -110,18 +110,18 @@ void displayUploadUpdate(const char * mainName,
                          NULL);
    gtk_tree_store_set(GTK_TREE_STORE(summary),
                       &iter,
-                       0, mainName,
+                       UPLOAD_FILENAME, mainName,
-                       1, 0,
+                       UPLOAD_PROGRESS, 0,
-                       2, NULL,
+                       UPLOAD_URISTRING, NULL,
                       -1);
    gtk_tree_store_append(GTK_TREE_STORE(summary),
                          &child,
                          &iter);
    gtk_tree_store_set(GTK_TREE_STORE(summary),
                       &child,
-                       0, filename,
+                       UPLOAD_FILENAME, filename,
-                       1, progress,
+                       UPLOAD_PROGRESS, progress,
-                       2, NULL,
+                       UPLOAD_URISTRING, NULL,
                       -1);
  } else {
    gtk_tree_store_append(GTK_TREE_STORE(summary),
@@ -129,9 +129,9 @@ void displayUploadUpdate(const char * mainName,
                          NULL);
    gtk_tree_store_set(GTK_TREE_STORE(summary),
                       &iter,
-                       0, filename,
+                       UPLOAD_FILENAME, filename,
-                       1, progress,
+                       UPLOAD_PROGRESS, progress,
-                       2, NULL,
+                       UPLOAD_URISTRING, NULL,
                       -1);
  }
 }
@@ -153,13 +153,13 @@ void displayUploadComplete(const char * mainName,
    do {        
      gtk_tree_model_get(GTK_TREE_MODEL(summary),
                         &iter,
-                         0, &name,
+                         UPLOAD_FILENAME, &name,
                         -1);
      if (0 == strcmp(name, filename)) {
        gtk_tree_store_set(GTK_TREE_STORE(summary),
                           &iter,
-                           1, 100,
+                           UPLOAD_PROGRESS, 100,
-                           2, us,
+                           UPLOAD_URISTRING, us,
                           -1);
        FREE(us);
        return;     
@@ -171,13 +171,13 @@ void displayUploadComplete(const char * mainName,
          do {  
            gtk_tree_model_get(GTK_TREE_MODEL(summary),
                               &child,
-                               0, &name,
+                               UPLOAD_FILENAME, &name,
                               -1);
            if (0 == strcmp(name, filename)) {
              gtk_tree_store_set(GTK_TREE_STORE(summary),
                                 &child,
-                                 1, 100,
+                                 UPLOAD_PROGRESS, 100,
-                                 2, us,
+                                 UPLOAD_URISTRING, us,
                                 -1);
              FREE(us);
              return;
@@ -190,9 +190,9 @@ void displayUploadComplete(const char * mainName,
                              &iter);
        gtk_tree_store_set(GTK_TREE_STORE(summary),
                           &child,
-                           0, filename,
+                           UPLOAD_FILENAME, filename,
-                           1, 100,
+                           UPLOAD_PROGRESS, 100,
-                           2, us,
+                           UPLOAD_URISTRING, us,
                           -1);
        FREE(us);
        return;
@@ -207,18 +207,18 @@ void displayUploadComplete(const char * mainName,
                          NULL);
    gtk_tree_store_set(GTK_TREE_STORE(summary),
                       &iter,
-                       0, mainName,
+                       UPLOAD_FILENAME, mainName,
-                       1, 0,
+                       UPLOAD_PROGRESS, 0,
-                       2, NULL,
+                       UPLOAD_URISTRING, NULL,
                       -1);
    gtk_tree_store_append(GTK_TREE_STORE(summary),
                          &child,
                          &iter);
    gtk_tree_store_set(GTK_TREE_STORE(summary),
                       &iter,
-                       0, filename,
+                       UPLOAD_FILENAME, filename,
-                       1, 100,
+                       UPLOAD_PROGRESS, 100,
-                       2, NULL,
+                       UPLOAD_URISTRING, NULL,
                       -1);
  } else {
    gtk_tree_store_append(GTK_TREE_STORE(summary),
@@ -226,9 +226,9 @@ void displayUploadComplete(const char * mainName,
                          NULL);
    gtk_tree_store_set(GTK_TREE_STORE(summary),
                       &iter,
-                       0, filename,
+                       UPLOAD_FILENAME, filename,
-                       1, 100,
+                       UPLOAD_PROGRESS, 100,
-                       2, us,
+                       UPLOAD_URISTRING, us,
                       -1);
  }
  FREE(us);
@@ -246,9 +246,9 @@ static int publishMetaData(EXTRACTOR_KeywordType type,
                        &iter);
  gtk_list_store_set(store,
                     &iter,
-                     0, type,
+                     META_TYPE, type,
-                     1, stype,
+                     META_STYPE, stype,
-                     2, data,
+                     META_VALUE, data,
                     -1);
  return OK;
 }
@@ -340,16 +340,16 @@ void on_metaDataDialogMetaDataAddButton_clicked(gpointer dummy,
    return; /* oops */
  gtk_tree_model_get(GTK_TREE_MODEL(typemodel),
                     &iter,
-                     0, &stype,
+                     META_STYPE, &stype,
-                     1, &type,
+                     META_TYPE, &type,
                     -1);  
  gtk_list_store_append(metamodel,
                        &iter);
  gtk_list_store_set(metamodel,
                     &iter,
-                     0, type,
+                     META_TYPE, type,
-                     1, stype,
+                     META_STYPE, stype,
-                     2, value,
+                     META_VALUE, value,
                     -1); 
  gtk_entry_set_text(GTK_ENTRY(entryLine), "");
 }
@@ -410,7 +410,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
  dialog = glade_xml_get_widget(metaXML,
                                "metaDataDialog");
  metamodel
-    = gtk_list_store_new(3,
+    = gtk_list_store_new(META_NUM,
                         G_TYPE_INT,
                         G_TYPE_STRING,
                         G_TYPE_STRING);
@@ -421,14 +421,14 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
                                              -1,
                                              _("Category"),
                                              renderer,
-                                              "text", 1,
+                                              "text", META_STYPE,
                                              NULL);
  renderer = gtk_cell_renderer_text_new();
  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
                                              -1,
                                              _("Value"),
                                              renderer,
-                                              "text", 2,
+                                              "text", META_VALUE,
                                              NULL);
  gtk_tree_view_set_model(GTK_TREE_VIEW(metaList),
                          GTK_TREE_MODEL(metamodel));
@@ -467,7 +467,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
                          (ECRS_KeywordIterator) &publishKeyword,
                          keymodel);
  keywordTypeModel
-    = gtk_list_store_new(2,
+    = gtk_list_store_new(KTYPE_NUM,
                         G_TYPE_STRING,
                         G_TYPE_INT);
  metaType = glade_xml_get_widget(metaXML,
@@ -480,8 +480,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
                          &iter);
    gtk_list_store_set(keywordTypeModel,
                       &iter,
-                       0, stype,
+                       KTYPE_STRING, stype,
-                       1, type,
+                       KTYPE_TYPE, type,
                       -1); 
  }
  renderer = gtk_cell_renderer_text_new();
@@ -490,7 +490,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
                             FALSE);
  gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(metaType),
                                renderer,
-                                "text", 0);
+                                "text", KTYPE_STRING);
  gtk_combo_box_set_active(GTK_COMBO_BOX(metaType),
                           0);
  gtk_dialog_set_default_response(GTK_DIALOG(dialog),
@@ -538,8 +538,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
      do {      
        gtk_tree_model_get(GTK_TREE_MODEL(metamodel),
                           &iter,
-                           0, &type,
+                           META_TYPE, &type,
-                           2, &mvalue,
+                           META_VALUE, &mvalue,
                           -1);
        ECRS_addToMetaData(meta,
                           type,
@@ -722,7 +722,7 @@ void fs_upload_start() {
  uploadList = glade_xml_get_widget(mainXML,
                                    "activeUploadsList");
  summary =
-    gtk_tree_store_new(3,
+    gtk_tree_store_new(UPLOAD_NUM,
                       G_TYPE_STRING, /* filename */
                       G_TYPE_INT,    /* progress */
                       G_TYPE_STRING);  /* URI (as string) - after completion */
@@ -733,15 +733,15 @@ void fs_upload_start() {
                                              -1,
                                              _("Filename"),
                                              renderer,
-                                              "text", 0,
+                                              "text", UPLOAD_FILENAME,
-                                              "value", 1,
+                                              "value", UPLOAD_PROGRESS,
                                              NULL);
  renderer = gtk_cell_renderer_text_new();
  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList),
                                              -1,
                                              _("URI"),
                                              renderer,
-                                              "text", 2,
+                                              "text", UPLOAD_URISTRING,
                                              NULL);
author	Christian Grothoff <christian@grothoff.org>	2005-06-19 16:14:32 +0000
committer	Christian Grothoff <christian@grothoff.org>	2005-06-19 16:14:32 +0000
commit	7cb7ccf6b1b35f959ba1f49bd451ed4714b015ed (patch)
tree	0f650fdcefdfc9baf7b889c1784f18539700b26c /src/upload.c
parent	44b596fcc39b411b455954eabdf348de8ac11550 (diff)
download	gnunet-gtk-7cb7ccf6b1b35f959ba1f49bd451ed4714b015ed.tar.gz gnunet-gtk-7cb7ccf6b1b35f959ba1f49bd451ed4714b015ed.zip

diff --git a/src/upload.c b/src/upload.c index d8bf831c..18ac7c73 100644 --- a/src/upload.c +++ b/src/upload.c
@@ -61,12 +61,12 @@ void displayUploadUpdate(const char * mainName,
61	do {	61	do {
62	gtk_tree_model_get(GTK_TREE_MODEL(summary),	62	gtk_tree_model_get(GTK_TREE_MODEL(summary),
63	&iter,	63	&iter,
64	0, &name,	64	UPLOAD_FILENAME, &name,
65	-1);	65	-1);
66	if (0 == strcmp(name, filename)) {	66	if (0 == strcmp(name, filename)) {
67	gtk_tree_store_set(GTK_TREE_STORE(summary),	67	gtk_tree_store_set(GTK_TREE_STORE(summary),
68	&iter,	68	&iter,
69	1, progress,	69	UPLOAD_PROGRESS, progress,
70	-1);	70	-1);
71	return;	71	return;
72	}	72	}
@@ -77,12 +77,12 @@ void displayUploadUpdate(const char * mainName,
77	do {	77	do {
78	gtk_tree_model_get(GTK_TREE_MODEL(summary),	78	gtk_tree_model_get(GTK_TREE_MODEL(summary),
79	&child,	79	&child,
80	0, &name,	80	UPLOAD_FILENAME, &name,
81	-1);	81	-1);
82	if (0 == strcmp(name, filename)) {	82	if (0 == strcmp(name, filename)) {
83	gtk_tree_store_set(GTK_TREE_STORE(summary),	83	gtk_tree_store_set(GTK_TREE_STORE(summary),
84	&child,	84	&child,
85	1, progress,	85	UPLOAD_PROGRESS, progress,
86	-1);	86	-1);
87	return;	87	return;
88	}	88	}
@@ -94,9 +94,9 @@ void displayUploadUpdate(const char * mainName,
94	&iter);	94	&iter);
95	gtk_tree_store_set(GTK_TREE_STORE(summary),	95	gtk_tree_store_set(GTK_TREE_STORE(summary),
96	&child,	96	&child,
97	0, filename,	97	UPLOAD_FILENAME, filename,
98	1, progress,	98	UPLOAD_PROGRESS, progress,
99	2, NULL,	99	UPLOAD_URISTRING, NULL,
100	-1);	100	-1);
101	return;	101	return;
102	}	102	}
@@ -110,18 +110,18 @@ void displayUploadUpdate(const char * mainName,
110	NULL);	110	NULL);
111	gtk_tree_store_set(GTK_TREE_STORE(summary),	111	gtk_tree_store_set(GTK_TREE_STORE(summary),
112	&iter,	112	&iter,
113	0, mainName,	113	UPLOAD_FILENAME, mainName,
114	1, 0,	114	UPLOAD_PROGRESS, 0,
115	2, NULL,	115	UPLOAD_URISTRING, NULL,
116	-1);	116	-1);
117	gtk_tree_store_append(GTK_TREE_STORE(summary),	117	gtk_tree_store_append(GTK_TREE_STORE(summary),
118	&child,	118	&child,
119	&iter);	119	&iter);
120	gtk_tree_store_set(GTK_TREE_STORE(summary),	120	gtk_tree_store_set(GTK_TREE_STORE(summary),
121	&child,	121	&child,
122	0, filename,	122	UPLOAD_FILENAME, filename,
123	1, progress,	123	UPLOAD_PROGRESS, progress,
124	2, NULL,	124	UPLOAD_URISTRING, NULL,
125	-1);	125	-1);
126	} else {	126	} else {
127	gtk_tree_store_append(GTK_TREE_STORE(summary),	127	gtk_tree_store_append(GTK_TREE_STORE(summary),
@@ -129,9 +129,9 @@ void displayUploadUpdate(const char * mainName,
129	NULL);	129	NULL);
130	gtk_tree_store_set(GTK_TREE_STORE(summary),	130	gtk_tree_store_set(GTK_TREE_STORE(summary),
131	&iter,	131	&iter,
132	0, filename,	132	UPLOAD_FILENAME, filename,
133	1, progress,	133	UPLOAD_PROGRESS, progress,
134	2, NULL,	134	UPLOAD_URISTRING, NULL,
135	-1);	135	-1);
136	}	136	}
137	}	137	}
@@ -153,13 +153,13 @@ void displayUploadComplete(const char * mainName,
153	do {	153	do {
154	gtk_tree_model_get(GTK_TREE_MODEL(summary),	154	gtk_tree_model_get(GTK_TREE_MODEL(summary),
155	&iter,	155	&iter,
156	0, &name,	156	UPLOAD_FILENAME, &name,
157	-1);	157	-1);
158	if (0 == strcmp(name, filename)) {	158	if (0 == strcmp(name, filename)) {
159	gtk_tree_store_set(GTK_TREE_STORE(summary),	159	gtk_tree_store_set(GTK_TREE_STORE(summary),
160	&iter,	160	&iter,
161	1, 100,	161	UPLOAD_PROGRESS, 100,
162	2, us,	162	UPLOAD_URISTRING, us,
163	-1);	163	-1);
164	FREE(us);	164	FREE(us);
165	return;	165	return;
@@ -171,13 +171,13 @@ void displayUploadComplete(const char * mainName,
171	do {	171	do {
172	gtk_tree_model_get(GTK_TREE_MODEL(summary),	172	gtk_tree_model_get(GTK_TREE_MODEL(summary),
173	&child,	173	&child,
174	0, &name,	174	UPLOAD_FILENAME, &name,
175	-1);	175	-1);
176	if (0 == strcmp(name, filename)) {	176	if (0 == strcmp(name, filename)) {
177	gtk_tree_store_set(GTK_TREE_STORE(summary),	177	gtk_tree_store_set(GTK_TREE_STORE(summary),
178	&child,	178	&child,
179	1, 100,	179	UPLOAD_PROGRESS, 100,
180	2, us,	180	UPLOAD_URISTRING, us,
181	-1);	181	-1);
182	FREE(us);	182	FREE(us);
183	return;	183	return;
@@ -190,9 +190,9 @@ void displayUploadComplete(const char * mainName,
190	&iter);	190	&iter);
191	gtk_tree_store_set(GTK_TREE_STORE(summary),	191	gtk_tree_store_set(GTK_TREE_STORE(summary),
192	&child,	192	&child,
193	0, filename,	193	UPLOAD_FILENAME, filename,
194	1, 100,	194	UPLOAD_PROGRESS, 100,
195	2, us,	195	UPLOAD_URISTRING, us,
196	-1);	196	-1);
197	FREE(us);	197	FREE(us);
198	return;	198	return;
@@ -207,18 +207,18 @@ void displayUploadComplete(const char * mainName,
207	NULL);	207	NULL);
208	gtk_tree_store_set(GTK_TREE_STORE(summary),	208	gtk_tree_store_set(GTK_TREE_STORE(summary),
209	&iter,	209	&iter,
210	0, mainName,	210	UPLOAD_FILENAME, mainName,
211	1, 0,	211	UPLOAD_PROGRESS, 0,
212	2, NULL,	212	UPLOAD_URISTRING, NULL,
213	-1);	213	-1);
214	gtk_tree_store_append(GTK_TREE_STORE(summary),	214	gtk_tree_store_append(GTK_TREE_STORE(summary),
215	&child,	215	&child,
216	&iter);	216	&iter);
217	gtk_tree_store_set(GTK_TREE_STORE(summary),	217	gtk_tree_store_set(GTK_TREE_STORE(summary),
218	&iter,	218	&iter,
219	0, filename,	219	UPLOAD_FILENAME, filename,
220	1, 100,	220	UPLOAD_PROGRESS, 100,
221	2, NULL,	221	UPLOAD_URISTRING, NULL,
222	-1);	222	-1);
223	} else {	223	} else {
224	gtk_tree_store_append(GTK_TREE_STORE(summary),	224	gtk_tree_store_append(GTK_TREE_STORE(summary),
@@ -226,9 +226,9 @@ void displayUploadComplete(const char * mainName,
226	NULL);	226	NULL);
227	gtk_tree_store_set(GTK_TREE_STORE(summary),	227	gtk_tree_store_set(GTK_TREE_STORE(summary),
228	&iter,	228	&iter,
229	0, filename,	229	UPLOAD_FILENAME, filename,
230	1, 100,	230	UPLOAD_PROGRESS, 100,
231	2, us,	231	UPLOAD_URISTRING, us,
232	-1);	232	-1);
233	}	233	}
234	FREE(us);	234	FREE(us);
@@ -246,9 +246,9 @@ static int publishMetaData(EXTRACTOR_KeywordType type,
246	&iter);	246	&iter);
247	gtk_list_store_set(store,	247	gtk_list_store_set(store,
248	&iter,	248	&iter,
249	0, type,	249	META_TYPE, type,
250	1, stype,	250	META_STYPE, stype,
251	2, data,	251	META_VALUE, data,
252	-1);	252	-1);
253	return OK;	253	return OK;
254	}	254	}
@@ -340,16 +340,16 @@ void on_metaDataDialogMetaDataAddButton_clicked(gpointer dummy,
340	return; /* oops */	340	return; /* oops */
341	gtk_tree_model_get(GTK_TREE_MODEL(typemodel),	341	gtk_tree_model_get(GTK_TREE_MODEL(typemodel),
342	&iter,	342	&iter,
343	0, &stype,	343	META_STYPE, &stype,
344	1, &type,	344	META_TYPE, &type,
345	-1);	345	-1);
346	gtk_list_store_append(metamodel,	346	gtk_list_store_append(metamodel,
347	&iter);	347	&iter);
348	gtk_list_store_set(metamodel,	348	gtk_list_store_set(metamodel,
349	&iter,	349	&iter,
350	0, type,	350	META_TYPE, type,
351	1, stype,	351	META_STYPE, stype,
352	2, value,	352	META_VALUE, value,
353	-1);	353	-1);
354	gtk_entry_set_text(GTK_ENTRY(entryLine), "");	354	gtk_entry_set_text(GTK_ENTRY(entryLine), "");
355	}	355	}
@@ -410,7 +410,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
410	dialog = glade_xml_get_widget(metaXML,	410	dialog = glade_xml_get_widget(metaXML,
411	"metaDataDialog");	411	"metaDataDialog");
412	metamodel	412	metamodel
413	= gtk_list_store_new(3,	413	= gtk_list_store_new(META_NUM,
414	G_TYPE_INT,	414	G_TYPE_INT,
415	G_TYPE_STRING,	415	G_TYPE_STRING,
416	G_TYPE_STRING);	416	G_TYPE_STRING);
@@ -421,14 +421,14 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
421	-1,	421	-1,
422	_("Category"),	422	_("Category"),
423	renderer,	423	renderer,
424	"text", 1,	424	"text", META_STYPE,
425	NULL);	425	NULL);
426	renderer = gtk_cell_renderer_text_new();	426	renderer = gtk_cell_renderer_text_new();
427	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),	427	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
428	-1,	428	-1,
429	_("Value"),	429	_("Value"),
430	renderer,	430	renderer,
431	"text", 2,	431	"text", META_VALUE,
432	NULL);	432	NULL);
433	gtk_tree_view_set_model(GTK_TREE_VIEW(metaList),	433	gtk_tree_view_set_model(GTK_TREE_VIEW(metaList),
434	GTK_TREE_MODEL(metamodel));	434	GTK_TREE_MODEL(metamodel));
@@ -467,7 +467,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
467	(ECRS_KeywordIterator) &publishKeyword,	467	(ECRS_KeywordIterator) &publishKeyword,
468	keymodel);	468	keymodel);
469	keywordTypeModel	469	keywordTypeModel
470	= gtk_list_store_new(2,	470	= gtk_list_store_new(KTYPE_NUM,
471	G_TYPE_STRING,	471	G_TYPE_STRING,
472	G_TYPE_INT);	472	G_TYPE_INT);
473	metaType = glade_xml_get_widget(metaXML,	473	metaType = glade_xml_get_widget(metaXML,
@@ -480,8 +480,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
480	&iter);	480	&iter);
481	gtk_list_store_set(keywordTypeModel,	481	gtk_list_store_set(keywordTypeModel,
482	&iter,	482	&iter,
483	0, stype,	483	KTYPE_STRING, stype,
484	1, type,	484	KTYPE_TYPE, type,
485	-1);	485	-1);
486	}	486	}
487	renderer = gtk_cell_renderer_text_new();	487	renderer = gtk_cell_renderer_text_new();
@@ -490,7 +490,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
490	FALSE);	490	FALSE);
491	gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(metaType),	491	gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(metaType),
492	renderer,	492	renderer,
493	"text", 0);	493	"text", KTYPE_STRING);
494	gtk_combo_box_set_active(GTK_COMBO_BOX(metaType),	494	gtk_combo_box_set_active(GTK_COMBO_BOX(metaType),
495	0);	495	0);
496	gtk_dialog_set_default_response(GTK_DIALOG(dialog),	496	gtk_dialog_set_default_response(GTK_DIALOG(dialog),
@@ -538,8 +538,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
538	do {	538	do {
539	gtk_tree_model_get(GTK_TREE_MODEL(metamodel),	539	gtk_tree_model_get(GTK_TREE_MODEL(metamodel),
540	&iter,	540	&iter,
541	0, &type,	541	META_TYPE, &type,
542	2, &mvalue,	542	META_VALUE, &mvalue,
543	-1);	543	-1);
544	ECRS_addToMetaData(meta,	544	ECRS_addToMetaData(meta,
545	type,	545	type,
@@ -722,7 +722,7 @@ void fs_upload_start() {
722	uploadList = glade_xml_get_widget(mainXML,	722	uploadList = glade_xml_get_widget(mainXML,
723	"activeUploadsList");	723	"activeUploadsList");
724	summary =	724	summary =
725	gtk_tree_store_new(3,	725	gtk_tree_store_new(UPLOAD_NUM,
726	G_TYPE_STRING, /* filename */	726	G_TYPE_STRING, /* filename */
727	G_TYPE_INT, /* progress */	727	G_TYPE_INT, /* progress */
728	G_TYPE_STRING); /* URI (as string) - after completion */	728	G_TYPE_STRING); /* URI (as string) - after completion */
@@ -733,15 +733,15 @@ void fs_upload_start() {
733	-1,	733	-1,
734	_("Filename"),	734	_("Filename"),
735	renderer,	735	renderer,
736	"text", 0,	736	"text", UPLOAD_FILENAME,
737	"value", 1,	737	"value", UPLOAD_PROGRESS,
738	NULL);	738	NULL);
739	renderer = gtk_cell_renderer_text_new();	739	renderer = gtk_cell_renderer_text_new();
740	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList),	740	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList),
741	-1,	741	-1,
742	_("URI"),	742	_("URI"),
743	renderer,	743	renderer,
744	"text", 2,	744	"text", UPLOAD_URISTRING,
745	NULL);	745	NULL);
746		746
747		747