← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gecko-mediaplayer/oneiric

« back to all changes in this revision

Viewing changes to src/plugin_list.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cesare Tirabassi
  • Date: 2010-02-17 10:17:01 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20100217101701-mqfz0z0owm89ut9y
Tags: 0.9.9.1~svn374-0ubuntu1
http://bugs.debian.org/557761
https://launchpad.net/bugs/86777
https://launchpad.net/bugs/445767
http://bugs.debian.org/555916
https://launchpad.net/bugs/230662
* SVN snapshot release (LP: #86777, LP: #445767, Closes: #557761):
  - apple.com fixes
* Replace Build-Depends on iceape-dev with xulrunner-dev (Closes: #555916)
* No change bump of Standards-Version
* Converted to source format 3.0
* Add opera (>= 9.50) as a compatible browser (LP: #230662)
* Remove linker flag -z defs since the plugin doesn't link to all
  required libraries on purpose

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin_list.cpp
213
213
                printf("src = %s\n", item->src);
214
214
                printf("local = %s\n", item->local);
215
215
                printf("id = %i\n", item->id);
 
216
                printf("hrefid = %i\n", item->hrefid);
216
217
                printf("play = %i\n", item->play);
217
218
                printf("path = %s\n", item->path);
218
219
                printf("controlid = %i\n", item->controlid);
292
293
                            || code == (unsigned int) -91 || code == (unsigned int) -89) {
293
294
                            printf("Skipped URL: %s\n", rdrf);
294
295
                        } else {
295
 
                            if (list_find(list, url) == NULL) {
 
296
                            if (list_find(list, url) == NULL && strlen(rdrf) > 0) {
296
297
                                item->play = FALSE;
297
298
                                newitem = g_new0(ListItem, 1);
298
299
                                g_strlcpy(newitem->src, url, 1024);
356
357
                return list;
357
358
            } else {
358
359
                while (p != NULL) {
359
 
                    urlptr = (gchar *) memmem(p,datalen - (p - data), "url ", 4);
 
360
                    urlptr = (gchar *) memmem_compat(p,datalen - (p - data), "url ", 4);
360
361
                    
361
362
 
362
363
                    if (urlptr == NULL) {
385
386
                            item->id = -1;
386
387
                            list = g_list_append(list, newitem);
387
388
                        }
388
 
                        p = (gchar *) memmem(urlptr,datalen - (urlptr - data),"mmdr",4);
 
389
                        p = (gchar *) memmem_compat(urlptr,datalen - (urlptr - data),"mmdr",4);
389
390
                    }
390
391
 
391
392
                }