diff options
Diffstat (limited to 'src/plugins/fs/namespace.c')
-rw-r--r-- | src/plugins/fs/namespace.c | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c index 175f4f6a..a592ea1e 100644 --- a/src/plugins/fs/namespace.c +++ b/src/plugins/fs/namespace.c | |||
@@ -63,7 +63,7 @@ static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview, | |||
63 | 63 | ||
64 | namespaceXML | 64 | namespaceXML |
65 | = glade_xml_new(getGladeFileName(), | 65 | = glade_xml_new(getGladeFileName(), |
66 | "namespaceContentFrame", | 66 | "namespaceContentFrame", |
67 | PACKAGE_NAME); | 67 | PACKAGE_NAME); |
68 | connectGladeWithPlugins(namespaceXML); | 68 | connectGladeWithPlugins(namespaceXML); |
69 | window = glade_xml_get_widget(namespaceXML, | 69 | window = glade_xml_get_widget(namespaceXML, |
@@ -79,11 +79,11 @@ static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview, | |||
79 | G_TYPE_STRING, /* (file)name */ | 79 | G_TYPE_STRING, /* (file)name */ |
80 | G_TYPE_UINT64, /* size */ | 80 | G_TYPE_UINT64, /* size */ |
81 | G_TYPE_STRING, /* description */ | 81 | G_TYPE_STRING, /* description */ |
82 | G_TYPE_STRING, /* mime-type */ | 82 | G_TYPE_STRING, /* mime-type */ |
83 | G_TYPE_STRING, /* last-ID */ | 83 | G_TYPE_STRING, /* last-ID */ |
84 | G_TYPE_STRING, /* next-ID */ | 84 | G_TYPE_STRING, /* next-ID */ |
85 | G_TYPE_STRING, /* pub-freq */ | 85 | G_TYPE_STRING, /* pub-freq */ |
86 | G_TYPE_STRING, /* next pub date */ | 86 | G_TYPE_STRING, /* next pub date */ |
87 | G_TYPE_POINTER, /* URI */ | 87 | G_TYPE_POINTER, /* URI */ |
88 | G_TYPE_POINTER); /* META */ | 88 | G_TYPE_POINTER); /* META */ |
89 | gtk_tree_view_set_model(GTK_TREE_VIEW(resultList), | 89 | gtk_tree_view_set_model(GTK_TREE_VIEW(resultList), |
@@ -178,7 +178,7 @@ static int updateView(const ECRS_FileInfo * fi, | |||
178 | NAMESPACE_URI, &euri, | 178 | NAMESPACE_URI, &euri, |
179 | -1); | 179 | -1); |
180 | if (ECRS_equalsUri(euri, | 180 | if (ECRS_equalsUri(euri, |
181 | fi->uri)) | 181 | fi->uri)) |
182 | return OK; /* already listed */ | 182 | return OK; /* already listed */ |
183 | } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), | 183 | } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), |
184 | &iter)); | 184 | &iter)); |
@@ -194,9 +194,9 @@ static int updateView(const ECRS_FileInfo * fi, | |||
194 | EXTRACTOR_CREATOR, | 194 | EXTRACTOR_CREATOR, |
195 | EXTRACTOR_PRODUCER, | 195 | EXTRACTOR_PRODUCER, |
196 | EXTRACTOR_UNKNOWN, | 196 | EXTRACTOR_UNKNOWN, |
197 | -1); | 197 | -1); |
198 | if (filename == NULL) | 198 | if (filename == NULL) |
199 | filename = STRDUP(_("no name given")); | 199 | filename = STRDUP(_("no name given")); |
200 | if (ECRS_isFileUri(fi->uri)) | 200 | if (ECRS_isFileUri(fi->uri)) |
201 | size = ECRS_fileSize(fi->uri); | 201 | size = ECRS_fileSize(fi->uri); |
202 | else | 202 | else |
@@ -233,10 +233,10 @@ static void clearContentList(void * mdl) { | |||
233 | -1); | 233 | -1); |
234 | ECRS_freeUri(uri); | 234 | ECRS_freeUri(uri); |
235 | ECRS_freeMetaData(meta); | 235 | ECRS_freeMetaData(meta); |
236 | 236 | ||
237 | } while (gtk_list_store_remove(GTK_LIST_STORE(model), | 237 | } while (gtk_list_store_remove(GTK_LIST_STORE(model), |
238 | &iter)); | 238 | &iter)); |
239 | } | 239 | } |
240 | } | 240 | } |
241 | 241 | ||
242 | /** | 242 | /** |
@@ -303,9 +303,9 @@ static int addNamespaceContentToModel(void * cls, | |||
303 | EXTRACTOR_CREATOR, | 303 | EXTRACTOR_CREATOR, |
304 | EXTRACTOR_PRODUCER, | 304 | EXTRACTOR_PRODUCER, |
305 | EXTRACTOR_UNKNOWN, | 305 | EXTRACTOR_UNKNOWN, |
306 | -1); | 306 | -1); |
307 | if (filename == NULL) | 307 | if (filename == NULL) |
308 | filename = STRDUP(_("no name given")); | 308 | filename = STRDUP(_("no name given")); |
309 | desc = ECRS_getFirstFromMetaData(fi->meta, | 309 | desc = ECRS_getFirstFromMetaData(fi->meta, |
310 | EXTRACTOR_DESCRIPTION, | 310 | EXTRACTOR_DESCRIPTION, |
311 | EXTRACTOR_GENRE, | 311 | EXTRACTOR_GENRE, |
@@ -328,17 +328,17 @@ static int addNamespaceContentToModel(void * cls, | |||
328 | size = 0; | 328 | size = 0; |
329 | uriString = ECRS_uriToString(fi->uri); | 329 | uriString = ECRS_uriToString(fi->uri); |
330 | hash2enc(lastId, &last); | 330 | hash2enc(lastId, &last); |
331 | if (nextId != NULL) | 331 | if (nextId != NULL) |
332 | hash2enc(nextId, &next); | 332 | hash2enc(nextId, &next); |
333 | else | 333 | else |
334 | memset(&next, 0, sizeof(EncName)); | 334 | memset(&next, 0, sizeof(EncName)); |
335 | if (publicationFrequency == ECRS_SBLOCK_UPDATE_SPORADIC) | 335 | if (publicationFrequency == ECRS_SBLOCK_UPDATE_SPORADIC) |
336 | date = STRDUP(_("unspecified")); | 336 | date = STRDUP(_("unspecified")); |
337 | else if (publicationFrequency == ECRS_SBLOCK_UPDATE_NONE) | 337 | else if (publicationFrequency == ECRS_SBLOCK_UPDATE_NONE) |
338 | date = STRDUP(_("never")); | 338 | date = STRDUP(_("never")); |
339 | else | 339 | else |
340 | date = GN_CTIME(&nextPublicationTime); | 340 | date = GN_CTIME(&nextPublicationTime); |
341 | 341 | ||
342 | freq = updateIntervalToString(publicationFrequency); | 342 | freq = updateIntervalToString(publicationFrequency); |
343 | gtk_list_store_append(model, | 343 | gtk_list_store_append(model, |
344 | &iter); | 344 | &iter); |
@@ -445,14 +445,14 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
445 | connectGladeWithPlugins(metaXML); | 445 | connectGladeWithPlugins(metaXML); |
446 | dialog = glade_xml_get_widget(metaXML, | 446 | dialog = glade_xml_get_widget(metaXML, |
447 | "namespaceMetaDataDialog"); | 447 | "namespaceMetaDataDialog"); |
448 | createMetaDataListTreeView(metaXML, | 448 | createMetaDataListTreeView(metaXML, |
449 | "namespaceMetaDataDialogMetaDataList", | 449 | "namespaceMetaDataDialogMetaDataList", |
450 | NULL, | 450 | NULL, |
451 | NULL); | 451 | NULL); |
452 | createKeywordListTreeView(metaXML, | 452 | createKeywordListTreeView(metaXML, |
453 | "namespaceMetaDataDialogKeywordList", | 453 | "namespaceMetaDataDialogKeywordList", |
454 | NULL); | 454 | NULL); |
455 | createMetaTypeComboBox(metaXML, | 455 | createMetaTypeComboBox(metaXML, |
456 | "namespaceMetaDataDialogMetaTypeComboBox"); | 456 | "namespaceMetaDataDialogMetaTypeComboBox"); |
457 | gtk_dialog_set_default_response(GTK_DIALOG(dialog), | 457 | gtk_dialog_set_default_response(GTK_DIALOG(dialog), |
458 | GTK_RESPONSE_OK); | 458 | GTK_RESPONSE_OK); |
@@ -461,19 +461,19 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
461 | = getMetaDataFromList(metaXML, | 461 | = getMetaDataFromList(metaXML, |
462 | "namespaceMetaDataDialogMetaDataList", | 462 | "namespaceMetaDataDialogMetaDataList", |
463 | NULL); | 463 | NULL); |
464 | keywordURI | 464 | keywordURI |
465 | = getKeywordURIFromList(metaXML, | 465 | = getKeywordURIFromList(metaXML, |
466 | "namespaceMetaDataDialogKeywordList"); | 466 | "namespaceMetaDataDialogKeywordList"); |
467 | spin = glade_xml_get_widget(metaXML, | 467 | spin = glade_xml_get_widget(metaXML, |
468 | "namespaceAnonymityspinbutton"); | 468 | "namespaceAnonymityspinbutton"); |
469 | nameLine = glade_xml_get_widget(metaXML, | 469 | nameLine = glade_xml_get_widget(metaXML, |
470 | "namespaceRootEntry"); | 470 | "namespaceRootEntry"); |
471 | namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine)); | 471 | namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine)); |
472 | if (namespaceName == NULL) | 472 | if (namespaceName == NULL) |
473 | namespaceName = "root"; /* do NOT translate "root"! */ | 473 | namespaceName = "root"; /* do NOT translate "root"! */ |
474 | hash(namespaceName, | 474 | hash(namespaceName, |
475 | strlen(namespaceName), | 475 | strlen(namespaceName), |
476 | &rootEntry); | 476 | &rootEntry); |
477 | nameLine = glade_xml_get_widget(metaXML, | 477 | nameLine = glade_xml_get_widget(metaXML, |
478 | "namespaceNameEntry"); | 478 | "namespaceNameEntry"); |
479 | namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine)); | 479 | namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine)); |
@@ -495,8 +495,8 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
495 | ECRS_freeUri(root); | 495 | ECRS_freeUri(root); |
496 | } else { | 496 | } else { |
497 | GtkWidget * dialog; | 497 | GtkWidget * dialog; |
498 | 498 | ||
499 | dialog = gtk_message_dialog_new | 499 | dialog = gtk_message_dialog_new |
500 | (NULL, | 500 | (NULL, |
501 | GTK_DIALOG_MODAL, | 501 | GTK_DIALOG_MODAL, |
502 | GTK_MESSAGE_ERROR, | 502 | GTK_MESSAGE_ERROR, |
@@ -507,7 +507,7 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
507 | "already exists."), | 507 | "already exists."), |
508 | namespaceName); | 508 | namespaceName); |
509 | gtk_dialog_run(GTK_DIALOG(dialog)); | 509 | gtk_dialog_run(GTK_DIALOG(dialog)); |
510 | gtk_widget_destroy(dialog); | 510 | gtk_widget_destroy(dialog); |
511 | } | 511 | } |
512 | ECRS_freeMetaData(meta); | 512 | ECRS_freeMetaData(meta); |
513 | ECRS_freeUri(keywordURI); | 513 | ECRS_freeUri(keywordURI); |
@@ -524,31 +524,31 @@ void namespaceDelete_clicked(GtkWidget * dummy1, | |||
524 | NamespaceList * prev; | 524 | NamespaceList * prev; |
525 | gint num; | 525 | gint num; |
526 | GtkWidget * page; | 526 | GtkWidget * page; |
527 | GtkWidget * dialog; | 527 | GtkWidget * dialog; |
528 | gint ret; | 528 | gint ret; |
529 | 529 | ||
530 | notebook | 530 | notebook |
531 | = glade_xml_get_widget(getMainXML(), | 531 | = glade_xml_get_widget(getMainXML(), |
532 | "localNamespacesNotebook"); | 532 | "localNamespacesNotebook"); |
533 | num | 533 | num |
534 | = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); | 534 | = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); |
535 | if (num == -1) { | 535 | if (num == -1) { |
536 | /* IMPROVE-ME: disable the menu item | 536 | /* IMPROVE-ME: disable the menu item |
537 | as long as this may happen! */ | 537 | as long as this may happen! */ |
538 | dialog = gtk_message_dialog_new | 538 | dialog = gtk_message_dialog_new |
539 | (NULL, | 539 | (NULL, |
540 | GTK_DIALOG_MODAL, | 540 | GTK_DIALOG_MODAL, |
541 | GTK_MESSAGE_ERROR, | 541 | GTK_MESSAGE_ERROR, |
542 | GTK_BUTTONS_CLOSE, | 542 | GTK_BUTTONS_CLOSE, |
543 | _("No local namespaces available that could be deleted!")); | 543 | _("No local namespaces available that could be deleted!")); |
544 | gtk_dialog_run(GTK_DIALOG(dialog)); | 544 | gtk_dialog_run(GTK_DIALOG(dialog)); |
545 | gtk_widget_destroy(dialog); | 545 | gtk_widget_destroy(dialog); |
546 | return; | 546 | return; |
547 | } | 547 | } |
548 | page | 548 | page |
549 | = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), | 549 | = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), |
550 | num); | 550 | num); |
551 | list | 551 | list |
552 | = head; | 552 | = head; |
553 | prev | 553 | prev |
554 | = NULL; | 554 | = NULL; |
@@ -563,8 +563,8 @@ void namespaceDelete_clicked(GtkWidget * dummy1, | |||
563 | } | 563 | } |
564 | /* open window to ask for confirmation, | 564 | /* open window to ask for confirmation, |
565 | only then delete */ | 565 | only then delete */ |
566 | 566 | ||
567 | dialog = gtk_message_dialog_new | 567 | dialog = gtk_message_dialog_new |
568 | (NULL, | 568 | (NULL, |
569 | GTK_DIALOG_MODAL, | 569 | GTK_DIALOG_MODAL, |
570 | GTK_MESSAGE_ERROR, | 570 | GTK_MESSAGE_ERROR, |
@@ -572,7 +572,7 @@ void namespaceDelete_clicked(GtkWidget * dummy1, | |||
572 | _("Should the namespace `%s' really be deleted?"), | 572 | _("Should the namespace `%s' really be deleted?"), |
573 | list->name); | 573 | list->name); |
574 | ret = gtk_dialog_run(GTK_DIALOG(dialog)); | 574 | ret = gtk_dialog_run(GTK_DIALOG(dialog)); |
575 | gtk_widget_destroy(dialog); | 575 | gtk_widget_destroy(dialog); |
576 | if (GTK_RESPONSE_YES != ret) | 576 | if (GTK_RESPONSE_YES != ret) |
577 | return; | 577 | return; |
578 | 578 | ||
@@ -594,7 +594,7 @@ typedef struct { | |||
594 | TIME_T updateInterval; | 594 | TIME_T updateInterval; |
595 | HashCode512 * lastId; | 595 | HashCode512 * lastId; |
596 | HashCode512 thisId; | 596 | HashCode512 thisId; |
597 | HashCode512 * nextId; | 597 | HashCode512 * nextId; |
598 | struct ECRS_MetaData * meta; | 598 | struct ECRS_MetaData * meta; |
599 | } IUC; | 599 | } IUC; |
600 | 600 | ||
@@ -625,11 +625,11 @@ static void initiateUpload(GtkTreeModel * model, | |||
625 | original file ID (ometa) with the new metadata (cls->meta) here; | 625 | original file ID (ometa) with the new metadata (cls->meta) here; |
626 | or if we limit us to one file at a time, show the original | 626 | or if we limit us to one file at a time, show the original |
627 | metadata immediately with the dialog. */ | 627 | metadata immediately with the dialog. */ |
628 | 628 | ||
629 | if (dst == NULL) { | 629 | if (dst == NULL) { |
630 | BREAK(); | 630 | BREAK(); |
631 | return; | 631 | return; |
632 | } | 632 | } |
633 | resultURI = FSUI_addToNamespace(ctx, | 633 | resultURI = FSUI_addToNamespace(ctx, |
634 | cls->anonymityLevel, | 634 | cls->anonymityLevel, |
635 | cls->namespaceName, | 635 | cls->namespaceName, |
@@ -664,7 +664,7 @@ static void initiateUpload(GtkTreeModel * model, | |||
664 | _("Failed to insert content into namespace " | 664 | _("Failed to insert content into namespace " |
665 | "(consult logs).\n")); | 665 | "(consult logs).\n")); |
666 | } | 666 | } |
667 | } | 667 | } |
668 | 668 | ||
669 | void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked(GtkWidget * dummy1, | 669 | void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked(GtkWidget * dummy1, |
670 | GtkWidget * dummy2) { | 670 | GtkWidget * dummy2) { |
@@ -693,20 +693,20 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | |||
693 | contentList | 693 | contentList |
694 | = glade_xml_get_widget(getMainXML(), | 694 | = glade_xml_get_widget(getMainXML(), |
695 | "availableContentList"); | 695 | "availableContentList"); |
696 | selection | 696 | selection |
697 | = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList)); | 697 | = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList)); |
698 | if (0 == gtk_tree_selection_count_selected_rows(selection)) { | 698 | if (0 == gtk_tree_selection_count_selected_rows(selection)) { |
699 | /* IMPROVE-ME: disable the menu item | 699 | /* IMPROVE-ME: disable the menu item |
700 | as long as this may happen! */ | 700 | as long as this may happen! */ |
701 | dialog = gtk_message_dialog_new | 701 | dialog = gtk_message_dialog_new |
702 | (NULL, | 702 | (NULL, |
703 | GTK_DIALOG_MODAL, | 703 | GTK_DIALOG_MODAL, |
704 | GTK_MESSAGE_ERROR, | 704 | GTK_MESSAGE_ERROR, |
705 | GTK_BUTTONS_CLOSE, | 705 | GTK_BUTTONS_CLOSE, |
706 | _("You must select some available content for publication first!")); | 706 | _("You must select some available content for publication first!")); |
707 | gtk_dialog_run(GTK_DIALOG(dialog)); | 707 | gtk_dialog_run(GTK_DIALOG(dialog)); |
708 | gtk_widget_destroy(dialog); | 708 | gtk_widget_destroy(dialog); |
709 | return; | 709 | return; |
710 | } | 710 | } |
711 | if (FALSE == gtk_tree_selection_get_selected(selection, | 711 | if (FALSE == gtk_tree_selection_get_selected(selection, |
712 | NULL, | 712 | NULL, |
@@ -758,14 +758,14 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | |||
758 | gtk_widget_destroy(dialog); | 758 | gtk_widget_destroy(dialog); |
759 | UNREF(metaXML); | 759 | UNREF(metaXML); |
760 | metaXML = NULL; | 760 | metaXML = NULL; |
761 | dialog = gtk_message_dialog_new | 761 | dialog = gtk_message_dialog_new |
762 | (NULL, | 762 | (NULL, |
763 | GTK_DIALOG_MODAL, | 763 | GTK_DIALOG_MODAL, |
764 | GTK_MESSAGE_ERROR, | 764 | GTK_MESSAGE_ERROR, |
765 | GTK_BUTTONS_CLOSE, | 765 | GTK_BUTTONS_CLOSE, |
766 | _("Failed to parse given time interval!")); | 766 | _("Failed to parse given time interval!")); |
767 | gtk_dialog_run(GTK_DIALOG(dialog)); | 767 | gtk_dialog_run(GTK_DIALOG(dialog)); |
768 | gtk_widget_destroy(dialog); | 768 | gtk_widget_destroy(dialog); |
769 | return; | 769 | return; |
770 | } | 770 | } |
771 | 771 | ||
@@ -774,7 +774,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | |||
774 | "namespaceInsertPreview"); | 774 | "namespaceInsertPreview"); |
775 | cls.anonymityLevel | 775 | cls.anonymityLevel |
776 | = getAnonymityLevel(metaXML, | 776 | = getAnonymityLevel(metaXML, |
777 | "anonymitySpinButton"); | 777 | "anonymitySpinButton"); |
778 | nameLine = glade_xml_get_widget(metaXML, | 778 | nameLine = glade_xml_get_widget(metaXML, |
779 | "namespaceContentIdentifierEntry"); | 779 | "namespaceContentIdentifierEntry"); |
780 | identifierName = gtk_entry_get_text(GTK_ENTRY(nameLine)); | 780 | identifierName = gtk_entry_get_text(GTK_ENTRY(nameLine)); |
@@ -791,7 +791,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | |||
791 | if ( (identifierName == NULL) || | 791 | if ( (identifierName == NULL) || |
792 | (strlen(identifierName) == 0)) { | 792 | (strlen(identifierName) == 0)) { |
793 | cls.nextId = NULL; | 793 | cls.nextId = NULL; |
794 | } else { | 794 | } else { |
795 | hash(identifierName, | 795 | hash(identifierName, |
796 | strlen(identifierName), | 796 | strlen(identifierName), |
797 | &nextId); | 797 | &nextId); |
@@ -836,20 +836,20 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
836 | contentList | 836 | contentList |
837 | = glade_xml_get_widget(getMainXML(), | 837 | = glade_xml_get_widget(getMainXML(), |
838 | "availableContentList"); | 838 | "availableContentList"); |
839 | selection | 839 | selection |
840 | = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList)); | 840 | = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList)); |
841 | if (0 == gtk_tree_selection_count_selected_rows(selection)) { | 841 | if (0 == gtk_tree_selection_count_selected_rows(selection)) { |
842 | /* IMPROVE-ME: disable the menu item | 842 | /* IMPROVE-ME: disable the menu item |
843 | as long as this may happen! */ | 843 | as long as this may happen! */ |
844 | dialog = gtk_message_dialog_new | 844 | dialog = gtk_message_dialog_new |
845 | (NULL, | 845 | (NULL, |
846 | GTK_DIALOG_MODAL, | 846 | GTK_DIALOG_MODAL, |
847 | GTK_MESSAGE_ERROR, | 847 | GTK_MESSAGE_ERROR, |
848 | GTK_BUTTONS_CLOSE, | 848 | GTK_BUTTONS_CLOSE, |
849 | _("You must select some available content for publication first!")); | 849 | _("You must select some available content for publication first!")); |
850 | gtk_dialog_run(GTK_DIALOG(dialog)); | 850 | gtk_dialog_run(GTK_DIALOG(dialog)); |
851 | gtk_widget_destroy(dialog); | 851 | gtk_widget_destroy(dialog); |
852 | return; | 852 | return; |
853 | } | 853 | } |
854 | if (FALSE == gtk_tree_selection_get_selected(selection, | 854 | if (FALSE == gtk_tree_selection_get_selected(selection, |
855 | NULL, | 855 | NULL, |
@@ -885,15 +885,15 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
885 | if (0 == gtk_tree_selection_count_selected_rows(selectionNamespace)) { | 885 | if (0 == gtk_tree_selection_count_selected_rows(selectionNamespace)) { |
886 | /* IMPROVE-ME: disable the menu item | 886 | /* IMPROVE-ME: disable the menu item |
887 | as long as this may happen! */ | 887 | as long as this may happen! */ |
888 | dialog = gtk_message_dialog_new | 888 | dialog = gtk_message_dialog_new |
889 | (NULL, | 889 | (NULL, |
890 | GTK_DIALOG_MODAL, | 890 | GTK_DIALOG_MODAL, |
891 | GTK_MESSAGE_ERROR, | 891 | GTK_MESSAGE_ERROR, |
892 | GTK_BUTTONS_CLOSE, | 892 | GTK_BUTTONS_CLOSE, |
893 | _("You must select some existing namespace content to be updated first!")); | 893 | _("You must select some existing namespace content to be updated first!")); |
894 | gtk_dialog_run(GTK_DIALOG(dialog)); | 894 | gtk_dialog_run(GTK_DIALOG(dialog)); |
895 | gtk_widget_destroy(dialog); | 895 | gtk_widget_destroy(dialog); |
896 | return; | 896 | return; |
897 | } | 897 | } |
898 | if (FALSE == gtk_tree_selection_get_selected(selectionNamespace, | 898 | if (FALSE == gtk_tree_selection_get_selected(selectionNamespace, |
899 | NULL, | 899 | NULL, |
@@ -919,7 +919,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
919 | next); | 919 | next); |
920 | if (OK != enc2hash(next, | 920 | if (OK != enc2hash(next, |
921 | &cls.thisId)) { | 921 | &cls.thisId)) { |
922 | BREAK(); | 922 | BREAK(); |
923 | UNREF(metaXML); | 923 | UNREF(metaXML); |
924 | metaXML = NULL; | 924 | metaXML = NULL; |
925 | return; | 925 | return; |
@@ -940,10 +940,10 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
940 | } | 940 | } |
941 | if (cls.updateInterval == ECRS_SBLOCK_UPDATE_SPORADIC) { | 941 | if (cls.updateInterval == ECRS_SBLOCK_UPDATE_SPORADIC) { |
942 | gtk_entry_set_text(GTK_ENTRY(nameLine), | 942 | gtk_entry_set_text(GTK_ENTRY(nameLine), |
943 | ""); | 943 | ""); |
944 | } else { | 944 | } else { |
945 | EncName updateName; | 945 | EncName updateName; |
946 | 946 | ||
947 | if (OK != FSUI_computeNextId(list->name, | 947 | if (OK != FSUI_computeNextId(list->name, |
948 | &prevId, | 948 | &prevId, |
949 | &cls.thisId, | 949 | &cls.thisId, |
@@ -957,7 +957,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
957 | hash2enc(&nextId, | 957 | hash2enc(&nextId, |
958 | &updateName); | 958 | &updateName); |
959 | gtk_entry_set_text(GTK_ENTRY(nameLine), | 959 | gtk_entry_set_text(GTK_ENTRY(nameLine), |
960 | (const char*) &updateName); | 960 | (const char*) &updateName); |
961 | gtk_entry_set_editable(GTK_ENTRY(nameLine), | 961 | gtk_entry_set_editable(GTK_ENTRY(nameLine), |
962 | FALSE); | 962 | FALSE); |
963 | } | 963 | } |
@@ -996,14 +996,14 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
996 | gtk_widget_destroy(dialog); | 996 | gtk_widget_destroy(dialog); |
997 | UNREF(metaXML); | 997 | UNREF(metaXML); |
998 | metaXML = NULL; | 998 | metaXML = NULL; |
999 | dialog = gtk_message_dialog_new | 999 | dialog = gtk_message_dialog_new |
1000 | (NULL, | 1000 | (NULL, |
1001 | GTK_DIALOG_MODAL, | 1001 | GTK_DIALOG_MODAL, |
1002 | GTK_MESSAGE_ERROR, | 1002 | GTK_MESSAGE_ERROR, |
1003 | GTK_BUTTONS_CLOSE, | 1003 | GTK_BUTTONS_CLOSE, |
1004 | error); | 1004 | error); |
1005 | gtk_dialog_run(GTK_DIALOG(dialog)); | 1005 | gtk_dialog_run(GTK_DIALOG(dialog)); |
1006 | gtk_widget_destroy(dialog); | 1006 | gtk_widget_destroy(dialog); |
1007 | return; | 1007 | return; |
1008 | } | 1008 | } |
1009 | hash(identifierName, | 1009 | hash(identifierName, |
@@ -1014,14 +1014,14 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
1014 | "namespaceUpdateMetaDataTreeView", | 1014 | "namespaceUpdateMetaDataTreeView", |
1015 | "namespaceUpdatePreviewImage"); | 1015 | "namespaceUpdatePreviewImage"); |
1016 | spin = glade_xml_get_widget(metaXML, | 1016 | spin = glade_xml_get_widget(metaXML, |
1017 | "namespaceUpdateAnonymitySpinButton"); | 1017 | "namespaceUpdateAnonymitySpinButton"); |
1018 | cls.anonymityLevel | 1018 | cls.anonymityLevel |
1019 | = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); | 1019 | = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); |
1020 | 1020 | ||
1021 | gtk_tree_selection_selected_foreach | 1021 | gtk_tree_selection_selected_foreach |
1022 | (selection, | 1022 | (selection, |
1023 | &initiateUpload, | 1023 | &initiateUpload, |
1024 | &cls); | 1024 | &cls); |
1025 | ECRS_freeMetaData(cls.meta); | 1025 | ECRS_freeMetaData(cls.meta); |
1026 | } | 1026 | } |
1027 | gtk_widget_destroy(dialog); | 1027 | gtk_widget_destroy(dialog); |
@@ -1072,7 +1072,7 @@ void fs_namespace_start() { | |||
1072 | = glade_xml_get_widget(getMainXML(), | 1072 | = glade_xml_get_widget(getMainXML(), |
1073 | "availableContentList"); | 1073 | "availableContentList"); |
1074 | 1074 | ||
1075 | model = gtk_list_store_new(NAMESPACE_NUM, | 1075 | model = gtk_list_store_new(NAMESPACE_NUM, |
1076 | G_TYPE_STRING, /* name */ | 1076 | G_TYPE_STRING, /* name */ |
1077 | G_TYPE_UINT64, /* size */ | 1077 | G_TYPE_UINT64, /* size */ |
1078 | G_TYPE_STRING, /* uri-string */ | 1078 | G_TYPE_STRING, /* uri-string */ |
@@ -1100,7 +1100,7 @@ void fs_namespace_start() { | |||
1100 | _("URI"), | 1100 | _("URI"), |
1101 | renderer, | 1101 | renderer, |
1102 | "text", NAMESPACE_URISTRING, | 1102 | "text", NAMESPACE_URISTRING, |
1103 | NULL); | 1103 | NULL); |
1104 | addCronJob(&updateContentList, | 1104 | addCronJob(&updateContentList, |
1105 | 0, | 1105 | 0, |
1106 | UPDATE_CONTENT_LIST_FREQUENCY, | 1106 | UPDATE_CONTENT_LIST_FREQUENCY, |
@@ -1139,7 +1139,7 @@ void on_localNamespacesNotebook_destroy(GtkWidget * dummy1, | |||
1139 | pos = head->next; | 1139 | pos = head->next; |
1140 | FREE(head->name); | 1140 | FREE(head->name); |
1141 | ECRS_freeMetaData(head->meta); | 1141 | ECRS_freeMetaData(head->meta); |
1142 | 1142 | ||
1143 | if (gtk_tree_model_get_iter_first(head->model, | 1143 | if (gtk_tree_model_get_iter_first(head->model, |
1144 | &iter)) { | 1144 | &iter)) { |
1145 | do { | 1145 | do { |
@@ -1152,7 +1152,7 @@ void on_localNamespacesNotebook_destroy(GtkWidget * dummy1, | |||
1152 | &iter, | 1152 | &iter, |
1153 | IN_NAMESPACE_URI, NULL, | 1153 | IN_NAMESPACE_URI, NULL, |
1154 | IN_NAMESPACE_META, NULL, | 1154 | IN_NAMESPACE_META, NULL, |
1155 | -1); | 1155 | -1); |
1156 | if (u != NULL) | 1156 | if (u != NULL) |
1157 | ECRS_freeUri(u); | 1157 | ECRS_freeUri(u); |
1158 | if (m != NULL) | 1158 | if (m != NULL) |