← Back to branch summary

~ubuntu-branches/ubuntu/maverick/conglomerate/maverick

« back to all changes in this revision

Viewing changes to src/cong-dispspec-registry.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2005-11-08 05:07:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051108050706-bcg60nwqf1z3w0d6
Tags: 0.9.1-1ubuntu1
http://bugs.debian.org/4397
* Resynchronise with Debian (Closes: #4397).
  - Thanks, Jordan Mantha.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cong-dispspec-registry.c
508
508
 
509
509
                                if (dtd) {
510
510
                                        if (cong_external_document_model_get_public_id (dtd)) {
511
 
                                                if (0==strcmp (xml_doc->extSubset->ExternalID, cong_external_document_model_get_public_id (dtd))) {
512
 
                                                        g_message("Found display spec based on matching public ID of DTD:\n    %s\n", xml_doc->extSubset->ExternalID);
 
511
                                                if (0==strcmp ((const char*)xml_doc->extSubset->ExternalID, cong_external_document_model_get_public_id (dtd))) {
 
512
                                                        /* g_message("Found display spec based on matching public ID of DTD:\n    %s\n", xml_doc->extSubset->ExternalID); */
513
513
                                                        return ds;
514
514
                                                }
515
515
                                        }
519
519
 
520
520
                /* Check for matching SYSTEM ID: */
521
521
                if (xml_doc->extSubset->SystemID) {
522
 
                        const unsigned char *sysID = xml_doc->extSubset->SystemID;
 
522
                        const xmlChar *sysID = xml_doc->extSubset->SystemID;
523
523
                        int i;
524
524
                        
525
525
                        for (i=0;i<cong_dispspec_registry_get_num (registry);i++) {
531
531
                                if (model != NULL) {
532
532
                                        this_id = cong_external_document_model_get_system_id (model);
533
533
                                        if (this_id != NULL) {
534
 
                                                if (!strcmp (sysID, this_id)) {
 
534
                                                if (!strcmp ((const gchar*)sysID, this_id)) {
535
535
                                                        g_message("Found display spec based on matching system ID of DTD\n    %s\n", sysID);
536
536
                                                        return ds;
537
537
                                                }