diff -Nru gecko-mediaplayer-1.0.7/ChangeLog gecko-mediaplayer-1.0.4/ChangeLog
--- gecko-mediaplayer-1.0.7/ChangeLog	2012-10-08 13:19:21.000000000 +0000
+++ gecko-mediaplayer-1.0.4/ChangeLog	2011-07-01 16:40:50.000000000 +0000
@@ -1,50 +1,3 @@
-Development
-1.0.7b
-1.0.7a1
-    Version bump to 1.0.7a1
-	Very Large Change
-		rework the processing of playlists so that items are downloaded 
-			one at a time and only as needed
-		Convert NPRES and NPERR codes to text in messages
-		ASX and M3U files should be properly parsed and not streamed in all cases
-    Add ASX to the list of types that should be streamed, and fix the code so that it is case insensitive
-    Switch plugin to streaming mode with #EXTM3U is found in the file
-    Clean up some depreciated symbol warnings
-    Convert plugin_list to use gm_log
-    Convert the majority of the code to use gm_log instead of printf
-1.0.6
-    Updated Portuguese translation
-    Updated Japanese translation
-1.0.6b1
-    Fix a problem in the style parser, was looking at a null pointer
-    Added WMP plugin properties enabled and enableContextMenu
-    Suppress list display
-    Add rtp to the list of streaming uris
-    Set PACKAGE_LOCALE_DIR based on --localedir from configure
-    Change HAVE_NEW_XULRUNNER to NPAPI_USE_UPPERCASE_UTF8
-    Drop --enable_new_libxul configure flag as it is autodetected now
-    Fix spelling mistake, but then comment out as not needed for normal usage Issue #163
-1.0.5
-    Disable playing of partially cached apple.com files, mplayer seems to crash on these files
-    Use the right schema file, can't believe this one has slipped by so long.
-    Use better const check from Issue #161, patch from i.stakenvicius
-1.0.5b2
-    Simpifying const check until something better comes along Issue #162
-    Fix Issue #161, improvements over last patch because NPAPI not properly bumped
-    Fix support for older xulrunners, Issue #160, issue caused by patch from
-    Issue #158
-    Support nsapi-sdk, based on patch from Issue #159
-    Fix up some const casting so that compilers do not complain Issue #158
-    Updated Japanese translation
-    Updated Italian translation
-1.0.5b1
-    When uri is a file:// uri, just play it directly
-    Switch from AM_MAINTAINER_MODE to AM_MAINTAINER_MODE([enable]) in configure.in
-    Fix Issue #150, return value for function that says it will
-    Updated Dutch translation
-    Conversion to using libgmtk as separate library
-    Improvements to the apple.com/trailers fix, caching now works properly
-    Fix regression at apple.com/trailers, side effect of fully caching the file for now
 1.0.4
 	Fix problem where file is downloaded before gnome-mplayer is started (locally cached)
 	Added Portuguese translation
diff -Nru gecko-mediaplayer-1.0.7/Makefile.am gecko-mediaplayer-1.0.4/Makefile.am
--- gecko-mediaplayer-1.0.7/Makefile.am	2011-12-05 17:23:51.000000000 +0000
+++ gecko-mediaplayer-1.0.4/Makefile.am	2011-04-19 12:54:34.000000000 +0000
@@ -32,7 +32,7 @@
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(schema_DATA) 2>&1 > /dev/null
 
 if GCONF_SCHEMAS_INSTALL
-install-data-hook: install-schemas 
+install-data-hook: install-schemas
 else
 install-data-hook:
 endif
diff -Nru gecko-mediaplayer-1.0.7/Makefile.in gecko-mediaplayer-1.0.4/Makefile.in
--- gecko-mediaplayer-1.0.7/Makefile.in	2012-10-29 18:48:23.000000000 +0000
+++ gecko-mediaplayer-1.0.4/Makefile.in	2011-07-01 16:40:21.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -65,11 +48,11 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = gecko-mediaplayer.spec
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -80,11 +63,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -106,12 +84,6 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(gecko_mediaplayerdocdir)" \
 	"$(DESTDIR)$(schemadir)"
 DATA = $(gecko_mediaplayerdoc_DATA) $(schema_DATA)
@@ -127,11 +99,9 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -160,10 +130,9 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
@@ -194,19 +163,25 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_DEFINES = @GCONF_DEFINES@
+GCONF_LIBS = @GCONF_LIBS@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GECKO_CFLAGS = @GECKO_CFLAGS@
 GECKO_LIBS = @GECKO_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_DEFINES = @GIO_DEFINES@
+GIO_LIBS = @GIO_LIBS@
+GLIB2_26_CFLAGS = @GLIB2_26_CFLAGS@
+GLIB2_26_DEFINES = @GLIB2_26_DEFINES@
+GLIB2_26_LIBS = @GLIB2_26_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
-GMLIB_CFLAGS = @GMLIB_CFLAGS@
-GMLIB_LIBS = @GMLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
-GSETTINGS_RULES = @GSETTINGS_RULES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -242,12 +217,12 @@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PULSE_CFLAGS = @PULSE_CFLAGS@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 USE_GCONF = @USE_GCONF@
-USE_GSETTINGS = @USE_GSETTINGS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -313,7 +288,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh: Makefile
+am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -349,8 +324,10 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -366,11 +343,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-gecko_mediaplayerdocDATA: $(gecko_mediaplayerdoc_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(gecko_mediaplayerdocdir)" || $(MKDIR_P) "$(DESTDIR)$(gecko_mediaplayerdocdir)"
 	@list='$(gecko_mediaplayerdoc_DATA)'; test -n "$(gecko_mediaplayerdocdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(gecko_mediaplayerdocdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(gecko_mediaplayerdocdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -384,14 +358,13 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(gecko_mediaplayerdoc_DATA)'; test -n "$(gecko_mediaplayerdocdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(gecko_mediaplayerdocdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gecko_mediaplayerdocdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gecko_mediaplayerdocdir)" && rm -f $$files
 install-schemaDATA: $(schema_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
 	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(schemadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(schemadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -405,7 +378,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(schemadir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -576,10 +551,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -614,11 +592,7 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -626,7 +600,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -657,8 +631,6 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -668,7 +640,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
@@ -678,7 +650,6 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -707,16 +678,8 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -750,15 +713,10 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -847,8 +805,8 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-hdr \
+	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-data-hook install-dvi \
@@ -874,7 +832,7 @@
 install-schemas: $(schema_DATA)
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(schema_DATA) 2>&1 > /dev/null
 
-@GCONF_SCHEMAS_INSTALL_TRUE@install-data-hook: install-schemas 
+@GCONF_SCHEMAS_INSTALL_TRUE@install-data-hook: install-schemas
 @GCONF_SCHEMAS_INSTALL_FALSE@install-data-hook:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru gecko-mediaplayer-1.0.7/aclocal.m4 gecko-mediaplayer-1.0.4/aclocal.m4
--- gecko-mediaplayer-1.0.7/aclocal.m4	2012-10-29 18:48:22.000000000 +0000
+++ gecko-mediaplayer-1.0.4/aclocal.m4	2011-07-01 16:40:18.000000000 +0000
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -306,10 +305,6 @@
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
-	    *-*-openbsd*)
-	    CATOBJEXT=.mo
-            DATADIRNAME=share
-	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -660,15 +655,12 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -678,7 +670,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -694,21 +686,19 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -813,14 +803,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 10
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -860,7 +850,6 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -925,7 +914,7 @@
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -990,13 +979,10 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -1230,15 +1216,12 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -1278,8 +1261,8 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1299,7 +1282,7 @@
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -1445,15 +1428,12 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -1476,14 +1456,13 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 4
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -1491,13 +1470,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1573,13 +1552,13 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2009  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 1
 
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
@@ -1594,50 +1573,18 @@
 no)  AM_DEFAULT_VERBOSITY=1;;
 *)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
-dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -1660,13 +1607,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 2
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -1675,13 +1622,13 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1703,11 +1650,10 @@
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
 m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
diff -Nru gecko-mediaplayer-1.0.7/config.h gecko-mediaplayer-1.0.4/config.h
--- gecko-mediaplayer-1.0.7/config.h	2012-10-29 18:48:27.000000000 +0000
+++ gecko-mediaplayer-1.0.4/config.h	2011-07-01 16:40:29.000000000 +0000
@@ -10,12 +10,21 @@
 /* GETTEXT package name */
 #define GETTEXT_PACKAGE "gecko-mediaplayer"
 
+/* Define to 1 if you have GIO support */
+#define GIO_ENABLED 1
+
+/* Define to 1 if you have GLIB 2.26 or higher */
+#define GLIB2_26_ENABLED 1
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
+/* Define to 1 to use GConf to store preferences */
+/* #undef HAVE_GCONF */
+
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1
 
@@ -31,8 +40,8 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
-/* Define to 1 if using nspr */
-/* #undef HAVE_NSPR */
+/* Define to 1 if using libxul 1.9.2 or higher */
+#define HAVE_NEW_XULRUNNER 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -58,12 +67,6 @@
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 /* #undef NO_MINUS_C_MINUS_O */
 
-/* Define if NPAPI declares NPP_GetMIMEDescription as a const char* */
-#define NPAPI_USE_CONSTCHARS 1
-
-/* Define if NPAPI declares NPString with an uppercase UTF8 */
-#define NPAPI_USE_UPPERCASE_UTF8 1
-
 /* Name of package */
 #define PACKAGE "gecko-mediaplayer"
 
@@ -89,4 +92,4 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.0.7"
+#define VERSION "1.0.4"
diff -Nru gecko-mediaplayer-1.0.7/config.h.in gecko-mediaplayer-1.0.4/config.h.in
--- gecko-mediaplayer-1.0.7/config.h.in	2012-10-29 18:48:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/config.h.in	2011-02-20 22:47:39.000000000 +0000
@@ -9,12 +9,21 @@
 /* GETTEXT package name */
 #undef GETTEXT_PACKAGE
 
+/* Define to 1 if you have GIO support */
+#undef GIO_ENABLED
+
+/* Define to 1 if you have GLIB 2.26 or higher */
+#undef GLIB2_26_ENABLED
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
+/* Define to 1 to use GConf to store preferences */
+#undef HAVE_GCONF
+
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
@@ -30,8 +39,8 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if using nspr */
-#undef HAVE_NSPR
+/* Define to 1 if using libxul 1.9.2 or higher */
+#undef HAVE_NEW_XULRUNNER
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
@@ -57,12 +66,6 @@
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 
-/* Define if NPAPI declares NPP_GetMIMEDescription as a const char* */
-#undef NPAPI_USE_CONSTCHARS
-
-/* Define if NPAPI declares NPString with an uppercase UTF8 */
-#undef NPAPI_USE_UPPERCASE_UTF8
-
 /* Name of package */
 #undef PACKAGE
 
diff -Nru gecko-mediaplayer-1.0.7/configure gecko-mediaplayer-1.0.4/configure
--- gecko-mediaplayer-1.0.7/configure	2012-10-29 18:48:24.000000000 +0000
+++ gecko-mediaplayer-1.0.4/configure	2011-07-01 16:40:20.000000000 +0000
@@ -603,25 +603,32 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+CURL_DEFINES
+CURL_LIBS
+CURL_CFLAGS
+plugindir
+GIO_DEFINES
+GIO_LIBS
+GIO_CFLAGS
 USE_GCONF
+GCONF_DEFINES
 GCONF_SCHEMA_FILE_DIR
 GCONF_SCHEMA_CONFIG_SOURCE
-GSETTINGS_RULES
-USE_GSETTINGS
+GCONF_LIBS
+GCONF_CFLAGS
 GCONF_SCHEMAS_INSTALL_FALSE
 GCONF_SCHEMAS_INSTALL_TRUE
-CURL_DEFINES
-CURL_LIBS
-CURL_CFLAGS
-plugindir
 DBUS_LIBS
 DBUS_CFLAGS
 NSPR_LIBS
 NSPR_CFLAGS
 GECKO_LIBS
 GECKO_CFLAGS
-GMLIB_LIBS
-GMLIB_CFLAGS
+PULSE_CFLAGS
+ALSA_CFLAGS
+GLIB2_26_DEFINES
+GLIB2_26_LIBS
+GLIB2_26_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -657,7 +664,6 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
-am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -673,8 +679,6 @@
 CC
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -745,13 +749,16 @@
 enable_maintainer_mode
 enable_silent_rules
 enable_dependency_tracking
+with_gconf
 with_xulrunner_sdk
-with_plugin_dir
-enable_caching
-with_libcurl
+enable_new_libxul
 with_gconf_source
 with_gconf_schema_file_dir
 enable_schemas_install
+with_gio
+with_plugin_dir
+enable_caching
+with_libcurl
 '
       ac_precious_vars='build_alias
 host_alias
@@ -770,14 +777,18 @@
 PKG_CONFIG_LIBDIR
 GLIB_CFLAGS
 GLIB_LIBS
-GMLIB_CFLAGS
-GMLIB_LIBS
+GLIB2_26_CFLAGS
+GLIB2_26_LIBS
 GECKO_CFLAGS
 GECKO_LIBS
 NSPR_CFLAGS
 NSPR_LIBS
 DBUS_CFLAGS
 DBUS_LIBS
+GCONF_CFLAGS
+GCONF_LIBS
+GIO_CFLAGS
+GIO_LIBS
 CURL_CFLAGS
 CURL_LIBS'
 
@@ -1394,28 +1405,31 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-maintainer-mode  disable make rules and dependencies not useful
+  --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --disable-caching       Disable caching of remote media to local storage
+  --enable-new-libxul     libxul/xulrunner-sdk is 1.9.2 or higher
   --disable-schemas-install
                           Disable the schemas installation
+  --disable-caching       Disable caching of remote media to local storage
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gconf            Use Gconf to store preferences
   --with-xulrunner-sdk=path_to_sdk
                           Path to xulrunner SDK for build
                           --with-xulrunner-sdk=/path/to/sdk
-  --with-plugin-dir=dir   Directory where plugins are stored
-  --with-libcurl          Add support for libcurl
   --with-gconf-source=sourceaddress
                           Config database for installing schema files.
   --with-gconf-schema-file-dir=dir
                           Directory for installing schema files.
+  --with-gio              Use GIO for file I/O
+  --with-plugin-dir=dir   Directory where plugins are stored
+  --with-libcurl          Add support for libcurl
 
 Some influential environment variables:
   CC          C compiler command
@@ -1435,9 +1449,10 @@
               path overriding pkg-config's built-in search path
   GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
   GLIB_LIBS   linker flags for GLIB, overriding pkg-config
-  GMLIB_CFLAGS
-              C compiler flags for GMLIB, overriding pkg-config
-  GMLIB_LIBS  linker flags for GMLIB, overriding pkg-config
+  GLIB2_26_CFLAGS
+              C compiler flags for GLIB2_26, overriding pkg-config
+  GLIB2_26_LIBS
+              linker flags for GLIB2_26, overriding pkg-config
   GECKO_CFLAGS
               C compiler flags for GECKO, overriding pkg-config
   GECKO_LIBS  linker flags for GECKO, overriding pkg-config
@@ -1445,6 +1460,11 @@
   NSPR_LIBS   linker flags for NSPR, overriding pkg-config
   DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
   DBUS_LIBS   linker flags for DBUS, overriding pkg-config
+  GCONF_CFLAGS
+              C compiler flags for GCONF, overriding pkg-config
+  GCONF_LIBS  linker flags for GCONF, overriding pkg-config
+  GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
+  GIO_LIBS    linker flags for GIO, overriding pkg-config
   CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
   CURL_LIBS   linker flags for CURL, overriding pkg-config
 
@@ -2732,7 +2752,7 @@
 
 # Define the identity of the package.
  PACKAGE=gecko-mediaplayer
- VERSION=1.0.7
+ VERSION=1.0.4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2762,11 +2782,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
@@ -2781,7 +2801,7 @@
 if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
-  USE_MAINTAINER_MODE=yes
+  USE_MAINTAINER_MODE=no
 fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
@@ -2807,33 +2827,6 @@
 no)  AM_DEFAULT_VERBOSITY=1;;
 *)   AM_DEFAULT_VERBOSITY=0;;
 esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
 AM_BACKSLASH='\'
 
 
@@ -2889,7 +2882,6 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3703,7 +3695,6 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3763,7 +3754,7 @@
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4428,7 +4419,6 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4488,7 +4478,7 @@
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -5096,7 +5086,6 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -5156,7 +5145,7 @@
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -6003,7 +5992,6 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -6063,7 +6051,7 @@
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -6948,10 +6936,6 @@
 fi
 
 	    ;;
-	    *-*-openbsd*)
-	    CATOBJEXT=.mo
-            DATADIRNAME=share
-	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -7286,36 +7270,45 @@
 
 
 
+# Check whether --with-gconf was given.
+if test "${with_gconf+set}" = set; then :
+  withval=$with_gconf;
+else
+  with_gconf=check
+fi
+
+if test "x$with_gconf" != xyes; then :
+
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMLIB" >&5
-$as_echo_n "checking for GMLIB... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB2_26" >&5
+$as_echo_n "checking for GLIB2_26... " >&6; }
 
-if test -n "$GMLIB_CFLAGS"; then
-    pkg_cv_GMLIB_CFLAGS="$GMLIB_CFLAGS"
+if test -n "$GLIB2_26_CFLAGS"; then
+    pkg_cv_GLIB2_26_CFLAGS="$GLIB2_26_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmlib >= 1.0.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gmlib >= 1.0.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GMLIB_CFLAGS=`$PKG_CONFIG --cflags "gmlib >= 1.0.7" 2>/dev/null`
+  pkg_cv_GLIB2_26_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
  else
     pkg_failed=untried
 fi
-if test -n "$GMLIB_LIBS"; then
-    pkg_cv_GMLIB_LIBS="$GMLIB_LIBS"
+if test -n "$GLIB2_26_LIBS"; then
+    pkg_cv_GLIB2_26_LIBS="$GLIB2_26_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmlib >= 1.0.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gmlib >= 1.0.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GMLIB_LIBS=`$PKG_CONFIG --libs "gmlib >= 1.0.7" 2>/dev/null`
+  pkg_cv_GLIB2_26_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7335,45 +7328,29 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GMLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmlib >= 1.0.7" 2>&1`
+	        GLIB2_26_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.26.0" 2>&1`
         else
-	        GMLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmlib >= 1.0.7" 2>&1`
+	        GLIB2_26_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.26.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GMLIB_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gmlib >= 1.0.7) were not met:
-
-$GMLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GMLIB_CFLAGS
-and GMLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+	echo "$GLIB2_26_PKG_ERRORS" >&5
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: Using GLIB < 2.26 specific features" >&5
+$as_echo "$as_me: Using GLIB < 2.26 specific features" >&6;}
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GMLIB_CFLAGS
-and GMLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: Using GLIB < 2.26 specific features" >&5
+$as_echo "$as_me: Using GLIB < 2.26 specific features" >&6;}
 else
-	GMLIB_CFLAGS=$pkg_cv_GMLIB_CFLAGS
-	GMLIB_LIBS=$pkg_cv_GMLIB_LIBS
+	GLIB2_26_CFLAGS=$pkg_cv_GLIB2_26_CFLAGS
+	GLIB2_26_LIBS=$pkg_cv_GLIB2_26_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+	with_gconf=no with_gsettings=yes with_gio=yes GLIB2_26_DEFINES="-DGLIB2_26_ENABLED"
+$as_echo "#define GLIB2_26_ENABLED 1" >>confdefs.h
+
+fi
 
 fi
 
@@ -7381,12 +7358,29 @@
 
 
 
+
+
 # Check whether --with-xulrunner-sdk was given.
 if test "${with_xulrunner_sdk+set}" = set; then :
   withval=$with_xulrunner_sdk;
 	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
 	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
 	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+	# Check whether --enable-new-libxul was given.
+if test "${enable_new_libxul+set}" = set; then :
+  enableval=$enable_new_libxul; usenewlibxul=$enableval
+else
+  usenewlibxul=no
+fi
+
+
+	if test "$usenewlibxul" = "yes"; then
+		GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
+
+$as_echo "#define HAVE_NEW_XULRUNNER 1" >>confdefs.h
+
+	fi
+
 
 fi
 
@@ -7462,7 +7456,8 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Using libxul >= 2.0 " >&5
+$as_echo "#define HAVE_NEW_XULRUNNER 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using libxul >= 2.0 " >&5
 $as_echo "$as_me: Using libxul >= 2.0 " >&6;}
 
 fi
@@ -7538,7 +7533,9 @@
 	GECKO_LIBS=$pkg_cv_GECKO_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using libxul >= 1.9.2" >&5
+
+$as_echo "#define HAVE_NEW_XULRUNNER 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using libxul >= 1.9.2" >&5
 $as_echo "$as_me: Using libxul >= 1.9.2" >&6;}
 
 fi
@@ -7906,13 +7903,13 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GECKO_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: seamonkey-plugin not found, trying another" >&5
-$as_echo "$as_me: WARNING: seamonkey-plugin not found, trying another" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: seamokey-plugin not found, trying another" >&5
+$as_echo "$as_me: WARNING: seamokey-plugin not found, trying another" >&2;}
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: seamonkey-plugin not found, trying another" >&5
-$as_echo "$as_me: WARNING: seamonkey-plugin not found, trying another" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: seamokey-plugin not found, trying another" >&5
+$as_echo "$as_me: WARNING: seamokey-plugin not found, trying another" >&2;}
 else
 	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
 	GECKO_LIBS=$pkg_cv_GECKO_LIBS
@@ -8076,38 +8073,37 @@
 fi
 fi
 
-if test "$GECKO_CFLAGS" = ""; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GECKO" >&5
-$as_echo_n "checking for GECKO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSPR" >&5
+$as_echo_n "checking for NSPR... " >&6; }
 
-if test -n "$GECKO_CFLAGS"; then
-    pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+if test -n "$NSPR_CFLAGS"; then
+    pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"npapi-sdk\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "npapi-sdk") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nspr\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "npapi-sdk" 2>/dev/null`
+  pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
 else
   pkg_failed=yes
 fi
  else
     pkg_failed=untried
 fi
-if test -n "$GECKO_LIBS"; then
-    pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+if test -n "$NSPR_LIBS"; then
+    pkg_cv_NSPR_LIBS="$NSPR_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"npapi-sdk\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "npapi-sdk") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nspr\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "npapi-sdk" 2>/dev/null`
+  pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -8127,173 +8123,177 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "npapi-sdk" 2>&1`
+	        NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nspr" 2>&1`
         else
-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "npapi-sdk" 2>&1`
+	        NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors "nspr" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GECKO_PKG_ERRORS" >&5
+	echo "$NSPR_PKG_ERRORS" >&5
 
-	as_fn_error $? "npapi-sdk not found, all out of tries" "$LINENO" 5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nspr not found, may not be needed" >&5
+$as_echo "$as_me: WARNING: nspr not found, may not be needed" >&2;}
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "npapi-sdk not found, all out of tries" "$LINENO" 5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nspr not found, may not be needed" >&5
+$as_echo "$as_me: WARNING: nspr not found, may not be needed" >&2;}
 else
-	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
-	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+	NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+	NSPR_LIBS=$pkg_cv_NSPR_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using npapi-sdk" >&5
-$as_echo "$as_me: Using npapi-sdk" >&6;}
 
-fi
-    require_nspr="yes"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for const return value of NPP_GetMIMEDescription" >&5
-$as_echo_n "checking for const return value of NPP_GetMIMEDescription... " >&6; }
-oCFLAGS=$CFLAGS
-CFLAGS="$GECKO_CFLAGS"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+    libdir=`$PKG_CONFIG --variable=libdir nspr`
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#ifndef XP_UNIX
-#define XP_UNIX 1
-#endif
-#include <npapi.h>
-#if NP_VERSION_MAJOR == 0 && NP_VERSION_MINOR < 27
-#error
-#else
-const char*NPP_GetMIMEDescription(void) {
-  return "test";
-}
-#endif
+fi
 
-int
-main ()
-{
 
-const char *f=NPP_GetMIMEDescription();
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
 
-$as_echo "#define NPAPI_USE_CONSTCHARS 1" >>confdefs.h
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+$as_echo_n "checking for DBUS... " >&6; }
 
+if test -n "$DBUS_CFLAGS"; then
+    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95 dbus-glib-1 >= 0.70\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$DBUS_LIBS"; then
+    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95 dbus-glib-1 >= 0.70\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>/dev/null`
 else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+        if test $_pkg_short_errors_supported = yes; then
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1`
+        else
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$DBUS_PKG_ERRORS" >&5
 
-CFLAGS=$oCFLAGS
+	as_fn_error $? "Package requirements (dbus-1 >= 0.95 dbus-glib-1 >= 0.70) were not met:
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usage of UTF8Characters" >&5
-$as_echo_n "checking for usage of UTF8Characters... " >&6; }
-oCFLAGS=$CFLAGS
-CFLAGS="$GECKO_CFLAGS"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+$DBUS_PKG_ERRORS
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-#ifndef XP_UNIX
-#define XP_UNIX 1
-#endif
-#include <npapi.h>
-#include <npruntime.h>
+Alternatively, you may set the environment variables DBUS_CFLAGS
+and DBUS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
 
-int
-main ()
-{
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
 
-NPString s;
-s.UTF8Characters = "Testing";
+Alternatively, you may set the environment variables DBUS_CFLAGS
+and DBUS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+else
+	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+	DBUS_LIBS=$pkg_cv_DBUS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-$as_echo "#define NPAPI_USE_UPPERCASE_UTF8 1" >>confdefs.h
+fi
 
 
-else
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+USE_GCONF=0
 
+# Check whether --with-gconf was given.
+if test "${with_gconf+set}" = set; then :
+  withval=$with_gconf;  if false; then
+  GCONF_SCHEMAS_INSTALL_TRUE=
+  GCONF_SCHEMAS_INSTALL_FALSE='#'
+else
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CFLAGS=$oCFLAGS
 
+else
+  with_gconf=check
+fi
 
+if test "x$with_gconf" != xno; then :
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSPR" >&5
-$as_echo_n "checking for NSPR... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
+$as_echo_n "checking for GCONF... " >&6; }
 
-if test -n "$NSPR_CFLAGS"; then
-    pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+if test -n "$GCONF_CFLAGS"; then
+    pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nspr\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
+  pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
  else
     pkg_failed=untried
 fi
-if test -n "$NSPR_LIBS"; then
-    pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+if test -n "$GCONF_LIBS"; then
+    pkg_cv_GCONF_LIBS="$GCONF_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nspr\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "nspr") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
+  pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -8313,79 +8313,140 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nspr" 2>&1`
+	        GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1`
         else
-	        NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors "nspr" 2>&1`
+	        GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$NSPR_PKG_ERRORS" >&5
+	echo "$GCONF_PKG_ERRORS" >&5
 
-	if test "$require_nspr" = "yes"; then
-      as_fn_error $? "nspr not found, required by detected gecko" "$LINENO" 5
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nspr not found, may not be needed" >&5
-$as_echo "$as_me: WARNING: nspr not found, may not be needed" >&2;}
-    fi
+	 if false; then
+  GCONF_SCHEMAS_INSTALL_TRUE=
+  GCONF_SCHEMAS_INSTALL_FALSE='#'
+else
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
+fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using keystore for preferences" >&5
+$as_echo "$as_me: Using keystore for preferences" >&6;}
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	if test "$require_nspr" = "yes"; then
-      as_fn_error $? "nspr not found, required by detected gecko" "$LINENO" 5
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nspr not found, may not be needed" >&5
-$as_echo "$as_me: WARNING: nspr not found, may not be needed" >&2;}
-    fi
+	 if false; then
+  GCONF_SCHEMAS_INSTALL_TRUE=
+  GCONF_SCHEMAS_INSTALL_FALSE='#'
 else
-	NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
-	NSPR_LIBS=$pkg_cv_NSPR_LIBS
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
+fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using keystore for preferences" >&5
+$as_echo "$as_me: Using keystore for preferences" >&6;}
+else
+	GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
+	GCONF_LIBS=$pkg_cv_GCONF_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-    libdir=`$PKG_CONFIG --variable=libdir nspr`
+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  else
+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+  fi
+
 
-    if test "$require_nspr" = "yes"; then
+# Check whether --with-gconf-source was given.
+if test "${with_gconf_source+set}" = set; then :
+  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
+fi
 
-$as_echo "#define HAVE_NSPR 1" >>confdefs.h
 
-      GECKO_CFLAGS="$GECKO_CFLAGS $NSPR_CFLAGS"
-    fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+
+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+  fi
+
+
+# Check whether --with-gconf-schema-file-dir was given.
+if test "${with_gconf_schema_file_dir+set}" = set; then :
+  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
+fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+
+  # Check whether --enable-schemas-install was given.
+if test "${enable_schemas_install+set}" = set; then :
+  enableval=$enable_schemas_install; case ${enableval} in
+       yes|no) ;;
+       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+      esac
+fi
+
+   if test "$enable_schemas_install" != no; then
+  GCONF_SCHEMAS_INSTALL_TRUE=
+  GCONF_SCHEMAS_INSTALL_FALSE='#'
+else
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
 fi
 
+ USE_GCONF=1
+ GCONF_DEFINES="-DHAVE_GCONF"
+$as_echo "#define HAVE_GCONF 1" >>confdefs.h
+
+fi
+
+
 
 
+fi
+
 
 
+# Check whether --with-gio was given.
+if test "${with_gio+set}" = set; then :
+  withval=$with_gio;
+else
+  with_gio=check
+fi
+
+if test "x$with_gio" != xno; then :
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
-$as_echo_n "checking for DBUS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
+$as_echo_n "checking for GIO... " >&6; }
 
-if test -n "$DBUS_CFLAGS"; then
-    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+if test -n "$GIO_CFLAGS"; then
+    pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95 dbus-glib-1 >= 0.70\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>/dev/null`
+  pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
  else
     pkg_failed=untried
 fi
-if test -n "$DBUS_LIBS"; then
-    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+if test -n "$GIO_LIBS"; then
+    pkg_cv_GIO_LIBS="$GIO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95 dbus-glib-1 >= 0.70\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>/dev/null`
+  pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -8405,51 +8466,36 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1`
+	        GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0" 2>&1`
         else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1`
+	        GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (dbus-1 >= 0.95 dbus-glib-1 >= 0.70) were not met:
-
-$DBUS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DBUS_CFLAGS
-and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+	echo "$GIO_PKG_ERRORS" >&5
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling without gio support" >&5
+$as_echo "$as_me: WARNING: Compiling without gio support" >&2;}
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DBUS_CFLAGS
-and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling without gio support" >&5
+$as_echo "$as_me: WARNING: Compiling without gio support" >&2;}
 else
-	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
-	DBUS_LIBS=$pkg_cv_DBUS_LIBS
+	GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
+	GIO_LIBS=$pkg_cv_GIO_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+	GIO_DEFINES="-DGIO_ENABLED"
+$as_echo "#define GIO_ENABLED 1" >>confdefs.h
 
 fi
 
 
 
 
+fi
+
+
 # Check whether --with-plugin_dir was given.
 if test "${with_plugin_dir+set}" = set; then :
   withval=$with_plugin_dir; plugindir=$withval
@@ -8560,93 +8606,7 @@
 fi
 
 
-BACKEND=`pkg-config --variable=preference_backend gmlib`
-
-if test ${BACKEND} = "gsettings"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: gmlib is using ${BACKEND} for preference storage" >&5
-$as_echo "$as_me: gmlib is using ${BACKEND} for preference storage" >&6;}
-         if false; then
-  GCONF_SCHEMAS_INSTALL_TRUE=
-  GCONF_SCHEMAS_INSTALL_FALSE='#'
-else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
-fi
-
-    USE_GSETTINGS=1
-
-elif test ${BACKEND} = "gconf"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: gmlib is using ${BACKEND} for preference storage" >&5
-$as_echo "$as_me: gmlib is using ${BACKEND} for preference storage" >&6;}
-    GSETTINGS_RULES=""
-
-
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-
-# Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then :
-  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-
-# Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then :
-  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-
-  # Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then :
-  enableval=$enable_schemas_install; case ${enableval} in
-       yes|no) ;;
-       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
-      esac
-fi
-
-   if test "$enable_schemas_install" != no; then
-  GCONF_SCHEMAS_INSTALL_TRUE=
-  GCONF_SCHEMAS_INSTALL_FALSE='#'
-else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
-fi
-
-
-    USE_GCONF=1
-
-elif test ${BACKEND} = "keystore"; then
-    GSETTINGS_RULES=""
-
-     if false; then
-  GCONF_SCHEMAS_INSTALL_TRUE=
-  GCONF_SCHEMAS_INSTALL_FALSE='#'
-else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
-fi
-
-fi
-
-
-ac_config_files="$ac_config_files Makefile gecko-mediaplayer.spec src/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile gecko-mediaplayer.spec src/Makefile src/libgmlib/Makefile po/Makefile.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8801,6 +8761,10 @@
   as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -9412,6 +9376,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "gecko-mediaplayer.spec") CONFIG_FILES="$CONFIG_FILES gecko-mediaplayer.spec" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/libgmlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/libgmlib/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff -Nru gecko-mediaplayer-1.0.7/configure.in gecko-mediaplayer-1.0.4/configure.in
--- gecko-mediaplayer-1.0.7/configure.in	2012-10-29 18:48:19.000000000 +0000
+++ gecko-mediaplayer-1.0.4/configure.in	2011-07-01 16:40:13.000000000 +0000
@@ -2,9 +2,9 @@
 dnl Created by Anjuta application wizard.
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gecko-mediaplayer, 1.0.7)
+AM_INIT_AUTOMAKE(gecko-mediaplayer, 1.0.4)
 AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE([enable])
+AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_ISC_POSIX
@@ -31,9 +31,18 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(GMLIB, [gmlib >= 1.0.7])
-AC_SUBST(GMLIB_CFLAGS)
-AC_SUBST(GMLIB_LIBS)
+AC_ARG_WITH([gconf],
+    [AS_HELP_STRING([--with-gconf],
+        [Use Gconf to store preferences])],
+        [],
+        [with_gconf=check])
+AS_IF([test "x$with_gconf" != xyes],        
+    [PKG_CHECK_MODULES(GLIB2_26,[glib-2.0 >= 2.26.0],[with_gconf=no with_gsettings=yes with_gio=yes GLIB2_26_DEFINES="-DGLIB2_26_ENABLED" AC_DEFINE([GLIB2_26_ENABLED],[1],[Define to 1 if you have GLIB 2.26 or higher])],AC_MSG_NOTICE([Using GLIB < 2.26 specific features]))
+    ])    
+
+AC_SUBST(GLIB2_26_DEFINES)
+AC_SUBST(ALSA_CFLAGS)
+AC_SUBST(PULSE_CFLAGS)
 
 
 AC_ARG_WITH([xulrunner-sdk],
@@ -43,17 +52,25 @@
 	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
 	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
 	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+	AC_ARG_ENABLE(new-libxul,
+		AC_HELP_STRING([--enable-new-libxul],[libxul/xulrunner-sdk is 1.9.2 or higher]),
+		[usenewlibxul=$enableval],[usenewlibxul=no])
+
+	if test "$usenewlibxul" = "yes"; then
+		GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
+		AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher])
+	fi
+	
 	],
         [])
 
 if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul >= 2],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
-        AC_MSG_NOTICE([Using libxul >= 2.0 ]) 
+PKG_CHECK_MODULES(GECKO, [libxul >= 2],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC" AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 2.0.0 or higher]) AC_MSG_NOTICE([Using libxul >= 2.0 ])
     ],[AC_MSG_NOTICE([libxul >= 2 not found, trying another])])
 fi
 
 if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_MSG_NOTICE([Using libxul >= 1.9.2])
+PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher]) AC_MSG_NOTICE([Using libxul >= 1.9.2])
     ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
 fi
 
@@ -79,7 +96,7 @@
 
 if test "$GECKO_CFLAGS" = ""; then
 PKG_CHECK_MODULES(GECKO, [seamonkey-plugin seamonkey-xpcom],[ AC_MSG_NOTICE([Using seamonkey])
-    ],[AC_MSG_WARN([seamonkey-plugin not found, trying another])])
+    ],[AC_MSG_WARN([seamokey-plugin not found, trying another])])
 fi
 
 if test "$GECKO_CFLAGS" = ""; then
@@ -92,74 +109,10 @@
     ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
 fi
 
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [npapi-sdk],[ AC_MSG_NOTICE([Using npapi-sdk])
-    ],[AC_MSG_ERROR([npapi-sdk not found, all out of tries])])
-    require_nspr="yes"
-fi
-
-AC_MSG_CHECKING([for const return value of NPP_GetMIMEDescription])
-oCFLAGS=$CFLAGS
-CFLAGS="$GECKO_CFLAGS"
-AC_LANG_PUSH([C])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifndef XP_UNIX
-#define XP_UNIX 1
-#endif
-#include <npapi.h>
-#if NP_VERSION_MAJOR == 0 && NP_VERSION_MINOR < 27
-#error
-#else
-const char*NPP_GetMIMEDescription(void) {
-  return "test";
-}
-#endif
-],[
-const char *f=NPP_GetMIMEDescription();
-])],[
-    AC_MSG_RESULT([yes])
-    AC_DEFINE([NPAPI_USE_CONSTCHARS],[1],[Define if NPAPI declares NPP_GetMIMEDescription as a const char*])
-],[
-    AC_MSG_RESULT([no])
-])
-AC_LANG_POP([C])
-CFLAGS=$oCFLAGS
-
-AC_MSG_CHECKING([for usage of UTF8Characters])
-oCFLAGS=$CFLAGS
-CFLAGS="$GECKO_CFLAGS"
-AC_LANG_PUSH([C])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifndef XP_UNIX
-#define XP_UNIX 1
-#endif
-#include <npapi.h>
-#include <npruntime.h>
-],[
-NPString s;
-s.UTF8Characters = "Testing";
-])],[
-    AC_MSG_RESULT([yes])
-    AC_DEFINE([NPAPI_USE_UPPERCASE_UTF8],[1],[Define if NPAPI declares NPString with an uppercase UTF8])
-],[
-    AC_MSG_RESULT([no])
-])
-AC_LANG_POP([C])
-CFLAGS=$oCFLAGS
-
-    
-dnl Locate where the plugins should go
 PKG_CHECK_MODULES(NSPR, [nspr],[
     libdir=`$PKG_CONFIG --variable=libdir nspr`
     AC_SUBST(libdir)
-    if test "$require_nspr" = "yes"; then
-      AC_DEFINE([HAVE_NSPR],[1],[Define to 1 if using nspr])
-      GECKO_CFLAGS="$GECKO_CFLAGS $NSPR_CFLAGS"
-    fi],[if test "$require_nspr" = "yes"; then
-      AC_MSG_ERROR([nspr not found, required by detected gecko])
-    else
-      AC_MSG_WARN([nspr not found, may not be needed])
-    fi])
+    ],[AC_MSG_WARN([nspr not found, may not be needed])])
 
 
 AC_SUBST(GECKO_CFLAGS)
@@ -169,6 +122,33 @@
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+USE_GCONF=0
+AC_ARG_WITH([gconf],
+    [AS_HELP_STRING([--with-gconf],
+        [Use Gconf to store preferences])],
+        [AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])],
+        [with_gconf=check])
+AS_IF([test "x$with_gconf" != xno],        
+    [PKG_CHECK_MODULES(GCONF, [gconf-2.0],[AM_GCONF_SOURCE_2 USE_GCONF=1
+ GCONF_DEFINES="-DHAVE_GCONF" AC_DEFINE([HAVE_GCONF],[1],[Define to 1 to use GConf to store preferences])],[AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false]) AC_MSG_NOTICE([Using keystore for preferences])])
+    AC_SUBST(GCONF_DEFINES)
+    AC_SUBST(GCONF_CFLAGS)
+    AC_SUBST(GCONF_LIBS)
+    ])
+AC_SUBST(USE_GCONF)
+
+AC_ARG_WITH([gio],
+    [AS_HELP_STRING([--with-gio],
+        [Use GIO for file I/O])],
+        [],
+        [with_gio=check])
+AS_IF([test "x$with_gio" != xno], 
+    [PKG_CHECK_MODULES(GIO,[gio-2.0],[GIO_DEFINES="-DGIO_ENABLED" AC_DEFINE([GIO_ENABLED],[1],[Define to 1 if you have GIO support])],AC_MSG_WARN([Compiling without gio support]))
+    AC_SUBST(GIO_DEFINES)
+    AC_SUBST(GIO_CFLAGS)
+    AC_SUBST(GIO_LIBS)
+    ])
+
 AC_ARG_WITH([plugin_dir],
     [AS_HELP_STRING([--with-plugin-dir=dir],
         [Directory where plugins are stored])],
@@ -197,32 +177,11 @@
     ])    
 
 
-BACKEND=`pkg-config --variable=preference_backend gmlib`
-
-if test ${BACKEND} = "gsettings"; then
-    AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
-    dnl GLIB_GSETTINGS
-    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
-    USE_GSETTINGS=1
-    AC_SUBST(USE_GSETTINGS)
-elif test ${BACKEND} = "gconf"; then
-    AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
-    GSETTINGS_RULES=""
-    AC_SUBST(GSETTINGS_RULES)
-    AM_GCONF_SOURCE_2 
-    USE_GCONF=1
-    AC_SUBST(USE_GCONF)    
-elif test ${BACKEND} = "keystore"; then
-    GSETTINGS_RULES=""
-    AC_SUBST(GSETTINGS_RULES)
-    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
-fi
-
-
 AC_OUTPUT([
 Makefile
 gecko-mediaplayer.spec
 src/Makefile
+src/libgmlib/Makefile
 po/Makefile.in
 ])
 
diff -Nru gecko-mediaplayer-1.0.7/debian/changelog gecko-mediaplayer-1.0.4/debian/changelog
--- gecko-mediaplayer-1.0.7/debian/changelog	2012-11-21 21:33:38.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/changelog	2011-08-20 12:46:36.000000000 +0000
@@ -1,111 +1,11 @@
-gecko-mediaplayer (1.0.7-1ubuntu1) raring; urgency=low
+gecko-mediaplayer (1.0.4-2ubuntu1~ppa1) oneiric; urgency=low
 
-  * Merge from Debian experimental, Ubuntu remaining changes :
-  * debian/rules:
-   - Disable --as-needed to fix another FTBFS on Ubuntu.
-  * debian/control:
-    - Build depend on libnspr4-dev
-  * debian/patches/0002-require-nspr.patch:
-    - firefox-dev now only provides npapi headers so require nspr to build
-    (LP: #1055639)
-
- -- Julien Lavergne <gilir@ubuntu.com>  Wed, 21 Nov 2012 22:33:14 +0100
-
-gecko-mediaplayer (1.0.7-1) experimental; urgency=low
-
-  * New upstream release.
-  * debian/control:
-    - Update my address.
-    - Bump gnome-mplayer Dep to 1.0.7.
-    - Bump libgmlib-dev Build-Dep to 1.0.7.
-    - Bump Standards-Version to 3.9.4 (no changes required).
-    - Remove audio/midi from Xb-Npp-MimeType (see #686762 for details).
-  * debian/copyright: Update my address.
-  * debian/rules: Compile with -std=gnu++0x to get rid of the xulrunner SDK
-    warning.
-
- -- Sebastian Ramacher <sramacher@debian.org>  Sun, 18 Nov 2012 11:33:04 +0100
-
-gecko-mediaplayer (1.0.6-1ubuntu2) quantal; urgency=low
-
-  * debian/patches/0002-require-nspr.patch:
-    - firefox-dev now only provides npapi headers so require nspr to build
-    (LP: #1055639)
-  * debian/rules:
-    - Drop --with-xulrunner-sdk
-  * debian/control:
-    - Build depend on libnspr4-dev
-
- -- Jason Conti <jason.conti@gmail.com>  Mon, 24 Sep 2012 12:57:53 -0400
-
-gecko-mediaplayer (1.0.6-1ubuntu1) quantal; urgency=low
-
-  * Sync with Debian (LP: #928101)
-  * Ubuntu remaining changes :
-   - debian/rules:
-    + Add --with-xulrunner-sdk to fix FTBFS on Ubuntu (LP: #935501)
-    + Disable --as-needed to fix another FTBFS on Ubuntu.
-
- -- Julien Lavergne <gilir@ubuntu.com>  Fri, 04 May 2012 19:11:21 +0200
-
-gecko-mediaplayer (1.0.6-1) unstable; urgency=low
-
-  * New upstream release. 
-  * debian/patches:
-    - Update 0001-mozalloc.patch.
-    - Remove 0002-fix-spelling-error.patch (not needed anymore).
-  * debian/control:
-    - Bump Standards version to 3.9.3 (no changes required).
-    - Bump Depends on gnome-mplayer to 1.0.6 to keep them in sync.
-    - Bump Build-Dep on debhelper to >= 9.
-    - Drop unnecessary Build-Dep on dpkg-dev.
-  * debian/copyright: Update Format URL.
-  * debian/rules:
-    - Enable verbose build output.
-    - Enable parallel build.
-    - Drop include of /usr/share/dpkg/buildflags.mk. The flags are exported by
-      debhelper with compat level 9.
-  * debian/compat: Bump to 9.
-
- -- Sebastian Ramacher <s.ramacher@gmx.at>  Sun, 29 Apr 2012 20:02:19 +0200
-
-gecko-mediaplayer (1.0.5-1) unstable; urgency=low
-
-  [ Sebastian Ramacher ]
-  * New upstream release (Closes: #652152).
-  * debian/control:
-    - add myself to Uploaders.
-    - don't depend on specific browsers (Closes: #567169)
-    - Build-Dep on dh-autoreconf instead of autotools-dev.
-    - Build-Dep on pkg-config (>= 2.26).
-    - Remove unnecessary Build-Dep on libidl0.
-  * debian/rules:
-    - regenerate configure with dh-autoreconf.
-  * debian/patches:
-    - add 0002-fix-spelling-error.patch to fix spelling mistake in
-      src/plugin.cpp.
-    - update 0001-nomozalloc.patch to not include diff for configure.
-
-  [ Julien Lavergne ]
-  * debian/patches:
-    - force-no-gsettings.patch: Remove, since gnome-mplayer provide the
-      gsettings schemas.
-
-  [ Brandon Snider ]
-  * debian/rules: convert package to dh short form (Closes: #638336).
-  * debian/compat: bump compat to 8.
-  * debian/control:
-    - Build-Dep on debhelper (>= 8)
-    - Build-Dep on libgmlib-dev
-  * debian/copyright: make it DEP-5 compliant
-
-  [ Aron Xu ]
-  * debian/control:
-    - Move to Debian Multimedia Team, add Julien and myself to Uploaders.
-      (Closes: #628997)
-    - Add Vcs-* fields.
+  * Sync with Debian unstable.
+  * debian/patches
+   - force-no-gsettings.patch: Remove, since gnome-mplayer provide the
+     gsettings schemas.
 
- -- Sebastian Ramacher <s.ramacher@gmx.at>  Thu, 05 Jan 2012 00:53:13 +0100
+ -- Julien Lavergne <gilir@ubuntu.com>  Sat, 20 Aug 2011 14:46:27 +0200
 
 gecko-mediaplayer (1.0.4-2) unstable; urgency=high
 
diff -Nru gecko-mediaplayer-1.0.7/debian/compat gecko-mediaplayer-1.0.4/debian/compat
--- gecko-mediaplayer-1.0.7/debian/compat	2012-04-29 17:57:20.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/compat	2011-08-05 15:42:54.000000000 +0000
@@ -1 +1 @@
-9
+7
diff -Nru gecko-mediaplayer-1.0.7/debian/control gecko-mediaplayer-1.0.4/debian/control
--- gecko-mediaplayer-1.0.7/debian/control	2012-11-21 21:32:19.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/control	2011-08-20 12:46:43.000000000 +0000
@@ -2,40 +2,29 @@
 Section: video
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
-Uploaders:
- Julien Lavergne <gilir@ubuntu.com>,
- Aron Xu <aron@debian.org>,
- Sebastian Ramacher <sramacher@debian.org>
-Build-Depends:
- debhelper (>= 9),
- dh-autoreconf,
- pkg-config (>= 0.26),
- libglib2.0-dev (>= 2.14),
- xulrunner-dev | firefox-dev,
- libdbus-1-dev (>= 0.95),
- libdbus-glib-1-dev (>= 0.70),
- libx11-dev,
- libgmlib-dev (>= 1.0.7),
- libgconf2-dev,
- libcurl4-gnutls-dev | libcurl-dev,
- libnspr4-dev
-Standards-Version: 3.9.4
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends: debhelper (>= 7),
+	       autotools-dev,
+	       pkg-config (>= 0.20),
+	       libglib2.0-dev (>= 2.14),
+	       xulrunner-dev | firefox-dev,
+	       libdbus-1-dev (>= 0.95),
+	       libdbus-glib-1-dev (>= 0.70),
+	       libx11-dev,
+	       libidl0,
+	       libgconf2-dev (>= 2.20),
+               libcurl4-gnutls-dev | libcurl-dev
+Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/gecko-mediaplayer/
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/gecko-mediaplayer.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/gecko-mediaplayer.git
 
 Package: gecko-mediaplayer
 Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- gnome-mplayer (>= 1.0.7)
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-mplayer (>= 1.0.4), iceweasel | firefox | iceape-browser | epiphany-browser | galeon | xulrunner-1.9.1 | xulrunner-1.9.2 | konqueror (>= 4:4) | opera (>= 9.50) | chromium-browser (>> 4.0)
 Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a, aa5ca914-c309-495d-91cf-3141bbb04115
 Xb-Npp-Name: Gecko Media Player
 Xb-Npp-Description: Play media off the net using the gnome-mplayer
 Xb-Npp-File: gecko-mediaplayer
-Xb-Npp-MimeType: video/mpeg, audio/mpeg, video/x-mpeg, video/x-mpeg2, audio/x-mpeg, audio/mpeg2, audio/x-mpeg2, audio/mpeg3, audio/x-mpeg3, audio/mp3, audio/x-mpegurl, video/mp4, application/x-ogg, audio/ogg, application/ogg, video/fli, video/x-fli, video/vnd.vivo, application/x-nsv-vp3-mp3, audio/basic, audio/x-basic, audio/x-scpls, video/divx, video/vnd.divx, video/quicktime, video/x-quicktime, image/x-quicktime, video/quicktime, video/quicktime, application/x-quicktimeplayer, application/asx, video/x-ms-asf-plugin, video/x-msvideo, video/msvideo, application/x-mplayer2, application/x-ms-wmv, video/x-ms-asf, video/x-ms-wm, video/x-ms-wmv, audio/x-ms-wmv, video/x-ms-wmp, video/x-ms-wvx, audio/x-ms-wax, audio/x-ms-wma, application/x-drm-v2, audio/wav, audio/x-wav, audio/x-pn-realaudio, application/vnd.rn-realmedia, application/vnd.rn-realaudio, video/vnd.rn-realvideo, audio/x-realaudio, audio/x-pn-realaudio-plugin, application/smil, audio/x-mod
+Xb-Npp-MimeType: video/mpeg, audio/mpeg, video/x-mpeg, video/x-mpeg2, audio/x-mpeg, audio/mpeg2, audio/x-mpeg2, audio/mpeg3, audio/x-mpeg3, audio/mp3, audio/x-mpegurl, video/mp4, application/x-ogg, audio/ogg, application/ogg, video/fli, video/x-fli, video/vnd.vivo, application/x-nsv-vp3-mp3, audio/basic, audio/x-basic, audio/x-scpls, video/divx, video/vnd.divx, audio/midi, video/quicktime, video/x-quicktime, image/x-quicktime, video/quicktime, video/quicktime, application/x-quicktimeplayer, application/asx, video/x-ms-asf-plugin, video/x-msvideo, video/msvideo, application/x-mplayer2, application/x-ms-wmv, video/x-ms-asf, video/x-ms-wm, video/x-ms-wmv, audio/x-ms-wmv, video/x-ms-wmp, video/x-ms-wvx, audio/x-ms-wax, audio/x-ms-wma, application/x-drm-v2, audio/wav, audio/x-wav, audio/x-pn-realaudio, application/vnd.rn-realmedia, application/vnd.rn-realaudio, video/vnd.rn-realvideo, audio/x-realaudio, audio/x-pn-realaudio-plugin, application/smil, audio/x-mod
 Description: Multimedia plug-in for Gecko browsers
  Gecko Media Player is a browser plug-in that uses GNOME MPlayer
  and Mplayer to play media in a browser.
diff -Nru gecko-mediaplayer-1.0.7/debian/copyright gecko-mediaplayer-1.0.4/debian/copyright
--- gecko-mediaplayer-1.0.7/debian/copyright	2012-11-16 18:17:41.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/copyright	2011-08-05 15:42:54.000000000 +0000
@@ -1,538 +1,106 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Gecko Media Player
-Upstream-Contact: Kevin DeKorte <kdekorte@gmail.com>
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Gecko Media Player
+Contact: Kevin DeKorte <kdekorte@gmail.com>
 Source: http://code.google.com/p/gecko-mediaplayer/
 
-Files: * po/*.po
-Copyright: © 2006-2011 Kevin DeKorte
+Files: *, src/libgmlib/*.[c,h], po/*.po
+Copyright: © 2006-2009 Kevin DeKorte
 License: GPL-2+
 
-Files: src/*.cpp src/*.h
+Files: src/*.cpp, src/*.h
 Copyright: © 1998 Netscape Communications Corporation
-License: MPL-1.1 or GPL-2+ or LGPL-2.1+
+License: MPL-1.1 | GPL-2+ | LGPL-2.1+
+
+Files: src/np_entry.cpp, src/npn_gate.cpp, src/npp_gate.cpp
+Copyright: © 1998 Netscape Communications Corporation
+License: NPL-1.1 | GPL-2+ | LGPL-2.1+
 
 Files: debian/*
 Copyright: © 2009 Cesare Tirabassi <norsetto@ubuntu.com>
-           Copyright 2012 Sebastian Ramacher <sramacher@debian.org>
 License: GPL-2+
 
+Files: missing, ltmain.sh, depcomp
+Copyright: © 1994-2006  Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: src/Makefile.in, src/libgmlib/Makefile.in, Makefile.in, configure, aclocal.m4
+Copyright: © 1994-2008  Free Software Foundation, Inc.
+License: GAP
+
+Files: install-sh
+Copyright: © 1994 X Consortium
+License: X11
+
+Files: INSTALL
+Copyright: © 1994-2005 Free Software Foundation, Inc.
+License: GFDL
+
 Files: po/Makefile.in.in
 Copyright: © 1995-1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 License: other
 
 License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
 
-License: other
- This file can be copied and used freely without restrictions. It can
- be used in projects which are not available under the GNU General Public
- License but which still want to provide support for the GNU gettext
- functionality. Please note that the actual code is *not* freely available.
-
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
  .
- This library is distributed in the hope that it will be useful,
+ This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
  .
- Full license text: /usr/share/common-licenses/LGPL-2.1
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: X11
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+
+License: GFDL
+
+ This file is free documentation; the Free Software Foundation gives
+ unlimited permission to copy, distribute and modify it.
+
+License: GAP
+
+ This software is free software; you are given unlimited permission to
+ copy and/or distribute it, with or without modifications, as long as
+ this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
 
-License: MPL-1.1
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
- .
-                              ---------------
- .
- 1. Definitions.
- .
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
- .
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
- .
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
- .
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
- .
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
- .
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
- .
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
- .
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
- .
-     1.8. "License" means this document.
- .
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
- .
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
- .
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
- .
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
- .
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
- .
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
- .
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
- .
- 2. Source Code License.
- .
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
- .
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
- .
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
- .
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
- .
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
- .
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
- .
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
- .
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
- .
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
- .
- 3. Distribution Obligations.
- .
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
- .
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
- .
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
- .
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
- .
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
- .
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
- .
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
- .
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
- .
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
- .
- 4. Inability to Comply Due to Statute or Regulation.
- .
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
- .
- 5. Application of this License.
- .
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
- .
- 6. Versions of the License.
- .
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
- .
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
- .
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
- .
- 7. DISCLAIMER OF WARRANTY.
- .
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
- .
- 8. TERMINATION.
- .
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
- .
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
- .
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
- .
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
- .
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
- .
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
- .
- 9. LIMITATION OF LIABILITY.
- .
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
- .
- 10. U.S. GOVERNMENT END USERS.
- .
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
- .
- 11. MISCELLANEOUS.
- .
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
- .
- 12. RESPONSIBILITY FOR CLAIMS.
- .
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
- .
- 13. MULTIPLE-LICENSED CODE.
- .
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
- .
- EXHIBIT A -Mozilla Public License.
- .
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
- .
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
- .
-     The Original Code is ______________________________________.
- .
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
- .
-     Contributor(s): ______________________________________.
- .
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
- .
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
+License: other
+
+ This file can be copied and used freely without restrictions. It can
+ be used in projects which are not available under the GNU Public License
+ but which still want to provide support for the GNU gettext functionality.
+ Please note that the actual code is *not* freely available.
diff -Nru gecko-mediaplayer-1.0.7/debian/gbp.conf gecko-mediaplayer-1.0.4/debian/gbp.conf
--- gecko-mediaplayer-1.0.7/debian/gbp.conf	2012-11-16 18:10:13.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-debian-branch = experimental
diff -Nru gecko-mediaplayer-1.0.7/debian/patches/0001-nomozalloc.patch gecko-mediaplayer-1.0.4/debian/patches/0001-nomozalloc.patch
--- gecko-mediaplayer-1.0.7/debian/patches/0001-nomozalloc.patch	2012-04-29 15:06:41.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/patches/0001-nomozalloc.patch	2011-08-05 15:42:54.000000000 +0000
@@ -1,17 +1,22 @@
-Description: link against xpcomglue_s_nomozalloc
-Author: Mike Hommey <glandium@debian.org>
-Last-Update: 2012-04-07
-
-diff --git a/configure.in b/configure.in
-index 8d0c87d..271a4f7 100644
+--- a/configure
++++ b/configure
+@@ -7281,7 +7281,7 @@
+   withval=$with_xulrunner_sdk;
+ 	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
+ 	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
+-	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
++	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+ 	# Check whether --enable-new-libxul was given.
+ if test "${enable_new_libxul+set}" = set; then :
+   enableval=$enable_new_libxul; usenewlibxul=$enableval
 --- a/configure.in
 +++ b/configure.in
-@@ -42,7 +42,7 @@ AC_ARG_WITH([xulrunner-sdk],
+@@ -48,7 +48,7 @@
          [
  	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
  	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
 -	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
 +	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
- 	],
-         [])
- 
+ 	AC_ARG_ENABLE(new-libxul,
+ 		AC_HELP_STRING([--enable-new-libxul],[libxul/xulrunner-sdk is 1.9.2 or higher]),
+ 		[usenewlibxul=$enableval],[usenewlibxul=no])
diff -Nru gecko-mediaplayer-1.0.7/debian/patches/0002-require-nspr.patch gecko-mediaplayer-1.0.4/debian/patches/0002-require-nspr.patch
--- gecko-mediaplayer-1.0.7/debian/patches/0002-require-nspr.patch	2012-09-26 13:45:59.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/patches/0002-require-nspr.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-Description: require nspr to build plugin
-  firefox-dev in quantal only provides the npapi headers so we need nspr to
-  build the plugin. (Perhaps firefox-dev should provide npapi-sdk.pc instead?
-  Then this patch wouldn't be required.)
-Author: Jason Conti <jason.conti@gmail.com>
-Last-Update: 2012-09-24
-Bug-Ubuntu: https://launchpad.net/bugs/1055639
-
---- gecko-mediaplayer-1.0.6.orig/configure.in
-+++ gecko-mediaplayer-1.0.6/configure.in
-@@ -68,8 +68,9 @@ PKG_CHECK_MODULES(GECKO, [libxul-unstabl
- fi
- 
- if test "$GECKO_CFLAGS" = ""; then
--PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla])
-+PKG_CHECK_MODULES(GECKO, [mozilla-plugin],[ AC_MSG_NOTICE([Using mozilla])
-     ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
-+    require_nspr="yes"
- fi
- 
- if test "$GECKO_CFLAGS" = ""; then
diff -Nru gecko-mediaplayer-1.0.7/debian/patches/force-no-gsettings.patch gecko-mediaplayer-1.0.4/debian/patches/force-no-gsettings.patch
--- gecko-mediaplayer-1.0.7/debian/patches/force-no-gsettings.patch	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/patches/force-no-gsettings.patch	2011-08-05 15:42:54.000000000 +0000
@@ -0,0 +1,131 @@
+Description: Force not to use gsettings
+Author: Chris Coulson <chris.coulson@canonical.com>
+Origin: other
+Last-Update: 2011-08-05
+
+--- gecko-mediaplayer-1.0.4.orig/configure.in
++++ gecko-mediaplayer-1.0.4/configure.in
+@@ -36,9 +36,6 @@ AC_ARG_WITH([gconf],
+         [Use Gconf to store preferences])],
+         [],
+         [with_gconf=check])
+-AS_IF([test "x$with_gconf" != xyes],        
+-    [PKG_CHECK_MODULES(GLIB2_26,[glib-2.0 >= 2.26.0],[with_gconf=no with_gsettings=yes with_gio=yes GLIB2_26_DEFINES="-DGLIB2_26_ENABLED" AC_DEFINE([GLIB2_26_ENABLED],[1],[Define to 1 if you have GLIB 2.26 or higher])],AC_MSG_NOTICE([Using GLIB < 2.26 specific features]))
+-    ])    
+ 
+ AC_SUBST(GLIB2_26_DEFINES)
+ AC_SUBST(ALSA_CFLAGS)
+--- gecko-mediaplayer-1.0.4.orig/configure
++++ gecko-mediaplayer-1.0.4/configure
+@@ -627,8 +627,6 @@ GECKO_CFLAGS
+ PULSE_CFLAGS
+ ALSA_CFLAGS
+ GLIB2_26_DEFINES
+-GLIB2_26_LIBS
+-GLIB2_26_CFLAGS
+ GLIB_LIBS
+ GLIB_CFLAGS
+ PKG_CONFIG_LIBDIR
+@@ -777,8 +775,6 @@ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+ GLIB_CFLAGS
+ GLIB_LIBS
+-GLIB2_26_CFLAGS
+-GLIB2_26_LIBS
+ GECKO_CFLAGS
+ GECKO_LIBS
+ NSPR_CFLAGS
+@@ -1449,10 +1445,6 @@ Some influential environment variables:
+               path overriding pkg-config's built-in search path
+   GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+   GLIB_LIBS   linker flags for GLIB, overriding pkg-config
+-  GLIB2_26_CFLAGS
+-              C compiler flags for GLIB2_26, overriding pkg-config
+-  GLIB2_26_LIBS
+-              linker flags for GLIB2_26, overriding pkg-config
+   GECKO_CFLAGS
+               C compiler flags for GECKO, overriding pkg-config
+   GECKO_LIBS  linker flags for GECKO, overriding pkg-config
+@@ -7277,82 +7269,6 @@ else
+   with_gconf=check
+ fi
+ 
+-if test "x$with_gconf" != xyes; then :
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB2_26" >&5
+-$as_echo_n "checking for GLIB2_26... " >&6; }
+-
+-if test -n "$GLIB2_26_CFLAGS"; then
+-    pkg_cv_GLIB2_26_CFLAGS="$GLIB2_26_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GLIB2_26_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26.0" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GLIB2_26_LIBS"; then
+-    pkg_cv_GLIB2_26_LIBS="$GLIB2_26_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GLIB2_26_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26.0" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GLIB2_26_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.26.0" 2>&1`
+-        else
+-	        GLIB2_26_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.26.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GLIB2_26_PKG_ERRORS" >&5
+-
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Using GLIB < 2.26 specific features" >&5
+-$as_echo "$as_me: Using GLIB < 2.26 specific features" >&6;}
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Using GLIB < 2.26 specific features" >&5
+-$as_echo "$as_me: Using GLIB < 2.26 specific features" >&6;}
+-else
+-	GLIB2_26_CFLAGS=$pkg_cv_GLIB2_26_CFLAGS
+-	GLIB2_26_LIBS=$pkg_cv_GLIB2_26_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	with_gconf=no with_gsettings=yes with_gio=yes GLIB2_26_DEFINES="-DGLIB2_26_ENABLED"
+-$as_echo "#define GLIB2_26_ENABLED 1" >>confdefs.h
+-
+-fi
+-
+-fi
+ 
+ 
+ 
diff -Nru gecko-mediaplayer-1.0.7/debian/patches/series gecko-mediaplayer-1.0.4/debian/patches/series
--- gecko-mediaplayer-1.0.7/debian/patches/series	2012-09-26 13:45:59.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/patches/series	2011-08-20 12:42:45.000000000 +0000
@@ -1,2 +1 @@
 0001-nomozalloc.patch
-0002-require-nspr.patch
diff -Nru gecko-mediaplayer-1.0.7/debian/rules gecko-mediaplayer-1.0.4/debian/rules
--- gecko-mediaplayer-1.0.7/debian/rules	2012-11-21 20:08:11.000000000 +0000
+++ gecko-mediaplayer-1.0.4/debian/rules	2011-08-07 11:53:13.000000000 +0000
@@ -3,20 +3,89 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_CXXFLAGS_MAINT_APPEND=-std=gnu++0x
-export DEB_CPPLAGS_MAINT_APPEND=-DMOZ_NO_ALLOC
-#export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed
-
-# Build with verbose build output
-export V=1
-
-%:
-	dh $@ --parallel --with autoreconf
-
-override_dh_auto_configure:
-	dh_auto_configure -- --with-plugin-dir=/usr/lib/mozilla/plugins
-
-override_dh_auto_install:
-	dh_auto_install
-	# remove upstream documentation
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CXXFLAGS = -Wall -g
+LDFLAGS  = -Wl,-z,defs -Wl,--as-needed
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CXXFLAGS += -O0
+else
+	CXXFLAGS += -O2
+endif
+
+CXXFLAGS += -DMOZ_NO_MOZALLOC
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+#	dh_quilt_patch
+
+	ln -sf /usr/share/misc/config.sub config.sub
+	ln -sf /usr/share/misc/config.guess config.guess
+
+	./configure \
+		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --sysconfdir=\$${prefix}/share \
+		--with-plugin-dir=/usr/lib/mozilla/plugins \
+		--without-gconf --with-gio --disable-schemas-install \
+                --with-xulrunner-sdk=$(shell pkg-config --variable=sdkdir libxul) \
+                --enable-new-libxul \
+		CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp
+	dh_testdir
+
+	$(MAKE)
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+#	dh_quilt_unpatch
+	rm -f build-stamp configure-stamp
+
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	rm -f config.sub config.guess
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+
+	$(MAKE) DESTDIR=$(CURDIR)/debian/gecko-mediaplayer install
+
+	# remove docs installed by upstream
 	rm -rf $(CURDIR)/debian/gecko-mediaplayer/usr/share/doc/gecko-mediaplayer
+
+build-indep:
+build-arch:
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_install
+	dh_gconf
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff -Nru gecko-mediaplayer-1.0.7/gecko-mediaplayer.spec gecko-mediaplayer-1.0.4/gecko-mediaplayer.spec
--- gecko-mediaplayer-1.0.7/gecko-mediaplayer.spec	2012-10-29 18:48:27.000000000 +0000
+++ gecko-mediaplayer-1.0.4/gecko-mediaplayer.spec	2011-07-01 16:40:29.000000000 +0000
@@ -1,5 +1,5 @@
-%define ver 1.0.7
-%define use_gconf 
+%define ver 1.0.4
+%define use_gconf 0
 
 Name: gecko-mediaplayer
 Summary: Multimedia browser plugin for Gecko based browsers
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/cs.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/cs.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/cs.po gecko-mediaplayer-1.0.4/po/cs.po
--- gecko-mediaplayer-1.0.7/po/cs.po	2012-10-08 13:19:27.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/cs.po	2011-07-01 16:40:54.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gecko-mediaplayer 0.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
 "PO-Revision-Date: 2009-07-07 13:06+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -16,46 +16,46 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr ""
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Naplnění vyrovnávací paměti: %2.2f %%"
 
-#: src/plugin.cpp:924
-#, fuzzy
+#: src/plugin.cpp:879
+#, fuzzy, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "Metoda Write nemůže zapsat, protože položka je NULL\n"
 
 # kibibyes per second
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "Naplnění vyrovánací paměti: %iK (%0.1f K/s)"
 
 # kibibyes per second
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Naplnění vyrovnávací paměti: %2.2f %% (%0.1f KB/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr ""
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr ""
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr ""
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
 msgstr ""
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/de.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/de.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/de.po gecko-mediaplayer-1.0.4/po/de.po
--- gecko-mediaplayer-1.0.7/po/de.po	2012-10-08 13:19:27.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/de.po	2011-07-01 16:40:54.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gecko-mediaplayer 0.9.9.2-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
 "PO-Revision-Date: 2010-03-25 18:47+GMT\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -17,43 +17,44 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr ""
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Zwischenspeicher-Füllstand: %2.2f%%"
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "Es kann nicht geschrieben werden, da das Element NULL ist\n"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "%i KB (%0.1f KB/s) werden zwischengespeichert"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Zwischenspeicher-Füllstand: %2.2f%% (%0.1f KB/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr ""
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr ""
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr ""
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
 msgstr ""
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/es.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/es.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/es.po gecko-mediaplayer-1.0.4/po/es.po
--- gecko-mediaplayer-1.0.7/po/es.po	2012-10-08 13:19:27.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/es.po	2011-07-01 16:40:54.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Gecko Mediaplayer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
 "PO-Revision-Date: 2010-08-20 02:34+0100\n"
 "Last-Translator: Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>\n"
 "Language-Team: \n"
@@ -20,43 +20,44 @@
 "X-Poedit-Country: SPAIN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr ""
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Almacenando cache: %2.2f%%"
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "Es imposible de escribir ya que el objeto es NULL\n"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "Almacenando en cache %iK (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Almacenando cache: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr ""
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr ""
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr ""
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
 msgstr ""
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/fr.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/fr.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/fr.po gecko-mediaplayer-1.0.4/po/fr.po
--- gecko-mediaplayer-1.0.7/po/fr.po	2012-10-08 13:19:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/fr.po	2011-07-01 16:40:54.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gecko-mediaplayer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
 "PO-Revision-Date: 2011-06-08 16:04+0100\n"
 "Last-Translator: Alexandre Bedot <alexandre.bedot@free.fr>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -18,43 +18,44 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr "gecko mediaplayer v%s\n"
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Mise en mémoire tampon : %2.2f%%"
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "Écrire : Écriture impossible; l'objet est de type NULL.\n"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "Mise en mémoire tampon : %iK (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Mise en mémoire tampon : %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr "Lecture en cours"
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr "En pause"
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
 msgstr "État du tampon %2.1lf%%"
diff -Nru gecko-mediaplayer-1.0.7/po/gecko-mediaplayer.pot gecko-mediaplayer-1.0.4/po/gecko-mediaplayer.pot
--- gecko-mediaplayer-1.0.7/po/gecko-mediaplayer.pot	2012-10-08 13:19:27.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/gecko-mediaplayer.pot	2011-07-01 16:40:54.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,43 +17,44 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr ""
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr ""
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr ""
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr ""
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr ""
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr ""
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr ""
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr ""
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
 msgstr ""
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/it.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/it.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/it.po gecko-mediaplayer-1.0.4/po/it.po
--- gecko-mediaplayer-1.0.7/po/it.po	2012-10-08 13:19:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/it.po	2011-07-01 16:40:54.000000000 +0000
@@ -1,62 +1,63 @@
 # Italian translation of gecko-mediaplayer.
 # Copyright (C) Kevin DeKorte 2006-2007 <kdekorte@gmail.com>.
 # This file is distributed under the same license as the gecko-mediaplayer package.
-# Francesco Groccia <frgroccia gmail.com>, 2010.
+# Francesco Groccia <fgr@anche.no>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gecko-mediaplayer\n"
+"Project-Id-Version: gecko-mediaplayer 0.9.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
-"PO-Revision-Date: 2011-10-16 17:42+0200\n"
-"Last-Translator: Francesco Groccia <frgroccia gmail.com>\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
+"PO-Revision-Date: 2010-09-01 16:09+0200\n"
+"Last-Translator: Francesco Groccia <fgr@anche.no>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
-msgstr "gecko mediaplayer v%s\n"
+msgstr ""
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Cache piena al: %2.2f%%"
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "Impossibile scrivere perché l'oggetto è NULL\n"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
-msgstr "Riempimento della cache %iK (%0.1f K/s)"
+msgstr "Memorizzati %iK (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Cache piena al: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
-msgstr "Riproduzione"
+msgstr ""
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
-msgstr "Pausa"
+msgstr ""
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
-msgstr "Interrotto"
+msgstr ""
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
-msgstr "Riempimento del buffer %2.1lf%%"
+msgstr ""
 
 #: src/plugin.cpp:2633
 msgid "Unknown Status"
-msgstr "Stato sconosciuto"
+msgstr ""
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/ja.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/ja.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/ja.po gecko-mediaplayer-1.0.4/po/ja.po
--- gecko-mediaplayer-1.0.7/po/ja.po	2012-10-08 13:19:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/ja.po	2011-07-01 16:40:54.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gecko-mediaplayer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
-"PO-Revision-Date: 2012-04-05 10:51+0900\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
+"PO-Revision-Date: 2009-02-07 17:07+0900\n"
 "Last-Translator: Munehiro Yamamoto <munepixyz@gmail.com>\n"
 "Language-Team: munepi <munepixyz@gmail.com>\n"
 "Language: \n"
@@ -17,48 +17,48 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
-msgstr "gecko mediaplayer v%s\n"
+msgstr ""
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "キャッシュ中: %2.2f%%"
 
-#: src/plugin.cpp:924
-#, fuzzy
+#: src/plugin.cpp:879
+#, fuzzy, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "オブジェクトが NULL なので書き込むことができません"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, fuzzy, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "キャッシュ中: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "キャッシュ中: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
-msgstr "再生"
+msgstr ""
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
-msgstr "一時停止"
+msgstr ""
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
-msgstr "停止"
+msgstr ""
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
-msgstr "バッファ中 %2.1lf%%"
+msgstr ""
 
 #: src/plugin.cpp:2633
 msgid "Unknown Status"
-msgstr "不明なステータス"
+msgstr ""
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/nl.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/nl.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/nl.po gecko-mediaplayer-1.0.4/po/nl.po
--- gecko-mediaplayer-1.0.7/po/nl.po	2012-10-08 13:19:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/nl.po	2011-07-01 16:40:54.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gecko-mediaplayer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
-"PO-Revision-Date: 2011-07-22 13:53+0200\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
+"PO-Revision-Date: 2009-06-24 13:53+0100\n"
 "Last-Translator: Mark Huijgen <mark.sf.net@huijgen.tk>\n"
 "Language-Team: Mark Huijgen <mark.sf.net@huijgen.tk>\n"
 "Language: \n"
@@ -17,47 +17,48 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr ""
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Buffer niveau: %2.2f%%"
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, fuzzy, c-format
 msgid "Write unable to write because item is NULL\n"
-msgstr "Schrijven niet mogelijk omdat item NULL is\n"
+msgstr "Schrijven niet mogelijk omdat item NULL is"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
-#, c-format
+#: src/plugin.cpp:945 src/plugin.cpp:1360
+#, fuzzy, c-format
 msgid "Caching %iK (%0.1f K/s)"
-msgstr "Bufferen %iK (%0.1f K/s)"
+msgstr "Buffer niveau: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Buffer niveau: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
-msgstr "Afspelen"
+msgstr ""
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
-msgstr "Gepauzeerd"
+msgstr ""
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
-msgstr "Gestopt"
+msgstr ""
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
-msgstr "Bufferen %2.1lf%%"
+msgstr ""
 
 #: src/plugin.cpp:2633
 msgid "Unknown Status"
-msgstr "Onbekende status"
+msgstr ""
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/pl.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/pl.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/pl.po gecko-mediaplayer-1.0.4/po/pl.po
--- gecko-mediaplayer-1.0.7/po/pl.po	2012-10-08 13:19:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/pl.po	2011-07-01 16:40:54.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gecko-mediaplayer 0.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
 "PO-Revision-Date: 2011-06-15 21:50+0200\n"
 "Last-Translator: Julian Sikorski <belegdol@gmail.com>\n"
 "Language-Team: Polish <gnomepl@pandora.info.bielsko.pl>\n"
@@ -21,43 +21,44 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr "gecko mediaplayer w%s\n"
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Zapełnienie bufora: %2.2f%%"
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "Zapis niemożliwy ponieważ element jest NULL\n"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "Buforowanie: %iK (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Zapełnienie bufora: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr "Odtwarzanie "
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr "Wstrzymano"
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr "Zatrzymano"
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
 msgstr "Buforowanie %2.1lf%%"
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/pt.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/pt.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/pt.po gecko-mediaplayer-1.0.4/po/pt.po
--- gecko-mediaplayer-1.0.7/po/pt.po	2012-10-08 13:19:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/pt.po	2011-07-01 16:40:54.000000000 +0000
@@ -1,13 +1,14 @@
-# Portuguese translation for gecko-mplayer
-# This file is distributed under the same license as the gecko-mplayer package.
-# Sérgio Marques <smarquespt@gmail.com>, 2012
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gecko-mediaplayer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
-"PO-Revision-Date: 2012-04-05 10:56-0000\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
+"PO-Revision-Date: 2011-06-15 18:25-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -17,46 +18,47 @@
 "X-Poedit-Language: Potuguese\n"
 "X-Poedit-Country: Portugal\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr "gecko mediaplayer v%s\n"
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Preenchimento de cache: %2.2f%%"
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "Não é possível escrever pois o item é NULL\n"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "A colocar em cache %iK (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Preenchimento de cache: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr "A reproduzir"
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr "Em pausa"
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
-msgstr "A processar %2.1lf%%"
+msgstr "A colocar em mémoria %2.1lf%%"
 
 #: src/plugin.cpp:2633
 msgid "Unknown Status"
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/pt_BR.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/pt_BR.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/pt_BR.po gecko-mediaplayer-1.0.4/po/pt_BR.po
--- gecko-mediaplayer-1.0.7/po/pt_BR.po	2012-10-08 13:19:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/pt_BR.po	2011-07-01 16:40:54.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gecko-mediaplayer 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
 "PO-Revision-Date: 2008-05-31 12:46-0300\n"
 "Last-Translator: \n"
 "Language-Team: Portugese <LL@li.org>\n"
@@ -16,44 +16,44 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr ""
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Armazenando cache: %2.2f%%"
 
-#: src/plugin.cpp:924
-#, fuzzy
+#: src/plugin.cpp:879
+#, fuzzy, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "Não foi possível escrever porque o item é inválido (NULL)"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, fuzzy, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "Armazenando cache: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Armazenando cache: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr ""
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr ""
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr ""
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
 msgstr ""
Binary files /tmp/gpSsqQ5m5k/gecko-mediaplayer-1.0.7/po/tr.gmo and /tmp/gWKNGPg2A0/gecko-mediaplayer-1.0.4/po/tr.gmo differ
diff -Nru gecko-mediaplayer-1.0.7/po/tr.po gecko-mediaplayer-1.0.4/po/tr.po
--- gecko-mediaplayer-1.0.7/po/tr.po	2012-10-08 13:19:28.000000000 +0000
+++ gecko-mediaplayer-1.0.4/po/tr.po	2011-07-01 16:40:54.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 07:19-0600\n"
+"POT-Creation-Date: 2011-07-01 10:40-0600\n"
 "PO-Revision-Date: 2011-06-13 14:09+0300\n"
 "Last-Translator: Onur Küçük <onur@pardus.org.tr>\n"
 "Language-Team: Turkish <turkce@pardus.org.tr>\n"
@@ -18,43 +18,44 @@
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/plugin.cpp:427
+#: src/plugin.cpp:339
 #, c-format
 msgid "gecko mediaplayer v%s\n"
 msgstr "gecko mediaplayer %s\n"
 
-#: src/plugin.cpp:709
+#: src/plugin.cpp:614
 #, c-format
 msgid "Cache fill: %2.2f%%"
 msgstr "Önbellek: %2.2f%%"
 
-#: src/plugin.cpp:924
+#: src/plugin.cpp:879
+#, c-format
 msgid "Write unable to write because item is NULL\n"
 msgstr "NULL içerik yazılamıyor\n"
 
-#: src/plugin.cpp:990 src/plugin.cpp:1407
+#: src/plugin.cpp:945 src/plugin.cpp:1360
 #, c-format
 msgid "Caching %iK (%0.1f K/s)"
 msgstr "Önbellek %iK (%0.1f K/s)"
 
-#: src/plugin.cpp:993 src/plugin.cpp:1410
+#: src/plugin.cpp:948 src/plugin.cpp:1363
 #, c-format
 msgid "Cache fill: %2.2f%% (%0.1f K/s)"
 msgstr "Önbellek: %2.2f%% (%0.1f K/s)"
 
-#: src/plugin.cpp:2618
+#: src/plugin.cpp:2621
 msgid "Playing"
 msgstr "Oynatılıyor"
 
-#: src/plugin.cpp:2621
+#: src/plugin.cpp:2624
 msgid "Paused"
 msgstr "Durakladı"
 
-#: src/plugin.cpp:2624
+#: src/plugin.cpp:2627
 msgid "Stopped"
 msgstr "Durdu"
 
-#: src/plugin.cpp:2628
+#: src/plugin.cpp:2630
 #, c-format
 msgid "Buffering %2.1lf%%"
 msgstr "Önbellek %2.1lf%%"
diff -Nru gecko-mediaplayer-1.0.7/src/Makefile.am gecko-mediaplayer-1.0.4/src/Makefile.am
--- gecko-mediaplayer-1.0.7/src/Makefile.am	2012-01-05 21:38:15.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/Makefile.am	2011-03-08 16:43:24.000000000 +0000
@@ -1,19 +1,20 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Created by Anjuta
-SUBDIRS = 
+SUBDIRS = libgmlib
 
 DEFINES = -DMOZILLA_STRICT_API -DXP_UNIX
 INCLUDES = \
 	-fPIC \
-	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	$(GECKO_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GMLIB_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(DBUS_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(GCONF_DEFINES) \
 	$(DEFINES) \
 	$(CURL_DEFINES) \
 	$(CURL_CFLAGS) 
@@ -54,7 +55,7 @@
 		
 gecko_mediaplayer_so_CFLAGS = -fPIC 
 gecko_mediaplayer_so_LDFLAGS = -shared -fPIC
-gecko_mediaplayer_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 
 gecko_mediaplayer_qt_so_SOURCES = \
 	plugin_types_qt.cpp \
@@ -62,7 +63,7 @@
 	
 gecko_mediaplayer_qt_so_CFLAGS = -fPIC 
 gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC
-gecko_mediaplayer_qt_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_qt_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 
 gecko_mediaplayer_wmp_so_SOURCES = \
 	plugin_types_wmp.cpp \
@@ -70,7 +71,7 @@
 	
 gecko_mediaplayer_wmp_so_CFLAGS = -fPIC 
 gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC 
-gecko_mediaplayer_wmp_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_wmp_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 
 gecko_mediaplayer_dvx_so_SOURCES = \
 	plugin_types_dvx.cpp \
@@ -78,7 +79,7 @@
 	
 gecko_mediaplayer_dvx_so_CFLAGS = -fPIC 
 gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC
-gecko_mediaplayer_dvx_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_dvx_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 
 gecko_mediaplayer_rm_so_SOURCES = \
 	plugin_types_rm.cpp \
@@ -86,7 +87,7 @@
 	
 gecko_mediaplayer_rm_so_CFLAGS = -fPIC 
 gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC
-gecko_mediaplayer_rm_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_rm_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 
 indent:
 	indent -kr -l100 -i4 -nut *.cpp
diff -Nru gecko-mediaplayer-1.0.7/src/Makefile.in gecko-mediaplayer-1.0.4/src/Makefile.in
--- gecko-mediaplayer-1.0.7/src/Makefile.in	2012-10-29 18:48:23.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/Makefile.in	2011-07-01 16:40:21.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -75,7 +58,8 @@
 gecko_mediaplayer_dvx_so_OBJECTS =  \
 	$(am_gecko_mediaplayer_dvx_so_OBJECTS)
 am__DEPENDENCIES_1 =
-gecko_mediaplayer_dvx_so_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+gecko_mediaplayer_dvx_so_DEPENDENCIES = libgmlib/libgmlib.a \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 gecko_mediaplayer_dvx_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -84,7 +68,8 @@
 	$(am__objects_1)
 gecko_mediaplayer_qt_so_OBJECTS =  \
 	$(am_gecko_mediaplayer_qt_so_OBJECTS)
-gecko_mediaplayer_qt_so_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+gecko_mediaplayer_qt_so_DEPENDENCIES = libgmlib/libgmlib.a \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 gecko_mediaplayer_qt_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -93,7 +78,8 @@
 	$(am__objects_1)
 gecko_mediaplayer_rm_so_OBJECTS =  \
 	$(am_gecko_mediaplayer_rm_so_OBJECTS)
-gecko_mediaplayer_rm_so_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+gecko_mediaplayer_rm_so_DEPENDENCIES = libgmlib/libgmlib.a \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 gecko_mediaplayer_rm_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -102,7 +88,8 @@
 	$(am__objects_1)
 gecko_mediaplayer_wmp_so_OBJECTS =  \
 	$(am_gecko_mediaplayer_wmp_so_OBJECTS)
-gecko_mediaplayer_wmp_so_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+gecko_mediaplayer_wmp_so_DEPENDENCIES = libgmlib/libgmlib.a \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 gecko_mediaplayer_wmp_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -110,7 +97,8 @@
 am_gecko_mediaplayer_so_OBJECTS = plugin_types_std.$(OBJEXT) \
 	$(am__objects_1)
 gecko_mediaplayer_so_OBJECTS = $(am_gecko_mediaplayer_so_OBJECTS)
-gecko_mediaplayer_so_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+gecko_mediaplayer_so_DEPENDENCIES = libgmlib/libgmlib.a \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 gecko_mediaplayer_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -121,30 +109,30 @@
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
 am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
 am__v_CXXLD_0 = @echo "  CXXLD " $@;
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
 am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(gecko_mediaplayer_dvx_so_SOURCES) \
 	$(gecko_mediaplayer_qt_so_SOURCES) \
@@ -163,11 +151,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -203,6 +186,7 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
@@ -233,19 +217,25 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_DEFINES = @GCONF_DEFINES@
+GCONF_LIBS = @GCONF_LIBS@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GECKO_CFLAGS = @GECKO_CFLAGS@
 GECKO_LIBS = @GECKO_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_DEFINES = @GIO_DEFINES@
+GIO_LIBS = @GIO_LIBS@
+GLIB2_26_CFLAGS = @GLIB2_26_CFLAGS@
+GLIB2_26_DEFINES = @GLIB2_26_DEFINES@
+GLIB2_26_LIBS = @GLIB2_26_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
-GMLIB_CFLAGS = @GMLIB_CFLAGS@
-GMLIB_LIBS = @GMLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
-GSETTINGS_RULES = @GSETTINGS_RULES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -281,12 +271,12 @@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PULSE_CFLAGS = @PULSE_CFLAGS@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 USE_GCONF = @USE_GCONF@
-USE_GSETTINGS = @USE_GSETTINGS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -334,18 +324,19 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = 
+SUBDIRS = libgmlib
 DEFINES = -DMOZILLA_STRICT_API -DXP_UNIX
 INCLUDES = \
 	-fPIC \
-	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	$(GECKO_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GMLIB_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(DBUS_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(GCONF_DEFINES) \
 	$(DEFINES) \
 	$(CURL_DEFINES) \
 	$(CURL_CFLAGS) 
@@ -379,35 +370,35 @@
 
 gecko_mediaplayer_so_CFLAGS = -fPIC 
 gecko_mediaplayer_so_LDFLAGS = -shared -fPIC
-gecko_mediaplayer_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 gecko_mediaplayer_qt_so_SOURCES = \
 	plugin_types_qt.cpp \
 	$(COMMONCODE)
 
 gecko_mediaplayer_qt_so_CFLAGS = -fPIC 
 gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC
-gecko_mediaplayer_qt_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_qt_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 gecko_mediaplayer_wmp_so_SOURCES = \
 	plugin_types_wmp.cpp \
 	$(COMMONCODE)
 
 gecko_mediaplayer_wmp_so_CFLAGS = -fPIC 
 gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC 
-gecko_mediaplayer_wmp_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_wmp_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 gecko_mediaplayer_dvx_so_SOURCES = \
 	plugin_types_dvx.cpp \
 	$(COMMONCODE)
 
 gecko_mediaplayer_dvx_so_CFLAGS = -fPIC 
 gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC
-gecko_mediaplayer_dvx_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_dvx_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 gecko_mediaplayer_rm_so_SOURCES = \
 	plugin_types_rm.cpp \
 	$(COMMONCODE)
 
 gecko_mediaplayer_rm_so_CFLAGS = -fPIC 
 gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC
-gecko_mediaplayer_rm_so_LDADD = -ldl $(GLIB_LIBS) $(GMLIB_LIBS) $(DBUS_LIBS) $(CURL_LIBS) $(GIO_LIBS)
+gecko_mediaplayer_rm_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
 all: all-recursive
 
 .SUFFIXES:
@@ -444,11 +435,8 @@
 $(am__aclocal_m4_deps):
 install-install_libexecPROGRAMS: $(install_libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(install_libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(install_libexecdir)"
 	@list='$(install_libexec_PROGRAMS)'; test -n "$(install_libexecdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(install_libexecdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(install_libexecdir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p; \
@@ -482,19 +470,19 @@
 
 clean-install_libexecPROGRAMS:
 	-test -z "$(install_libexec_PROGRAMS)" || rm -f $(install_libexec_PROGRAMS)
-gecko-mediaplayer-dvx.so$(EXEEXT): $(gecko_mediaplayer_dvx_so_OBJECTS) $(gecko_mediaplayer_dvx_so_DEPENDENCIES) $(EXTRA_gecko_mediaplayer_dvx_so_DEPENDENCIES) 
+gecko-mediaplayer-dvx.so$(EXEEXT): $(gecko_mediaplayer_dvx_so_OBJECTS) $(gecko_mediaplayer_dvx_so_DEPENDENCIES) 
 	@rm -f gecko-mediaplayer-dvx.so$(EXEEXT)
 	$(AM_V_CXXLD)$(gecko_mediaplayer_dvx_so_LINK) $(gecko_mediaplayer_dvx_so_OBJECTS) $(gecko_mediaplayer_dvx_so_LDADD) $(LIBS)
-gecko-mediaplayer-qt.so$(EXEEXT): $(gecko_mediaplayer_qt_so_OBJECTS) $(gecko_mediaplayer_qt_so_DEPENDENCIES) $(EXTRA_gecko_mediaplayer_qt_so_DEPENDENCIES) 
+gecko-mediaplayer-qt.so$(EXEEXT): $(gecko_mediaplayer_qt_so_OBJECTS) $(gecko_mediaplayer_qt_so_DEPENDENCIES) 
 	@rm -f gecko-mediaplayer-qt.so$(EXEEXT)
 	$(AM_V_CXXLD)$(gecko_mediaplayer_qt_so_LINK) $(gecko_mediaplayer_qt_so_OBJECTS) $(gecko_mediaplayer_qt_so_LDADD) $(LIBS)
-gecko-mediaplayer-rm.so$(EXEEXT): $(gecko_mediaplayer_rm_so_OBJECTS) $(gecko_mediaplayer_rm_so_DEPENDENCIES) $(EXTRA_gecko_mediaplayer_rm_so_DEPENDENCIES) 
+gecko-mediaplayer-rm.so$(EXEEXT): $(gecko_mediaplayer_rm_so_OBJECTS) $(gecko_mediaplayer_rm_so_DEPENDENCIES) 
 	@rm -f gecko-mediaplayer-rm.so$(EXEEXT)
 	$(AM_V_CXXLD)$(gecko_mediaplayer_rm_so_LINK) $(gecko_mediaplayer_rm_so_OBJECTS) $(gecko_mediaplayer_rm_so_LDADD) $(LIBS)
-gecko-mediaplayer-wmp.so$(EXEEXT): $(gecko_mediaplayer_wmp_so_OBJECTS) $(gecko_mediaplayer_wmp_so_DEPENDENCIES) $(EXTRA_gecko_mediaplayer_wmp_so_DEPENDENCIES) 
+gecko-mediaplayer-wmp.so$(EXEEXT): $(gecko_mediaplayer_wmp_so_OBJECTS) $(gecko_mediaplayer_wmp_so_DEPENDENCIES) 
 	@rm -f gecko-mediaplayer-wmp.so$(EXEEXT)
 	$(AM_V_CXXLD)$(gecko_mediaplayer_wmp_so_LINK) $(gecko_mediaplayer_wmp_so_OBJECTS) $(gecko_mediaplayer_wmp_so_LDADD) $(LIBS)
-gecko-mediaplayer.so$(EXEEXT): $(gecko_mediaplayer_so_OBJECTS) $(gecko_mediaplayer_so_DEPENDENCIES) $(EXTRA_gecko_mediaplayer_so_DEPENDENCIES) 
+gecko-mediaplayer.so$(EXEEXT): $(gecko_mediaplayer_so_OBJECTS) $(gecko_mediaplayer_so_DEPENDENCIES) 
 	@rm -f gecko-mediaplayer.so$(EXEEXT)
 	$(AM_V_CXXLD)$(gecko_mediaplayer_so_LINK) $(gecko_mediaplayer_so_OBJECTS) $(gecko_mediaplayer_so_LDADD) $(LIBS)
 
@@ -521,16 +509,18 @@
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -699,10 +689,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -740,15 +733,10 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/Makefile.am gecko-mediaplayer-1.0.4/src/libgmlib/Makefile.am
--- gecko-mediaplayer-1.0.7/src/libgmlib/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/Makefile.am	2011-02-20 20:39:33.000000000 +0000
@@ -0,0 +1,37 @@
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = \
+        libgmlib.a
+
+
+libgmlib_a_SOURCES = \
+   	gmlib.h \
+   	gm_audio.h \
+   	gm_audio.c \
+   	gm_file.h \
+   	gm_file.c \
+   	gm_parse.h \
+   	gm_parse.c \
+	gm_pref_store.h \
+	gm_pref_store.c \
+	gm_strfuncs.h \
+	gm_strfuncs.c
+
+libgmlib_a_CFLAGS = -fPIC \
+	$(GLIB_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(GIO_CFLAGS) \
+	$(GCONF_DEFINES) \
+	$(GIO_DEFINES) \
+	$(GLIB2_26_DEFINES) \
+	$(ALSA_CFLAGS) \
+	$(PULSE_CFLAGS)
+
+indent:
+	indent -kr -l120 -i4 -nut *.c
+	indent -kr -l120 -i4 -nut *.h
+	rm *~
+	
+cppcheck:
+	cppcheck -q -a -v -f -j3 .
+	
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/Makefile.in gecko-mediaplayer-1.0.4/src/libgmlib/Makefile.in
--- gecko-mediaplayer-1.0.7/src/libgmlib/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/Makefile.in	2011-07-01 16:40:21.000000000 +0000
@@ -0,0 +1,607 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = src/libgmlib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+libgmlib_a_AR = $(AR) $(ARFLAGS)
+libgmlib_a_LIBADD =
+am_libgmlib_a_OBJECTS = libgmlib_a-gm_audio.$(OBJEXT) \
+	libgmlib_a-gm_file.$(OBJEXT) libgmlib_a-gm_parse.$(OBJEXT) \
+	libgmlib_a-gm_pref_store.$(OBJEXT) \
+	libgmlib_a-gm_strfuncs.$(OBJEXT)
+libgmlib_a_OBJECTS = $(am_libgmlib_a_OBJECTS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(libgmlib_a_SOURCES)
+DIST_SOURCES = $(libgmlib_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_DEFINES = @CURL_DEFINES@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_DEFINES = @GCONF_DEFINES@
+GCONF_LIBS = @GCONF_LIBS@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GECKO_CFLAGS = @GECKO_CFLAGS@
+GECKO_LIBS = @GECKO_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_DEFINES = @GIO_DEFINES@
+GIO_LIBS = @GIO_LIBS@
+GLIB2_26_CFLAGS = @GLIB2_26_CFLAGS@
+GLIB2_26_DEFINES = @GLIB2_26_DEFINES@
+GLIB2_26_LIBS = @GLIB2_26_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NSPR_CFLAGS = @NSPR_CFLAGS@
+NSPR_LIBS = @NSPR_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_GCONF = @USE_GCONF@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+plugindir = @plugindir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LIBRARIES = \
+        libgmlib.a
+
+libgmlib_a_SOURCES = \
+   	gmlib.h \
+   	gm_audio.h \
+   	gm_audio.c \
+   	gm_file.h \
+   	gm_file.c \
+   	gm_parse.h \
+   	gm_parse.c \
+	gm_pref_store.h \
+	gm_pref_store.c \
+	gm_strfuncs.h \
+	gm_strfuncs.c
+
+libgmlib_a_CFLAGS = -fPIC \
+	$(GLIB_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(GIO_CFLAGS) \
+	$(GCONF_DEFINES) \
+	$(GIO_DEFINES) \
+	$(GLIB2_26_DEFINES) \
+	$(ALSA_CFLAGS) \
+	$(PULSE_CFLAGS)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libgmlib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/libgmlib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libgmlib.a: $(libgmlib_a_OBJECTS) $(libgmlib_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libgmlib.a
+	$(AM_V_AR)$(libgmlib_a_AR) libgmlib.a $(libgmlib_a_OBJECTS) $(libgmlib_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libgmlib.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgmlib_a-gm_audio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgmlib_a-gm_file.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgmlib_a-gm_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgmlib_a-gm_pref_store.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgmlib_a-gm_strfuncs.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+libgmlib_a-gm_audio.o: gm_audio.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_audio.o -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_audio.Tpo -c -o libgmlib_a-gm_audio.o `test -f 'gm_audio.c' || echo '$(srcdir)/'`gm_audio.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_audio.Tpo $(DEPDIR)/libgmlib_a-gm_audio.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_audio.c' object='libgmlib_a-gm_audio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_audio.o `test -f 'gm_audio.c' || echo '$(srcdir)/'`gm_audio.c
+
+libgmlib_a-gm_audio.obj: gm_audio.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_audio.obj -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_audio.Tpo -c -o libgmlib_a-gm_audio.obj `if test -f 'gm_audio.c'; then $(CYGPATH_W) 'gm_audio.c'; else $(CYGPATH_W) '$(srcdir)/gm_audio.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_audio.Tpo $(DEPDIR)/libgmlib_a-gm_audio.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_audio.c' object='libgmlib_a-gm_audio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_audio.obj `if test -f 'gm_audio.c'; then $(CYGPATH_W) 'gm_audio.c'; else $(CYGPATH_W) '$(srcdir)/gm_audio.c'; fi`
+
+libgmlib_a-gm_file.o: gm_file.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_file.o -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_file.Tpo -c -o libgmlib_a-gm_file.o `test -f 'gm_file.c' || echo '$(srcdir)/'`gm_file.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_file.Tpo $(DEPDIR)/libgmlib_a-gm_file.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_file.c' object='libgmlib_a-gm_file.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_file.o `test -f 'gm_file.c' || echo '$(srcdir)/'`gm_file.c
+
+libgmlib_a-gm_file.obj: gm_file.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_file.obj -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_file.Tpo -c -o libgmlib_a-gm_file.obj `if test -f 'gm_file.c'; then $(CYGPATH_W) 'gm_file.c'; else $(CYGPATH_W) '$(srcdir)/gm_file.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_file.Tpo $(DEPDIR)/libgmlib_a-gm_file.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_file.c' object='libgmlib_a-gm_file.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_file.obj `if test -f 'gm_file.c'; then $(CYGPATH_W) 'gm_file.c'; else $(CYGPATH_W) '$(srcdir)/gm_file.c'; fi`
+
+libgmlib_a-gm_parse.o: gm_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_parse.o -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_parse.Tpo -c -o libgmlib_a-gm_parse.o `test -f 'gm_parse.c' || echo '$(srcdir)/'`gm_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_parse.Tpo $(DEPDIR)/libgmlib_a-gm_parse.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_parse.c' object='libgmlib_a-gm_parse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_parse.o `test -f 'gm_parse.c' || echo '$(srcdir)/'`gm_parse.c
+
+libgmlib_a-gm_parse.obj: gm_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_parse.obj -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_parse.Tpo -c -o libgmlib_a-gm_parse.obj `if test -f 'gm_parse.c'; then $(CYGPATH_W) 'gm_parse.c'; else $(CYGPATH_W) '$(srcdir)/gm_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_parse.Tpo $(DEPDIR)/libgmlib_a-gm_parse.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_parse.c' object='libgmlib_a-gm_parse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_parse.obj `if test -f 'gm_parse.c'; then $(CYGPATH_W) 'gm_parse.c'; else $(CYGPATH_W) '$(srcdir)/gm_parse.c'; fi`
+
+libgmlib_a-gm_pref_store.o: gm_pref_store.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_pref_store.o -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_pref_store.Tpo -c -o libgmlib_a-gm_pref_store.o `test -f 'gm_pref_store.c' || echo '$(srcdir)/'`gm_pref_store.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_pref_store.Tpo $(DEPDIR)/libgmlib_a-gm_pref_store.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_pref_store.c' object='libgmlib_a-gm_pref_store.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_pref_store.o `test -f 'gm_pref_store.c' || echo '$(srcdir)/'`gm_pref_store.c
+
+libgmlib_a-gm_pref_store.obj: gm_pref_store.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_pref_store.obj -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_pref_store.Tpo -c -o libgmlib_a-gm_pref_store.obj `if test -f 'gm_pref_store.c'; then $(CYGPATH_W) 'gm_pref_store.c'; else $(CYGPATH_W) '$(srcdir)/gm_pref_store.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_pref_store.Tpo $(DEPDIR)/libgmlib_a-gm_pref_store.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_pref_store.c' object='libgmlib_a-gm_pref_store.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_pref_store.obj `if test -f 'gm_pref_store.c'; then $(CYGPATH_W) 'gm_pref_store.c'; else $(CYGPATH_W) '$(srcdir)/gm_pref_store.c'; fi`
+
+libgmlib_a-gm_strfuncs.o: gm_strfuncs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_strfuncs.o -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_strfuncs.Tpo -c -o libgmlib_a-gm_strfuncs.o `test -f 'gm_strfuncs.c' || echo '$(srcdir)/'`gm_strfuncs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_strfuncs.Tpo $(DEPDIR)/libgmlib_a-gm_strfuncs.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_strfuncs.c' object='libgmlib_a-gm_strfuncs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_strfuncs.o `test -f 'gm_strfuncs.c' || echo '$(srcdir)/'`gm_strfuncs.c
+
+libgmlib_a-gm_strfuncs.obj: gm_strfuncs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -MT libgmlib_a-gm_strfuncs.obj -MD -MP -MF $(DEPDIR)/libgmlib_a-gm_strfuncs.Tpo -c -o libgmlib_a-gm_strfuncs.obj `if test -f 'gm_strfuncs.c'; then $(CYGPATH_W) 'gm_strfuncs.c'; else $(CYGPATH_W) '$(srcdir)/gm_strfuncs.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgmlib_a-gm_strfuncs.Tpo $(DEPDIR)/libgmlib_a-gm_strfuncs.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gm_strfuncs.c' object='libgmlib_a-gm_strfuncs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgmlib_a_CFLAGS) $(CFLAGS) -c -o libgmlib_a-gm_strfuncs.obj `if test -f 'gm_strfuncs.c'; then $(CYGPATH_W) 'gm_strfuncs.c'; else $(CYGPATH_W) '$(srcdir)/gm_strfuncs.c'; fi`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am
+
+
+indent:
+	indent -kr -l120 -i4 -nut *.c
+	indent -kr -l120 -i4 -nut *.h
+	rm *~
+
+cppcheck:
+	cppcheck -q -a -v -f -j3 .
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_audio.c gecko-mediaplayer-1.0.4/src/libgmlib/gm_audio.c
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_audio.c	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_audio.c	2011-06-09 16:25:30.000000000 +0000
@@ -0,0 +1,650 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_audio.c
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_audio.c is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_audio.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include "gm_audio.h"
+
+#ifdef HAVE_ASOUNDLIB
+#include <asoundlib.h>
+#endif
+#ifdef HAVE_PULSEAUDIO
+#include <pulse/pulseaudio.h>
+#include <pulse/glib-mainloop.h>
+#endif
+
+#include <math.h>
+
+GList *gm_audio_devices = NULL;
+gboolean gm_audio_debug = FALSE;
+void *gm_audio_server_volume_update_callback = NULL;
+GmAudioType gm_audio_monitored_type = AUDIO_TYPE_UNKNOWN;
+
+// private prototypes
+
+#ifdef HAVE_ASOUNDLIB
+gdouble get_alsa_volume(gchar * device, gchar * mixer);
+gboolean set_alsa_volume(gchar * device, gchar * mixer, gdouble volume);
+#endif
+
+#ifdef HAVE_PULSEAUDIO
+pa_context *gm_audio_context;
+void gm_audio_context_state_callback(pa_context * gm_audio_context, gpointer data);
+void gm_audio_pa_sink_update_volume_cb(pa_context * c, const pa_sink_info * i, int eol, gpointer data);
+#endif
+
+
+gboolean gm_audio_query_devices()
+{
+
+    gint card, err, dev;
+    gchar *name = NULL;
+    gchar *desc;
+    gchar *mplayer_ao;
+    AudioDevice *device;
+
+#ifdef HAVE_ASOUNDLIB
+    snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;
+    snd_ctl_t *handle;
+    snd_ctl_card_info_t *info;
+    snd_pcm_info_t *pcminfo;
+    gchar *device_name;
+#endif
+
+    if (gm_audio_devices != NULL) {
+        gm_audio_free();
+    }
+
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup(_("Default"));
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->mplayer_ao = g_strdup("");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup("ARTS");
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->mplayer_ao = g_strdup("arts");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup("ESD");
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->mplayer_ao = g_strdup("esd");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup("JACK");
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->mplayer_ao = g_strdup("jack");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup("OSS");
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->mplayer_ao = g_strdup("oss");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup("ALSA");
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->alsa_device_name = g_strdup("default");
+    device->mplayer_ao = g_strdup("alsa");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup("PulseAudio");
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->mplayer_ao = g_strdup("pulse");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+#ifdef __OpenBSD__
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup("SNDIO");
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->mplayer_ao = g_strdup("sndio");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+    device = g_new0(AudioDevice, 1);
+    device->description = g_strdup("RTunes");
+    device->type = AUDIO_TYPE_SOFTVOL;
+    device->mplayer_ao = g_strdup("rtunes");
+    device->volume = 1.0;
+    gm_audio_devices = g_list_append(gm_audio_devices, device);
+#endif
+
+#ifdef HAVE_ASOUNDLIB
+    snd_ctl_card_info_alloca(&info);
+    snd_pcm_info_alloca(&pcminfo);
+
+    card = -1;
+
+    while (snd_card_next(&card) >= 0) {
+        //printf("card = %i\n", card);
+        if (card < 0)
+            break;
+        if (name != NULL) {
+            free(name);
+            name = NULL;
+        }
+        name = malloc(32);
+        sprintf(name, "hw:%i", card);
+        //printf("name = %s\n",name);
+
+        if ((err = snd_ctl_open(&handle, name, 0)) < 0) {
+            continue;
+        }
+
+        if ((err = snd_ctl_card_info(handle, info)) < 0) {
+            snd_ctl_close(handle);
+            continue;
+        }
+
+        dev = -1;
+        while (1) {
+            snd_ctl_pcm_next_device(handle, &dev);
+            if (dev < 0)
+                break;
+            snd_pcm_info_set_device(pcminfo, dev);
+            snd_pcm_info_set_subdevice(pcminfo, 0);
+            snd_pcm_info_set_stream(pcminfo, stream);
+            if ((err = snd_ctl_pcm_info(handle, pcminfo)) < 0) {
+                continue;
+            }
+
+            desc = g_strdup_printf("%s (%s) (alsa)", snd_ctl_card_info_get_name(info), snd_pcm_info_get_name(pcminfo));
+            device_name = g_strdup_printf("hw:%i", card);
+            mplayer_ao = g_strdup_printf("alsa:device=hw=%i.%i", card, dev);
+
+            device = g_new0(AudioDevice, 1);
+            device->description = g_strdup(desc);
+            device->type = AUDIO_TYPE_ALSA;
+            device->alsa_card = card;
+            device->alsa_device = dev;
+            device->alsa_device_name = g_strdup(device_name);
+            device->mplayer_ao = g_strdup(mplayer_ao);
+            gm_audio_devices = g_list_append(gm_audio_devices, device);
+
+            g_free(desc);
+            g_free(mplayer_ao);
+
+        }
+
+        snd_ctl_close(handle);
+        free(name);
+        name = NULL;
+
+    }
+
+#endif
+
+
+#ifdef HAVE_PULSEAUDIO
+
+	pa_glib_mainloop *loop = pa_glib_mainloop_new(g_main_context_default());
+    gm_audio_context = pa_context_new(pa_glib_mainloop_get_api(loop), "gm_audio_context");
+    if (gm_audio_context) {
+        pa_context_connect(gm_audio_context, NULL, 0, NULL);
+        pa_context_set_state_callback(gm_audio_context, gm_audio_context_state_callback, gm_audio_devices);
+    }
+    // make sure the pulse events are done before we exit this function
+    while (gtk_events_pending())
+        gtk_main_iteration();
+
+#endif
+
+    return TRUE;
+}
+
+gboolean gm_audio_update_device(AudioDevice * device)
+{
+    gboolean ret = FALSE;
+    GList *iter;
+    AudioDevice *data;
+
+    if (gm_audio_devices == NULL) {
+        gm_audio_query_devices();
+    }
+    //printf("update device, looking for %s\n", device->description);
+
+    device->type = AUDIO_TYPE_UNKNOWN;
+    if (device->alsa_device_name != NULL) {
+        g_free(device->alsa_device_name);
+        device->alsa_device_name = NULL;
+    }
+    if (device->mplayer_ao != NULL) {
+        g_free(device->mplayer_ao);
+        device->mplayer_ao = NULL;
+    }
+
+    iter = gm_audio_devices;
+    while (iter != NULL) {
+        data = (AudioDevice *) iter->data;
+        //printf("Checking %s\n", data->description);
+        if ((device->description != NULL && g_ascii_strcasecmp(device->description, data->description) == 0)
+            || ((device->description == NULL || g_ascii_strcasecmp(device->description, "") == 0)
+                && g_ascii_strcasecmp(data->description, _("Default")) == 0)) {
+            if (device->description == NULL || g_ascii_strcasecmp(device->description, "") == 0) {
+                if (device->description != NULL) {
+                    g_free(device->description);
+                    device->description = NULL;
+                }
+                device->description = g_strdup(data->description);
+            }
+            device->type = data->type;
+            device->alsa_card = data->alsa_card;
+            device->alsa_device = data->alsa_device;
+            device->pulse_index = data->pulse_index;
+            device->pulse_channels = data->pulse_channels;
+            if (device->type != AUDIO_TYPE_SOFTVOL) {
+                device->volume = -1.0;
+            } else {
+                device->volume = data->volume;
+            }
+            device->alsa_device_name = g_strdup(data->alsa_device_name);
+            device->mplayer_ao = g_strdup(data->mplayer_ao);
+        }
+        iter = iter->next;
+    }
+
+    return (device->type != AUDIO_TYPE_UNKNOWN);
+}
+
+void free_list_item(gpointer item, gpointer data)
+{
+    AudioDevice *device = (AudioDevice *) item;
+
+    g_free(device->description);
+    g_free(device->alsa_mixer);
+    g_free(device->alsa_device_name);
+    g_free(device->mplayer_ao);
+}
+
+
+gboolean gm_audio_free()
+{
+    if (gm_audio_devices) {
+        g_list_foreach(gm_audio_devices, free_list_item, NULL);
+        g_list_free(gm_audio_devices);
+        gm_audio_devices = NULL;
+    }
+    return TRUE;
+}
+
+gdouble gm_audio_get_volume(AudioDevice * device)
+{
+
+#ifdef HAVE_ASOUNDLIB
+    if (device->type == AUDIO_TYPE_ALSA) {
+        device->volume = get_alsa_volume(device->alsa_device_name, device->alsa_mixer);
+    }
+#endif
+
+#ifdef HAVE_PULSEAUDIO
+    if (device->type == AUDIO_TYPE_PULSE) {
+        if (gm_audio_context) {
+            device->volume = -1.0;
+            pa_context_get_sink_info_by_index(gm_audio_context, device->pulse_index, gm_audio_pa_sink_update_volume_cb,
+                                              device);
+        }
+        while (gtk_events_pending() || device->volume == -1)
+            gtk_main_iteration();
+    }
+#endif
+
+    return device->volume;
+}
+
+gboolean gm_audio_set_volume(AudioDevice * device, gdouble volume)
+{
+#ifdef HAVE_PULSEAUDIO
+    pa_cvolume cv;
+#endif
+
+#ifdef HAVE_ASOUNDLIB
+    if (device->type == AUDIO_TYPE_ALSA) {
+        set_alsa_volume(device->alsa_device_name, device->alsa_mixer, volume);
+    }
+#endif
+
+#ifdef HAVE_PULSEAUDIO
+    if (device->type == AUDIO_TYPE_PULSE) {
+        if (gm_audio_context) {
+            pa_cvolume_set(&cv, device->pulse_channels, volume * (gdouble) PA_VOLUME_NORM);
+            pa_context_set_sink_volume_by_index(gm_audio_context, device->pulse_index, &cv, NULL, NULL);
+        }
+    }
+#endif
+    return TRUE;
+}
+
+gboolean gm_audio_alsa_monitor(gpointer data)
+{
+    AudioDevice *device = (AudioDevice *) data;
+    gdouble old_volume;
+
+    old_volume = device->volume;
+    //printf("old volume = %f '%s' '%s'\n",old_volume,device->alsa_device_name, device->alsa_mixer);
+
+#ifdef HAVE_ASOUNDLIB
+    if (device->alsa_device_name && device->alsa_mixer)
+        device->volume = get_alsa_volume(device->alsa_device_name, device->alsa_mixer);
+#endif
+
+    if (gm_audio_server_volume_update_callback && old_volume != device->volume)
+        g_idle_add(gm_audio_server_volume_update_callback, NULL);
+
+    //printf("in alsa monitor %f\n",device->volume);
+    return device->type == AUDIO_TYPE_ALSA;
+}
+
+void gm_audio_set_server_volume_update_callback(AudioDevice * device, void *callback)
+{
+    gm_audio_server_volume_update_callback = callback;
+    gm_audio_monitored_type = device->type;
+
+    if (device->type == AUDIO_TYPE_ALSA) {
+        g_timeout_add(100, gm_audio_alsa_monitor, device);
+    }
+}
+
+#ifdef HAVE_PULSEAUDIO
+
+void gm_audio_pa_sink_update_volume_cb(pa_context * c, const pa_sink_info * i, int eol, gpointer data)
+{
+    AudioDevice *device = (AudioDevice *) data;
+    GList *iter;
+    gdouble old_volume;
+
+    //printf("gm_audio_pa_sink_update_volume_cb %p, %i, %p\n",i, eol,data);
+    if (i) {
+        if (device) {
+            device->pulse_channels = i->volume.channels;
+            device->volume = (gdouble) pa_cvolume_avg(&(i->volume)) / (gdouble) PA_VOLUME_NORM;
+        } else {
+            if (gm_audio_monitored_type == AUDIO_TYPE_PULSE) {
+                iter = gm_audio_devices;
+                while (iter != NULL) {
+                    device = (AudioDevice *) iter->data;
+                    if (i->index == device->pulse_index) {
+                        old_volume = device->volume;
+                        device->volume = (gdouble) pa_cvolume_avg(&(i->volume)) / (gdouble) PA_VOLUME_NORM;
+                        // printf("updated %s volume to %f\n", device->description, device->volume);
+                    }
+                    iter = iter->next;
+                }
+                if (gm_audio_server_volume_update_callback && old_volume != device->volume)
+                    g_idle_add(gm_audio_server_volume_update_callback, NULL);
+            }
+        }
+        //printf("device volume = %f\n", device->volume);
+    } else {
+        // eol == -1 when the index requested is not found
+        if (eol == -1 && device)
+            device->volume = 0.0;
+    }
+}
+
+
+void gm_audio_pa_sink_cb(pa_context * c, const pa_sink_info * i, int eol, gpointer data)
+{
+    gchar *desc;
+    gchar *mplayer_ao;
+    AudioDevice *device;
+
+    if (i) {
+        desc = g_strdup_printf("%s (PulseAudio)", i->description);
+        mplayer_ao = g_strdup_printf("pulse::%i", i->index);
+
+        device = g_new0(AudioDevice, 1);
+        device->description = g_strdup(desc);
+        device->type = AUDIO_TYPE_PULSE;
+        device->pulse_index = i->index;
+        device->pulse_channels = i->volume.channels;
+        device->volume = (gdouble) pa_cvolume_avg(&(i->volume)) / (gdouble) PA_VOLUME_NORM;
+        device->mplayer_ao = g_strdup(mplayer_ao);
+        gm_audio_devices = g_list_append(gm_audio_devices, device);
+        //printf("\n%s\n\nproperties\n%s",desc,pa_proplist_to_string(i->proplist));
+
+        g_free(desc);
+        g_free(mplayer_ao);
+
+
+    }
+}
+
+void gm_audio_pa_subscribe_callback(pa_context * c, pa_subscription_event_type_t t, uint32_t index, void *userdata)
+{
+    // printf("subscribe_callback\n");
+    switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
+    case PA_SUBSCRIPTION_EVENT_SINK:
+        pa_context_get_sink_info_by_index(c, index, gm_audio_pa_sink_update_volume_cb, NULL);
+        break;
+    case PA_SUBSCRIPTION_EVENT_SERVER:
+        //pa_context_get_server_info(context,pa_server_info_callback,NULL);
+        break;
+    default:
+        //printf("index = %i\n",index);
+        break;
+    }
+}
+
+void gm_audio_context_state_callback(pa_context * c, gpointer data)
+{
+    //printf("context state callback\n");
+    int i;
+
+    switch (pa_context_get_state(c)) {
+    case PA_CONTEXT_READY:{
+            for (i = 0; i < 255; i++) {
+                pa_context_get_sink_info_by_index(c, i, gm_audio_pa_sink_cb, data);
+            }
+            pa_context_set_subscribe_callback(c, gm_audio_pa_subscribe_callback, NULL);
+            pa_context_subscribe(c, (pa_subscription_mask_t) (PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SERVER)
+                                 , NULL, NULL);
+        }
+
+    default:
+        return;
+    }
+
+}
+#endif
+
+#ifdef HAVE_ASOUNDLIB
+gdouble get_alsa_volume(gchar * device, gchar * mixer)
+{
+    gdouble vol = -1.0;
+    gint err;
+    snd_mixer_t *mhandle;
+    snd_mixer_elem_t *elem;
+    snd_mixer_selem_id_t *sid;
+    glong get_vol, pmin, pmax;
+    gint playback;
+    gfloat f_multi;
+    gchar **local_mixer;
+
+    if ((err = snd_mixer_open(&mhandle, 0)) < 0) {
+        printf("Mixer open error %s\n", snd_strerror(err));
+        return vol;
+    }
+
+    if ((err = snd_mixer_attach(mhandle, device)) < 0) {
+        printf("Mixer attach error %s\n", snd_strerror(err));
+        return vol;
+    }
+
+    if ((err = snd_mixer_selem_register(mhandle, NULL, NULL)) < 0) {
+        printf("Mixer register error %s\n", snd_strerror(err));
+        return vol;
+    }
+
+    if ((err = snd_mixer_load(mhandle)) < 0) {
+        printf("Mixer load error %s\n", snd_strerror(err));
+        return vol;
+    }
+
+    if (mixer != NULL && strlen(mixer) > 0) {
+        snd_mixer_selem_id_malloc(&sid);
+        local_mixer = g_strsplit(mixer, ",", 2);
+        if (local_mixer[1] == NULL) {
+            snd_mixer_selem_id_set_index(sid, 0);
+        } else {
+            snd_mixer_selem_id_set_index(sid, (gint) g_strtod(local_mixer[1], NULL));
+        }
+        if (local_mixer[0] == NULL) {
+            snd_mixer_selem_id_set_name(sid, mixer);
+        } else {
+            snd_mixer_selem_id_set_name(sid, local_mixer[0]);
+        }
+        if (local_mixer != NULL)
+            g_strfreev(local_mixer);
+
+        elem = snd_mixer_find_selem(mhandle, sid);
+        if (elem) {
+            snd_mixer_selem_get_playback_volume_range(elem, &pmin, &pmax);
+            f_multi = (100 / (float) (pmax - pmin));
+            if (snd_mixer_selem_has_playback_switch(elem)) {
+                snd_mixer_selem_get_playback_switch(elem, 0, &playback);
+            } else {
+                playback = 1;
+            }
+            snd_mixer_selem_get_playback_volume(elem, 0, &get_vol);
+            if (playback == 1) {
+                vol = (gdouble) ((get_vol - pmin) * f_multi);
+            } else {
+                vol = 0;
+            }
+            if (gm_audio_debug) {
+                printf("Getting Volume \n");
+                printf("%s Playback is %i\n", mixer, playback);
+                printf("%s Range is %li to %li \n", mixer, pmin, pmax);
+                printf("%s Current Volume %li, multiplier = %f\n", mixer, get_vol, f_multi);
+                printf("Scaled Volume is %lf\n", vol);
+            }
+        }
+        snd_mixer_selem_id_free(sid);
+    }
+
+    snd_mixer_detach(mhandle, device);
+    snd_mixer_close(mhandle);
+
+    vol = floor(vol + 0.5);
+    vol = vol / 100.0;
+
+    return vol;
+}
+
+gboolean set_alsa_volume(gchar * device, gchar * mixer, gdouble volume)
+{
+
+    gint err;
+    snd_mixer_t *mhandle;
+    snd_mixer_elem_t *elem;
+    snd_mixer_selem_id_t *sid;
+    glong set_vol = 0, pmin, pmax;
+    gint playback;
+    gfloat f_multi;
+    gboolean found = FALSE;
+    gchar **local_mixer;
+
+    if ((err = snd_mixer_open(&mhandle, 0)) < 0) {
+        printf("Mixer open error %s\n", snd_strerror(err));
+        return found;
+    }
+
+    if ((err = snd_mixer_attach(mhandle, device)) < 0) {
+        printf("Mixer attach error %s\n", snd_strerror(err));
+        return found;
+    }
+
+    if ((err = snd_mixer_selem_register(mhandle, NULL, NULL)) < 0) {
+        printf("Mixer register error %s\n", snd_strerror(err));
+        return found;
+    }
+
+    if ((err = snd_mixer_load(mhandle)) < 0) {
+        printf("Mixer load error %s\n", snd_strerror(err));
+        return found;
+    }
+
+    if (mixer != NULL && strlen(mixer) > 0) {
+        snd_mixer_selem_id_malloc(&sid);
+        local_mixer = g_strsplit(mixer, ",", 2);
+        if (local_mixer[1] == NULL) {
+            snd_mixer_selem_id_set_index(sid, 0);
+        } else {
+            snd_mixer_selem_id_set_index(sid, (gint) g_strtod(local_mixer[1], NULL));
+        }
+        if (local_mixer[0] == NULL) {
+            snd_mixer_selem_id_set_name(sid, mixer);
+        } else {
+            snd_mixer_selem_id_set_name(sid, local_mixer[0]);
+        }
+        if (local_mixer != NULL)
+            g_strfreev(local_mixer);
+
+        elem = snd_mixer_find_selem(mhandle, sid);
+        if (elem) {
+            snd_mixer_selem_get_playback_volume_range(elem, &pmin, &pmax);
+            f_multi = ((float) (pmax - pmin));
+            if (snd_mixer_selem_has_playback_switch(elem)) {
+                if (volume == 0) {
+                    snd_mixer_selem_set_playback_switch_all(elem, 0);
+                } else {
+                    snd_mixer_selem_set_playback_switch_all(elem, 1);
+                }
+                snd_mixer_selem_get_playback_switch(elem, 0, &playback);
+            } else {
+                playback = 1;
+            }
+            if (playback == 1) {
+                set_vol = (gdouble) ((volume) * f_multi) + pmin;
+                snd_mixer_selem_set_playback_volume_all(elem, set_vol);
+            }
+            if (gm_audio_debug) {
+                printf("Setting Volume\n");
+                printf("%s Playback is %i\n", mixer, playback);
+                printf("%s Range is %li to %li \n", mixer, pmin, pmax);
+                printf("%s Volume %f, multiplier = %f\n", mixer, volume, f_multi);
+                printf("Scaled Volume is %li\n", set_vol);
+            }
+            found = TRUE;
+        }
+        snd_mixer_selem_id_free(sid);
+    }
+
+    snd_mixer_detach(mhandle, device);
+    snd_mixer_close(mhandle);
+
+    return found;
+
+}
+#endif
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_audio.h gecko-mediaplayer-1.0.4/src/libgmlib/gm_audio.h
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_audio.h	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_audio.h	2011-02-20 20:39:33.000000000 +0000
@@ -0,0 +1,72 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_audio.h
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_audio.h is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_audio.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#ifndef __GM_AUDIO_H__
+#define __GM_AUDIO_H__
+
+typedef enum {
+    AUDIO_TYPE_UNKNOWN,
+    AUDIO_TYPE_SOFTVOL,         // use mplayer software volume control for non-alsa and non-pulse devices
+    AUDIO_TYPE_ALSA,
+    AUDIO_TYPE_PULSE
+} GmAudioType;
+
+typedef struct _AudioDevice {
+    gchar *description;         // use this as a key to look up the information 
+    GmAudioType type;
+    gint alsa_card;
+    gint alsa_device;
+    gchar *alsa_device_name;
+    gchar *alsa_mixer;          // this is not looked up
+    gint pulse_index;
+    gint pulse_channels;
+    gdouble volume;
+    gboolean muted;
+    gchar *mplayer_ao;
+} AudioDevice;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    // prototypes go here
+    gboolean gm_audio_query_devices();
+    gboolean gm_audio_free();
+    gboolean gm_audio_update_device(AudioDevice * device);
+    gdouble gm_audio_get_volume(AudioDevice * device);
+    gboolean gm_audio_set_volume(AudioDevice * device, gdouble volume);
+    void gm_audio_set_server_volume_update_callback(AudioDevice * device, void *callback);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_file.c gecko-mediaplayer-1.0.4/src/libgmlib/gm_file.c
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_file.c	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_file.c	2011-02-20 20:39:33.000000000 +0000
@@ -0,0 +1,74 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_file.c
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_file.c is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_file.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include "gm_file.h"
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+gchar *gm_tempname(gchar * path, const gchar * name_template)
+{
+    gchar *result;
+    gchar *replace;
+    gchar *basename;
+    gchar *localpath;
+
+    basename = g_strdup(name_template);
+
+    if (path == NULL && g_getenv("TMPDIR") == NULL) {
+        localpath = g_strdup("/tmp");
+    } else if (path == NULL && g_getenv("TMPDIR") != NULL) {
+        localpath = g_strdup(g_getenv("TMPDIR"));
+    } else {
+        localpath = g_strdup(path);
+    }
+
+    while ((replace = g_strrstr(basename, "X"))) {
+        replace[0] = (gchar) g_random_int_range((gint) 'a', (gint) 'z');
+    }
+
+    result = g_strdup_printf("%s/%s", localpath, basename);
+    g_free(basename);
+    g_free(localpath);
+
+    return result;
+}
+
+gchar *gm_get_path(gchar * uri)
+{
+    gchar *path = NULL;
+    gchar cwd[1024];
+    gchar *tmp = NULL;
+
+    if (g_strrstr(uri, "/") != NULL) {
+        path = g_strdup(uri);
+        tmp = g_strrstr(path, "/");
+        tmp[0] = '\0';
+    } else {
+        getcwd(cwd, 1024);
+        path = g_strdup(cwd);
+    }
+
+    return path;
+}
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_file.h gecko-mediaplayer-1.0.4/src/libgmlib/gm_file.h
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_file.h	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_file.h	2011-02-20 20:39:33.000000000 +0000
@@ -0,0 +1,36 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_file.h
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_file.h is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_file.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include <glib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    gchar *gm_tempname(gchar * path, const gchar * name_template);
+    gchar *gm_get_path(gchar * uri);
+
+#ifdef __cplusplus
+}
+#endif
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_parse.c gecko-mediaplayer-1.0.4/src/libgmlib/gm_parse.c
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_parse.c	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_parse.c	2011-02-20 20:39:33.000000000 +0000
@@ -0,0 +1,205 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_parse.c
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_parse.c is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_parse.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include "gm_parse.h"
+
+void asx_start_element(GMarkupParseContext * context,
+                       const gchar * element_name,
+                       const gchar ** attribute_names,
+                       const gchar ** attribute_values, gpointer user_data, GError ** error);
+
+void asx_end_element(GMarkupParseContext * context, const gchar * element_name, gpointer user_data, GError ** error);
+
+static const GMarkupParser asx_parser = {
+    asx_start_element,
+    asx_end_element,
+    NULL,                       //element_text,
+    NULL,
+    NULL,
+};
+
+typedef struct _ASXCallback {
+    GFunc callback;
+    gpointer user_data;
+} ASXCallback;
+
+void gm_parse_asx(const gchar * asx_data, GFunc callback, gpointer user_data)
+{
+    GMarkupParseContext *context;
+    ASXCallback *asx_callback = g_new0(ASXCallback, 1);
+    gchar *data;
+    gsize datalen;
+
+
+    data = g_strdup(asx_data);
+    datalen = g_utf8_strlen(data, -1);
+    asx_callback->callback = callback;
+    asx_callback->user_data = user_data;
+
+    gm_str_strip_unicode(data, datalen);
+    gm_str_replace_amp(data);
+
+    context = g_markup_parse_context_new(&asx_parser, (GMarkupParseFlags) 0, asx_callback, NULL);
+    g_markup_parse_context_parse(context, data, datalen, NULL);
+    g_markup_parse_context_free(context);
+    g_free(data);
+    g_free(asx_callback);
+}
+
+void
+asx_start_element(GMarkupParseContext * context,
+                  const gchar * element_name,
+                  const gchar ** attribute_names, const gchar ** attribute_values, gpointer user_data, GError ** error)
+{
+    gchar *value;
+    gint i = 0;
+    ASXCallback *asx_callback = user_data;      // g_markup_parse_context_get_user_data(context);
+
+    if (g_ascii_strcasecmp(element_name, "REF") == 0 || g_ascii_strcasecmp(element_name, "ENTRYREF") == 0) {
+        while (attribute_names[i] != NULL) {
+            if (g_ascii_strcasecmp(attribute_names[i], "HREF") == 0) {
+
+                value = g_strdup(attribute_values[i]);
+                gm_str_unreplace_amp(value);
+                value[0] = g_ascii_tolower(value[0]);
+                value[1] = g_ascii_tolower(value[1]);
+                value[2] = g_ascii_tolower(value[2]);
+                value[3] = g_ascii_tolower(value[3]);
+
+                if (asx_callback->callback != NULL) {
+                    asx_callback->callback(value, asx_callback->user_data);
+                } else {
+                    g_free(value);
+                }
+
+            }
+            i++;
+        }
+    }
+
+
+}
+
+void asx_end_element(GMarkupParseContext * context, const gchar * element_name, gpointer user_data, GError ** error)
+{
+    // nothing at the moment
+}
+
+
+gboolean gm_parse_asx_is_asx(const gchar * uri)
+{
+
+    gchar *line = NULL;
+    gchar *newline = NULL;
+    gboolean ret = FALSE;
+
+#ifdef GIO_ENABLED
+    GFile *file;
+    GFileInputStream *input;
+    GDataInputStream *data;
+
+    gsize length;
+    file = g_file_new_for_uri(uri);
+    input = g_file_read(file, NULL, NULL);
+    data = g_data_input_stream_new((GInputStream *) input);
+    if (data != NULL) {
+        line = g_data_input_stream_read_line(data, &length, NULL, NULL);
+        while (line != NULL) {
+            if (line != NULL)
+                g_strstrip(line);
+            if (g_utf8_strlen(line, -1) == 0) {
+                g_free(line);
+                line = g_data_input_stream_read_line(data, &length, NULL, NULL);
+                continue;
+            }
+            newline = g_strdup(line);
+            if (g_strncasecmp(newline, "<asx", g_utf8_strlen("<asx", -1)) == 0) {
+                ret = TRUE;
+                g_free(newline);
+                break;
+            } else if (g_strrstr(newline, "<asx") != NULL) {
+                ret = TRUE;
+                g_free(newline);
+                break;
+            }
+            g_free(newline);
+            g_free(line);
+            line = NULL;
+        }
+        g_input_stream_close((GInputStream *) data, NULL, NULL);
+        g_input_stream_close((GInputStream *) input, NULL, NULL);
+    }
+    g_object_unref(file);
+
+#else
+    FILE *fp;
+    gchar **parse;
+    gchar *file = NULL;
+
+    file = g_strndup(uri, 4);
+    if (strcmp(file, "file") != 0) {
+        g_free(file);
+        return 0;               // FIXME: remote playlists unsupported
+    }
+    parse = g_strsplit(uri, "/", 3);
+    fp = fopen(parse[2], "r");
+    g_strfreev(parse);
+
+    if (fp != NULL) {
+        if (line != NULL)
+            g_free(line);
+        line = g_new0(gchar, 1024);
+        if (line != NULL) {
+            line = fgets(line, 1024, fp);
+            if (line != NULL) {
+                if (line != NULL)
+                    g_strstrip(line);
+                if (g_utf8_strlen(line, -1) == 0) {
+                    // do nothing;
+                } else {
+                    //printf("line = %s\n", line);
+                    newline = g_strdup(line);
+                    if (g_strncasecmp(newline, "<asx", g_utf8_strlen("<asx", -1)) == 0) {
+                        //printf("asx\n");
+                        ret = TRUE;
+                        g_free(newline);
+                    } else if (g_strrstr(newline, "<asx") != NULL) {
+                        //printf("asx\n");
+                        ret = TRUE;
+                        g_free(newline);
+                    }
+                    g_free(newline);
+                }
+                g_free(line);
+                line = NULL;
+            }
+            g_free(line);
+            line = NULL;
+        }
+    }
+    g_free(file);
+    fclose(fp);
+#endif
+    return ret;
+}
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_parse.h gecko-mediaplayer-1.0.4/src/libgmlib/gm_parse.h
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_parse.h	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_parse.h	2011-02-20 20:39:33.000000000 +0000
@@ -0,0 +1,43 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_parse.h
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_parse.h is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_parse.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include <glib.h>
+#include "gm_strfuncs.h"
+#ifdef GIO_ENABLED
+#include <gio/gio.h>
+#else
+#include <stdio.h>
+#endif
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    gboolean gm_parse_asx_is_asx(const gchar * uri);
+    void gm_parse_asx(const gchar * content, GFunc callback, gpointer user_data);
+
+#ifdef __cplusplus
+}
+#endif
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_pref_store.c gecko-mediaplayer-1.0.4/src/libgmlib/gm_pref_store.c
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_pref_store.c	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_pref_store.c	2011-03-07 22:20:33.000000000 +0000
@@ -0,0 +1,417 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_pref_store.c
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_pref_store.c is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_pref_store.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include "gm_pref_store.h"
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+#include <gio/gio.h>
+#else
+#ifdef HAVE_GCONF
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+#include <gconf/gconf-value.h>
+#endif
+#endif
+#include <stdio.h>
+
+struct _GmPrefStore {
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    GSettings *settings;
+#else
+#ifdef HAVE_GCONF
+    GConfClient *gconf;
+#else
+    GKeyFile *keyfile;
+#endif
+#endif
+    gchar *context;
+};
+
+GmPrefStore *gm_pref_store_new(const gchar * context)
+{
+
+    GmPrefStore *store = (GmPrefStore *) g_new0(GmPrefStore, 1);
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    store->context = g_strdup_printf("apps.%s.preferences", context);
+    store->settings = g_settings_new(store->context);
+#else
+    store->context = g_strdup(context);
+#ifdef HAVE_GCONF
+    store->gconf = gconf_client_get_default();
+#else
+    gchar *filename;
+
+    filename = g_strdup_printf("%s/%s", g_get_user_config_dir(), context);
+    if (!g_file_test(filename, G_FILE_TEST_IS_DIR)) {
+        g_mkdir_with_parents(filename, 0775);
+    }
+    g_free(filename);
+
+    store->keyfile = g_key_file_new();
+    filename = g_strdup_printf("%s/%s/%s.conf", g_get_user_config_dir(), context, context);
+    g_key_file_load_from_file(store->keyfile, filename, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, NULL);
+
+#endif
+#endif
+    return store;
+}
+
+void gm_pref_store_free(GmPrefStore * store)
+{
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    g_object_unref(store->settings);
+    store->settings = NULL;
+#else
+#ifdef HAVE_GCONF
+    if (G_IS_OBJECT(store->gconf))
+        g_object_unref(G_OBJECT(store->gconf));
+    store->gconf = NULL;
+#else
+    gchar *filename;
+    gchar *data;
+
+    if (store->keyfile != NULL) {
+        filename = g_strdup_printf("%s/%s/%s.conf", g_get_user_config_dir(), store->context, store->context);
+        data = g_key_file_to_data(store->keyfile, NULL, NULL);
+        if (data != NULL) {
+            g_file_set_contents(filename, data, -1, NULL);
+            g_free(data);
+        }
+        g_free(filename);
+        g_key_file_free(store->keyfile);
+        store->keyfile = NULL;
+    }
+#endif
+#endif
+    g_free(store->context);
+    store->context = NULL;
+
+    g_free(store);
+    store = NULL;
+
+}
+
+gboolean gm_pref_store_get_boolean(GmPrefStore * store, const gchar * key)
+{
+
+    gboolean value = FALSE;
+
+    if (store == NULL)
+        return FALSE;
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    value = g_settings_get_boolean(store->settings, key);
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    value = gconf_client_get_bool(store->gconf, full_key, NULL);
+    g_free(full_key);
+#else
+    if (g_key_file_has_key(store->keyfile, store->context, key, NULL))
+        value = g_key_file_get_boolean(store->keyfile, store->context, key, NULL);
+#endif
+#endif
+    return value;
+}
+
+gboolean gm_pref_store_get_boolean_with_default(GmPrefStore * store, const gchar * key, gboolean default_value)
+{
+
+    gboolean value = FALSE;
+
+    if (store == NULL)
+        return default_value;
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    value = g_settings_get_boolean(store->settings, key);
+#else
+#ifdef HAVE_GCONF
+
+    gchar *full_key;
+    GConfValue *gcvalue;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+
+    gcvalue = gconf_client_get_without_default(store->gconf, full_key, NULL);
+    if (gcvalue) {
+        value = gconf_client_get_bool(store->gconf, full_key, NULL);
+        gconf_value_free(gcvalue);
+    } else {
+        value = default_value;
+    }
+    g_free(full_key);
+
+#else
+
+    if (g_key_file_has_key(store->keyfile, store->context, key, NULL)) {
+        value = g_key_file_get_boolean(store->keyfile, store->context, key, NULL);
+    } else {
+        value = default_value;
+    }
+#endif
+#endif
+    return value;
+}
+
+void gm_pref_store_set_boolean(GmPrefStore * store, const gchar * key, gboolean value)
+{
+
+    if (store == NULL)
+        return;
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    g_settings_set_boolean(store->settings, key, value);
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    gconf_client_set_bool(store->gconf, full_key, value, NULL);
+    g_free(full_key);
+#else
+
+    g_key_file_set_boolean(store->keyfile, store->context, key, value);
+
+#endif
+#endif
+}
+
+gint gm_pref_store_get_int(GmPrefStore * store, const gchar * key)
+{
+
+    gint value = 0;
+
+    if (store == NULL)
+        return value;
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    value = g_settings_get_int(store->settings, key);
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    value = gconf_client_get_int(store->gconf, full_key, NULL);
+    g_free(full_key);
+#else
+
+    if (g_key_file_has_key(store->keyfile, store->context, key, NULL))
+        value = g_key_file_get_integer(store->keyfile, store->context, key, NULL);
+
+#endif
+#endif
+    return value;
+}
+
+gint gm_pref_store_get_int_with_default(GmPrefStore * store, const gchar * key, gint default_value)
+{
+
+    gint value = 0;
+
+    if (store == NULL)
+        return default_value;
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    value = g_settings_get_int(store->settings, key);
+#else
+#ifdef HAVE_GCONF
+
+    gchar *full_key;
+    GConfValue *gcvalue;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+
+    gcvalue = gconf_client_get_without_default(store->gconf, full_key, NULL);
+    if (gcvalue) {
+        value = gconf_client_get_int(store->gconf, full_key, NULL);
+        gconf_value_free(gcvalue);
+    } else {
+        value = default_value;
+    }
+    g_free(full_key);
+
+#else
+
+    if (g_key_file_has_key(store->keyfile, store->context, key, NULL)) {
+        value = g_key_file_get_integer(store->keyfile, store->context, key, NULL);
+    } else {
+        value = default_value;
+    }
+
+#endif
+#endif
+    return value;
+}
+
+
+void gm_pref_store_set_int(GmPrefStore * store, const gchar * key, gint value)
+{
+
+    if (store == NULL)
+        return;
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    g_settings_set_int(store->settings, key, value);
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    gconf_client_set_int(store->gconf, full_key, value, NULL);
+    g_free(full_key);
+#else
+
+    g_key_file_set_integer(store->keyfile, store->context, key, value);
+
+#endif
+#endif
+}
+
+gfloat gm_pref_store_get_float(GmPrefStore * store, const gchar * key)
+{
+
+    gfloat value = 0.0;
+
+    if (store == NULL)
+        return value;
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    value = g_settings_get_double(store->settings, key);
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    value = gconf_client_get_float(store->gconf, full_key, NULL);
+    g_free(full_key);
+#else
+
+    if (g_key_file_has_key(store->keyfile, store->context, key, NULL))
+        value = g_key_file_get_double(store->keyfile, store->context, key, NULL);
+
+#endif
+#endif
+    return value;
+}
+
+void gm_pref_store_set_float(GmPrefStore * store, const gchar * key, gfloat value)
+{
+
+    if (store == NULL)
+        return;
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    g_settings_set_double(store->settings, key, value);
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    gconf_client_set_float(store->gconf, full_key, value, NULL);
+    g_free(full_key);
+#else
+
+    g_key_file_set_double(store->keyfile, store->context, key, value);
+
+#endif
+#endif
+}
+
+gchar *gm_pref_store_get_string(GmPrefStore * store, const gchar * key)
+{
+
+    gchar *value = NULL;
+
+    if (store == NULL)
+        return value;
+
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    value = g_settings_get_string(store->settings, key);
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    value = gconf_client_get_string(store->gconf, full_key, NULL);
+    g_free(full_key);
+#else
+
+    if (g_key_file_has_key(store->keyfile, store->context, key, NULL))
+        value = g_key_file_get_string(store->keyfile, store->context, key, NULL);
+
+#endif
+#endif
+    return value;
+}
+
+void gm_pref_store_set_string(GmPrefStore * store, const gchar * key, gchar * value)
+{
+
+    if (store == NULL)
+        return;
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    if (value == NULL) {
+        g_settings_reset(store->settings, key);
+    } else {
+        g_settings_set_string(store->settings, key, value);
+    }
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    gconf_client_unset(store->gconf, full_key, NULL);
+    if (value != NULL && strlen(g_strstrip(value)) > 0)
+        gconf_client_set_string(store->gconf, full_key, value, NULL);
+    g_free(full_key);
+#else
+    if (value != NULL && strlen(g_strstrip(value)) > 0) {
+        g_key_file_set_string(store->keyfile, store->context, key, value);
+    } else {
+        g_key_file_remove_key(store->keyfile, store->context, key, NULL);
+    }
+#endif
+#endif
+}
+
+void gm_pref_store_unset(GmPrefStore * store, const gchar * key)
+{
+
+    if (store == NULL)
+        return;
+#if GIO_ENABLED && GLIB2_26_ENABLED
+    g_settings_reset(store->settings, key);
+#else
+#ifdef HAVE_GCONF
+    gchar *full_key;
+
+    full_key = g_strdup_printf("/apps/%s/preferences/%s", store->context, key);
+    gconf_client_unset(store->gconf, full_key, NULL);
+    g_free(full_key);
+#else
+    g_key_file_remove_key(store->keyfile, store->context, key, NULL);
+#endif
+#endif
+}
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_pref_store.h gecko-mediaplayer-1.0.4/src/libgmlib/gm_pref_store.h
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_pref_store.h	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_pref_store.h	2011-02-20 20:39:33.000000000 +0000
@@ -0,0 +1,56 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_pref_store.h
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_pref_store.h is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_pref_store.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+#include <glib.h>
+#include <string.h>
+#ifndef __GM_PREF_STORE_H__
+#define __GM_PREF_STORE_H__
+
+typedef struct _GmPrefStore GmPrefStore;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    GmPrefStore *gm_pref_store_new(const gchar * context);
+    void gm_pref_store_free(GmPrefStore * store);
+
+    gboolean gm_pref_store_get_boolean(GmPrefStore * store, const gchar * key);
+    gboolean gm_pref_store_get_boolean_with_default(GmPrefStore * store, const gchar * key, gboolean default_value);
+    void gm_pref_store_set_boolean(GmPrefStore * store, const gchar * key, gboolean value);
+
+    gint gm_pref_store_get_int(GmPrefStore * store, const gchar * key);
+    gint gm_pref_store_get_int_with_default(GmPrefStore * store, const gchar * key, gint default_value);
+    void gm_pref_store_set_int(GmPrefStore * store, const gchar * key, gint value);
+
+    gfloat gm_pref_store_get_float(GmPrefStore * store, const gchar * key);
+    void gm_pref_store_set_float(GmPrefStore * store, const gchar * key, gfloat value);
+
+    gchar *gm_pref_store_get_string(GmPrefStore * store, const gchar * key);
+    void gm_pref_store_set_string(GmPrefStore * store, const gchar * key, gchar * value);
+
+    void gm_pref_store_unset(GmPrefStore * store, const gchar * key);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_strfuncs.c gecko-mediaplayer-1.0.4/src/libgmlib/gm_strfuncs.c
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_strfuncs.c	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_strfuncs.c	2011-02-20 20:39:33.000000000 +0000
@@ -0,0 +1,88 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_strfuncs.c
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_strfuncs.c is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_strfuncs.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include "gm_strfuncs.h"
+
+void gm_str_replace_amp(gchar * data)
+{
+
+    gchar *pos;
+
+    pos = g_strrstr(data, "&");
+    while (pos) {
+        pos[0] = '\x01';
+        pos = g_strrstr(data, "&");
+    }
+}
+
+void gm_str_unreplace_amp(gchar * data)
+{
+    gchar *pos;
+
+    pos = g_strrstr(data, "\x01");
+    while (pos) {
+        pos[0] = '&';
+        pos = g_strrstr(data, "\x01");
+    }
+
+}
+
+void gm_str_strip_unicode(gchar * data, gsize len)
+{
+    gsize i = 0;
+
+    if (data != NULL) {
+        for (i = 0; i < len; i++) {
+            if (!g_unichar_validate(data[i])) {
+                data[i] = ' ';
+            }
+        }
+    }
+}
+
+gint gm_str_hms_in_seconds(gchar * timestr)
+{
+    gchar **split;
+    gint ret = 0;
+
+    split = g_strsplit(timestr, ":", 0);
+
+    switch (g_strv_length(split)) {
+    case 1:
+        ret = g_ascii_strtod(split[0], NULL);
+        break;
+    case 2:
+        ret = g_ascii_strtod(split[0], NULL) * 60 + g_ascii_strtod(split[1], NULL);
+        break;
+    case 3:
+        ret =
+            g_ascii_strtod(split[0], NULL) * 3600 + g_ascii_strtod(split[1], NULL) * 60 + g_ascii_strtod(split[2],
+                                                                                                         NULL);
+        break;
+    }
+
+    g_strfreev(split);
+
+    return ret;
+}
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gm_strfuncs.h gecko-mediaplayer-1.0.4/src/libgmlib/gm_strfuncs.h
--- gecko-mediaplayer-1.0.7/src/libgmlib/gm_strfuncs.h	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gm_strfuncs.h	2011-02-20 20:39:32.000000000 +0000
@@ -0,0 +1,38 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gm_strfuncs.h
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gm_strfuncs.h is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gm_strfuncs.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include <glib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    void gm_str_strip_unicode(gchar * data, gsize len);
+    void gm_str_replace_amp(gchar * data);
+    void gm_str_unreplace_amp(gchar * data);
+    gint gm_str_hms_in_seconds(gchar * timestr);
+
+#ifdef __cplusplus
+}
+#endif
diff -Nru gecko-mediaplayer-1.0.7/src/libgmlib/gmlib.h gecko-mediaplayer-1.0.4/src/libgmlib/gmlib.h
--- gecko-mediaplayer-1.0.7/src/libgmlib/gmlib.h	1970-01-01 00:00:00.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/libgmlib/gmlib.h	2011-02-20 20:39:32.000000000 +0000
@@ -0,0 +1,29 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gmlib.h
+ * Copyright (C) Kevin DeKorte 2006 <kdekorte@gmail.com>
+ * 
+ * gmlib.h is free software.
+ * 
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * gmlib.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with playlist.c.  If not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+
+#include "gm_audio.h"
+#include "gm_file.h"
+#include "gm_parse.h"
+#include "gm_pref_store.h"
+#include "gm_strfuncs.h"
diff -Nru gecko-mediaplayer-1.0.7/src/memmem_compat.cpp gecko-mediaplayer-1.0.4/src/memmem_compat.cpp
--- gecko-mediaplayer-1.0.7/src/memmem_compat.cpp	2012-08-04 17:18:47.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/memmem_compat.cpp	2011-06-06 21:47:44.000000000 +0000
@@ -14,7 +14,7 @@
   
    You should have received a copy of the GNU General Public License
    along with this file; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335,
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
    USA.  */
 
 
diff -Nru gecko-mediaplayer-1.0.7/src/np_entry.cpp gecko-mediaplayer-1.0.4/src/np_entry.cpp
--- gecko-mediaplayer-1.0.7/src/np_entry.cpp	2012-08-04 17:18:47.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/np_entry.cpp	2011-06-06 21:47:44.000000000 +0000
@@ -43,10 +43,6 @@
 #include <npfunctions.h>
 #include "npupp.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef HIBYTE
 #define HIBYTE(x) ((((uint32_t)(x)) & 0xff00) >> 8)
 #endif
@@ -84,21 +80,12 @@
 
 #endif                          /* XP_WIN */
 
-#ifdef NPAPI_USE_CONSTCHARS
-const char *NPP_GetMIMEDescription();
-
-const char *NP_GetMIMEDescription()
-{
-    return NPP_GetMIMEDescription();
-}
-#else
 char *NPP_GetMIMEDescription();
 
 char *NP_GetMIMEDescription()
 {
     return NPP_GetMIMEDescription();
 }
-#endif
 
 NPError NP_GetValue(void *future, NPPVariable variable, void *value)
 {
diff -Nru gecko-mediaplayer-1.0.7/src/npp_gate.cpp gecko-mediaplayer-1.0.4/src/npp_gate.cpp
--- gecko-mediaplayer-1.0.7/src/npp_gate.cpp	2012-08-04 17:18:47.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/npp_gate.cpp	2011-06-06 21:47:44.000000000 +0000
@@ -44,21 +44,11 @@
 #include "plugin_types.h"
 #include "plugin_setup.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef NPAPI_USE_CONSTCHARS
-const char *NPP_GetMIMEDescription(void)
-{
-    return GetMIMEDescription();
-}
-#else
 char *NPP_GetMIMEDescription(void)
 {
     return GetMIMEDescription();
 }
-#endif
+
 
 NPError NPP_Initialize(void)
 {
diff -Nru gecko-mediaplayer-1.0.7/src/npupp.h gecko-mediaplayer-1.0.4/src/npupp.h
--- gecko-mediaplayer-1.0.7/src/npupp.h	2012-08-04 17:18:47.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/npupp.h	2011-06-06 21:47:44.000000000 +0000
@@ -45,10 +45,6 @@
 #ifndef _NPUPP_H_
 #define _NPUPP_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #if defined(__OS2__)
 #pragma pack(1)
 #endif
@@ -688,11 +684,7 @@
 
     NPError OSCALL NP_Shutdown();
 
-#ifdef NPAPI_USE_CONSTCHARS
-    const char *NP_GetMIMEDescription();
-#else
     char *NP_GetMIMEDescription();
-#endif
 
 #ifdef __cplusplus
 }
@@ -707,11 +699,8 @@
 #endif
 
 /* plugin meta member functions */
-#ifdef NPAPI_USE_CONSTCHARS
-    NP_EXPORT(const char *) NP_GetMIMEDescription(void);
-#else
-     NP_EXPORT(char *) NP_GetMIMEDescription(void);
-#endif
+
+    NP_EXPORT(char *) NP_GetMIMEDescription(void);
      NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs *, NPPluginFuncs *);
      NP_EXPORT(NPError) NP_Shutdown(void);
      NP_EXPORT(NPError) NP_GetValue(void *future, NPPVariable aVariable, void *aValue);
diff -Nru gecko-mediaplayer-1.0.7/src/plugin.cpp gecko-mediaplayer-1.0.4/src/plugin.cpp
--- gecko-mediaplayer-1.0.7/src/plugin.cpp	2012-09-14 13:00:15.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin.cpp	2011-06-20 15:00:33.000000000 +0000
@@ -42,16 +42,10 @@
 #include "plugin_setup.h"
 #include "plugin_types.h"
 #include "plugin_dbus.h"
-
-#ifdef HAVE_NSPR
-#include <nspr/nspr.h>
-#else
 #include <nsIPrefBranch.h>
 #include <nsIPrefService.h>
 #include <nsIServiceManager.h>
 #include <nsISupportsPrimitives.h>
-#endif
-
 #include <dlfcn.h>
 
 static NPObject *sWindowObj;
@@ -135,8 +129,6 @@
 static NPIdentifier status_id;
 static NPIdentifier URL_id;
 static NPIdentifier versionInfo_id;
-static NPIdentifier enabled_id;
-static NPIdentifier enableContextMenu_id;
 static NPIdentifier controls_currentPosition_id;
 static NPIdentifier controls_currentItem_id;
 static NPIdentifier media_duration_id;
@@ -184,84 +176,6 @@
     g_free(jscript);
 }
 
-const gchar *NPReasonToString(NPReason reason)
-{
-
-    switch (reason) {
-    case NPRES_DONE:
-        return "Done";
-        break;
-    case NPRES_NETWORK_ERR:
-        return "Network Error";
-        break;
-    case NPRES_USER_BREAK:
-        return "User Break";
-        break;
-    default:
-        return "Unknown Reason";
-    }
-
-}
-
-
-const gchar *NPErrorToString(NPError error)
-{
-
-    switch (error) {
-    case NPERR_NO_ERROR:
-        return "No Error";
-        break;
-    case NPERR_GENERIC_ERROR:
-        return "Generic Error";
-        break;
-    case NPERR_INVALID_INSTANCE_ERROR:
-        return "Invalid Instance Error";
-        break;
-    case NPERR_INVALID_FUNCTABLE_ERROR:
-        return "Invalid Functable Error";
-        break;
-    case NPERR_MODULE_LOAD_FAILED_ERROR:
-        return "Module Load Failed Error";
-        break;
-    case NPERR_OUT_OF_MEMORY_ERROR:
-        return "Out Of Memory Error";
-        break;
-    case NPERR_INVALID_PLUGIN_ERROR:
-        return "Invalid Plugin Error";
-        break;
-    case NPERR_INVALID_PLUGIN_DIR_ERROR:
-        return "Invalid Plugin Dir Error";
-        break;
-    case NPERR_INCOMPATIBLE_VERSION_ERROR:
-        return "Incompatible Version Error";
-        break;
-    case NPERR_INVALID_PARAM:
-        return "Invalid Param";
-        break;
-    case NPERR_INVALID_URL:
-        return "Invalid URL";
-        break;
-    case NPERR_FILE_NOT_FOUND:
-        return "File Not Found";
-        break;
-    case NPERR_NO_DATA:
-        return "No Data";
-        break;
-    case NPERR_STREAM_NOT_SEEKABLE:
-        return "Stream Not Seekable";
-        break;
-    case NPERR_TIME_RANGE_NOT_SUPPORTED:
-        return "Time Range Not Supported";
-        break;
-    case NPERR_MALFORMED_SITE:
-        return "Malformed Site";
-        break;
-    default:
-        return "Unknown NPError Code";
-        break;
-    }
-}
-
 ////////////////////////////////////////
 //
 // CPlugin class implementation
@@ -328,7 +242,7 @@
     identifier = NPN_GetStringIdentifier("href");
     // Get the location property from the location object.
     b = NPN_GetProperty(mInstance, locationObj, identifier, &variantValue);
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
     page_url = g_strdup_printf("%s", NPVARIANT_TO_STRING(variantValue).UTF8Characters);
 #else
     page_url = g_strdup_printf("%s", NPVARIANT_TO_STRING(variantValue).utf8characters);
@@ -403,8 +317,6 @@
     status_id = NPN_GetStringIdentifier("status");
     URL_id = NPN_GetStringIdentifier("URL");
     versionInfo_id = NPN_GetStringIdentifier("versionInfo");
-    enabled_id = NPN_GetStringIdentifier("enabled");
-    enableContextMenu_id = NPN_GetStringIdentifier("enableContextMenu");
     controls_currentPosition_id = NPN_GetStringIdentifier("currentPosition");
     media_duration_id = NPN_GetStringIdentifier("duration");
     settings_volume_id = NPN_GetStringIdentifier("volume");
@@ -430,14 +342,9 @@
     store = gm_pref_store_new("gecko-mediaplayer");
     if (store != NULL) {
         debug_level = gm_pref_store_get_int(store, DEBUG_LEVEL);
-        gm_log(debug_level, G_LOG_LEVEL_INFO, "debug_level = %i", debug_level);
         player_backend = gm_pref_store_get_string(store, PLAYER_BACKEND);
-        gm_log(debug_level, G_LOG_LEVEL_INFO, "Using player backend of '%s'\n",
-               (player_backend == NULL || strlen(player_backend) == 0 ) ? "gnome-mplayer" : player_backend);
+        printf("Using player backend of '%s'\n", player_backend);
         gm_pref_store_free(store);
-    } else {
-        gm_log(TRUE, G_LOG_LEVEL_INFO, "Unable to find preference store, setting debug_level to 1");
-        debug_level = 1;
     }
 
 
@@ -594,8 +501,7 @@
         if (ok) {
             player_launched = TRUE;
         } else {
-            gm_log(debug_level, G_LOG_LEVEL_INFO, "Unable to launch %s: %s\n", app_name,
-                   error->message);
+            printf("Unable to launch %s: %s\n", app_name, error->message);
             g_error_free(error);
             error = NULL;
         }
@@ -615,14 +521,12 @@
         if (item && !item->requested) {
             item->cancelled = FALSE;
             if (item->streaming) {
-                gm_log(debug_level, G_LOG_LEVEL_INFO,
-                       "Calling open_location with item = %p src = %s\n", item, item->src);
+                printf("Calling open_location with item = %p src = %s\n", item, item->src);
                 open_location(this, item, FALSE);
                 item->requested = 1;
             } else {
                 item->requested = 1;
-                gm_log(debug_level, G_LOG_LEVEL_INFO,
-                       "Calling GetURLNotify with item = %p src = %s\n", item, item->src);
+                printf("Calling GetURLNotify with item = %p src = %s\n", item, item->src);
                 this->GetURLNotify(mInstance, item->src, NULL, item);
             }
         }
@@ -671,11 +575,11 @@
 NPError CPlugin::NewStream(NPMIMEType type, NPStream * stream, NPBool seekable, uint16 * stype)
 {
     if (g_strrstr(stream->url, "javascript") == NULL) {
-        gm_log(debug_level, G_LOG_LEVEL_DEBUG, "New Stream Requested - %s\n", stream->url);
+        printf("New Stream Requested - %s\n", stream->url);
     }
 
     if (g_strrstr(stream->url, "javascript") == NULL && stream->notifyData == NULL) {
-        gm_log(debug_level, G_LOG_LEVEL_DEBUG, "item is NULL for %s\n", stream->url);
+        printf("item is NULL for %s\n", stream->url);
     }
 
     return NPERR_NO_ERROR;
@@ -684,20 +588,21 @@
 NPError CPlugin::DestroyStream(NPStream * stream, NPError reason)
 {
     ListItem *item;
-    ListItem *fetch_item;
+    gint id;
+    gchar *path;
     gchar *text;
-    gboolean fetch_next = TRUE;
+    gboolean ready;
+    gboolean newwindow;
 
     if (g_strrstr(stream->url, "javascript") == NULL)
-        gm_log(debug_level, G_LOG_LEVEL_MESSAGE, "Entering destroy stream reason = %i - %s for %s",
-               reason, NPErrorToString(reason), stream->url);
+        printf("Entering destroy stream reason = %i for %s\n", reason, stream->url);
 
     if (reason == NPERR_NO_ERROR) {
         item = (ListItem *) stream->notifyData;
         // item = list_find(playlist, (gchar*)stream->url);
 
         if (item == NULL) {
-            gm_log(debug_level, G_LOG_LEVEL_DEBUG, "Leaving destroy stream - item not found");
+            printf("Leaving destroy stream - item not found\n");
             return NPERR_NO_ERROR;
         }
 
@@ -711,83 +616,73 @@
             g_free(text);
         }
 
-
         if (!item->opened && item->play) {
-            gm_log(debug_level, G_LOG_LEVEL_MESSAGE, "item '%s' is not opened and is playable",
-                   item->src);
+            id = item->controlid;
+            path = g_strdup(item->path);
+            ready = item->playerready;
+            newwindow = item->newwindow;
             if (!item->streaming)
                 item->streaming = streaming(item->src);
             if (!item->streaming) {
-                gm_log(debug_level, G_LOG_LEVEL_DEBUG, "in Destroy Stream");
-                playlist = list_parse_qt(playlist, item, FALSE);
-                playlist = list_parse_qt2(playlist, item, FALSE);
-                playlist = list_parse_asx(playlist, item, FALSE);
-                playlist = list_parse_qml(playlist, item, FALSE);
-                playlist = list_parse_ram(playlist, item, FALSE);
-            }
-
-            if (item->playlist == FALSE) {
-                if (item != NULL && item->queuedtoplay == FALSE) {
-                    if (!list_item_opened(playlist)) {
-                        item = list_find_first_playable(playlist);
-                    }
-                }
-                if (item != NULL) {
-                    if (item->play == TRUE && item->opened == FALSE) {
-
-                        open_location(this, item, TRUE);
-                        if (post_dom_events && this->id != NULL) {
-                            postDOMEvent(mInstance, this->id, "qt_play");
-                        }
-                    }
+                printf("in Destroy Stream\n");
+                playlist = list_parse_qt(playlist, item);
+                playlist = list_parse_qt2(playlist, item);
+                playlist = list_parse_asx(playlist, item);
+                playlist = list_parse_qml(playlist, item);
+                playlist = list_parse_ram(playlist, item);
+            }
+            // printf("item->play = %i\n",item->play);
+            // printf("item->src = %s\n", item->src);
+            // printf("item->streaming = %i\n", item->streaming);
+            // printf("calling open_location from DestroyStream\n");
+            if (item->play) {
+                item->requested = TRUE;
+                open_location(this, item, TRUE);
+                if (post_dom_events && this->id != NULL) {
+                    postDOMEvent(mInstance, this->id, "qt_play");
                 }
             } else {
-                item = list_find_first_playable(playlist);
+                item = list_find_next_playable(playlist);
                 if (item != NULL) {
+                    // printf("item->play = %i\n",item->play);
+                    // printf("item->src = %s\n", item->src);
+                    // printf("item->streaming = %i\n", item->streaming);
                     if (!item->streaming) {
-                        if (item->requested == FALSE) {
-                            gm_log(debug_level, G_LOG_LEVEL_INFO, "Getting URL '%s'", item->src);
-                            item->requested = TRUE;
+                        item->controlid = id;
+                        g_strlcpy(item->path, path, 1024);
+                        item->playerready = ready;
+                        item->newwindow = newwindow;
+                        item->cancelled = FALSE;
+                        item->requested = TRUE;
+                        if (item != NULL)
                             this->GetURLNotify(mInstance, item->src, NULL, item);
-                            fetch_next = FALSE;
-                        }
                     } else {
-                        if (!list_item_opened(playlist))
-                            open_location(this, item, FALSE);
-                    }
-                }
-            }
-
-            // fetch the next item on the playlist
-            if (fetch_next) {
-                fetch_item = list_find_next_playable_after_listitem(playlist, item);
-                if (fetch_item != NULL) {
-                    if (!fetch_item->streaming) {
-                        gm_log(debug_level, G_LOG_LEVEL_INFO, "Prefetching URL '%s'", fetch_item->src);
-                        fetch_item->requested = TRUE;
-                        this->GetURLNotify(mInstance, fetch_item->src, NULL, fetch_item);
+                        open_location(this, item, FALSE);
+                        item->requested = TRUE;
+                        if (post_dom_events && this->id != NULL) {
+                            postDOMEvent(mInstance, this->id, "qt_play");
+                        }
                     }
                 }
             }
+            g_free(path);
         }
+        //printf("Leaving destroy stream src = %s\n", item->src);
 
     } else if (reason == NPERR_INVALID_URL) {
         item = (ListItem *) stream->notifyData;
         if (item) {
-            gm_log(debug_level, G_LOG_LEVEL_INFO, "Destroy Stream, invalid url, item is %s\n",
-                   item->src);
+            printf("Destroy Stream, invalid url, item is %s\n", item->src);
         } else {
             if (g_strrstr(stream->url, "javascript") == NULL) {
-                gm_log(debug_level, G_LOG_LEVEL_INFO,
-                       "Destroy Stream, network error, item is NULL\n");
+                printf("Destroy Stream, network error, item is NULL\n");
             }
         }
     } else {
         item = (ListItem *) stream->notifyData;
         // item = list_find(playlist, (gchar*)stream->url);
         if (g_strrstr(stream->url, "javascript") == NULL)
-            gm_log(debug_level, G_LOG_LEVEL_DEBUG, "Exiting destroy stream reason = %i for %s\n",
-                   reason, stream->url);
+            printf("Exiting destroy stream reason = %i for %s\n", reason, stream->url);
         if (item == NULL) {
             return NPERR_NO_ERROR;
         } else {
@@ -804,26 +699,71 @@
         }
     }
 
-    gm_log(debug_level, G_LOG_LEVEL_INFO,
-           "Leaving DestroyStream for %s and the playlist looks like this", stream->url);
-    list_dump(playlist);
+    // list_dump(playlist);
     return NPERR_NO_ERROR;
 }
 
 void CPlugin::URLNotify(const char *url, NPReason reason, void *notifyData)
 {
     ListItem *item = (ListItem *) notifyData;
+    //DBusMessage *message;
+    //const char *file;
 
-    gm_log(debug_level, G_LOG_LEVEL_MESSAGE, "URL Notify url = '%s'\nreason = %i - %s\n%s\n%s\n%s",
-           url, reason, NPReasonToString(reason), item->src, item->local, path);
+    printf("URL Notify url = '%s'\nreason = %i\n%s\n%s\n%s\n", url, reason, item->src, item->local,
+           path);
     if (reason == NPRES_DONE) {
-        // done
+
+        if (!item->opened) {
+            // open_location(this,item, TRUE);
+
+            /*
+               file = g_strdup(item->local);
+               while (!playerready) {
+               // printf("waiting for player\n");
+               g_main_context_iteration(NULL,FALSE);   
+               }
+               message = dbus_message_new_signal(path,"com.gnome.mplayer","Open");
+               dbus_message_append_args(message, DBUS_TYPE_STRING, &file, DBUS_TYPE_INVALID);
+               dbus_connection_send(connection,message,NULL);
+               dbus_message_unref(message);
+             */
+        }
+
+        if (item) {
+            item->played = TRUE;
+            if (!item->streaming) {
+                item = list_find_next_playable(playlist);
+                if (item) {
+                    if (item->retrieved || item->streaming) {
+                        open_location(this, item, TRUE);
+                        item->requested = TRUE;
+                    } else {
+                        this->GetURLNotify(mInstance, item->src, NULL, item);
+                        item->requested = TRUE;
+                    }
+                }
+            }
+        } else {
+            item = list_find_next_playable(playlist);
+            if (item) {
+                if (item->retrieved || item->streaming) {
+                    open_location(this, item, TRUE);
+                    item->requested = TRUE;
+                } else {
+                    this->GetURLNotify(mInstance, item->src, NULL, item);
+                    item->requested = TRUE;
+                }
+            }
+        }
+
+
+
     } else if (reason == NPRES_NETWORK_ERR) {
-        // error
+        printf("URL Notify result is Network Error\n");
     } else if (reason == NPRES_USER_BREAK) {
-        // user cancelled
+        printf("URL Notify result is User Break\n");
     } else {
-        // something else
+        printf("%i is an invalid reason code in URLNotify\n", reason);
     }
 }
 
@@ -835,7 +775,7 @@
 
     // printf("WriteReady called\n");
     if (!acceptdata) {
-        gm_log(debug_level, G_LOG_LEVEL_INFO, "Not accepting data\n");
+        printf("Not accepting data\n");
         NPN_DestroyStream(mInstance, stream, NPERR_GENERIC_ERROR);
         return -1;
     }
@@ -846,9 +786,20 @@
     if (item == NULL) {
 
         if (mode == NP_FULL) {
+            // printf("adding new item %s\n",stream->url);
+            /*
+               item = g_new0(ListItem, 1);
+               g_strlcpy(item->src, stream->url, 1024);
+               item->requested = TRUE;
+               item->play = TRUE;
+               if (!item->streaming)
+               item->streaming = streaming(item->src);
+               playlist = g_list_append(playlist, item);
+               stream->notifyData = item;
+             */
             return -1;
         } else {
-            gm_log(debug_level, G_LOG_LEVEL_INFO, "item is null\nstream url %s\n", stream->url);
+            printf("item is null\nstream url %s\n", stream->url);
             NPN_DestroyStream(mInstance, stream, NPERR_NO_ERROR);
             return -1;
         }
@@ -861,7 +812,7 @@
     // printf("Write Ready item url = %s\n%s\n",item->src,stream->url);
 
     if (item->cancelled) {
-        gm_log(debug_level, G_LOG_LEVEL_INFO, "cancelling WriteReady\n");
+        printf("cancelling WriteReady\n");
         NPN_DestroyStream(mInstance, stream, NPERR_NO_ERROR);
         return -1;
     }
@@ -893,7 +844,7 @@
     }
 
     if (item->retrieved) {
-        gm_log(debug_level, G_LOG_LEVEL_INFO, "Duplicate request, item already retrieved\n");
+        printf("Duplicate request, item already retrieved\n");
         NPN_DestroyStream(mInstance, stream, NPERR_NO_ERROR);
         return -1;
     }
@@ -908,11 +859,15 @@
     gchar *text;
     gdouble percent = 0.0;
     gdouble rate = 0.0;
-    gchar *upper = NULL;
+    gint id;
+    gchar *path;
+    gboolean ready;
+    gboolean newwindow;
+    gboolean ok_to_play = FALSE;
 
-    gm_log(debug_level, G_LOG_LEVEL_DEBUG, "Write Called\n");
+    // printf("Write Called\n");
     if (!acceptdata) {
-        gm_log(debug_level, G_LOG_LEVEL_INFO, "not accepting data\n");
+        printf("not accepting data\n");
         NPN_DestroyStream(mInstance, stream, NPERR_NO_ERROR);
         return -1;
     }
@@ -920,23 +875,27 @@
     item = (ListItem *) stream->notifyData;
 
     if (item == NULL) {
-        gm_log(debug_level, G_LOG_LEVEL_DEBUG, "item is NULL\n");
-        gm_log(debug_level, G_LOG_LEVEL_INFO, _("Write unable to write because item is NULL\n"));
+        printf("item is NULL\n");
+        printf(_("Write unable to write because item is NULL\n"));
         NPN_DestroyStream(mInstance, stream, NPERR_GENERIC_ERROR);
         return -1;
     }
 
     if (item->cancelled || item->retrieved) {
-        gm_log(debug_level, G_LOG_LEVEL_DEBUG, "cancelled\n");
+        printf("cancelled\n");
         NPN_DestroyStream(mInstance, stream, NPERR_NO_ERROR);
         return -1;
     }
 
-    upper = g_ascii_strup((char *) buffer, len);
-    if (strstr((char *) buffer, "ICY 200 OK") != NULL
-        || strstr((char *) buffer, "Content-length:") != NULL
-        || (upper != NULL && strstr(upper, "<HTML>") != NULL) || item->streaming == TRUE
-        || strstr(item->src, "file://") != NULL) {
+    if (strstr((char *) buffer, "ICY 200 OK") != NULL || strstr((char *) buffer, "Content-length:") != NULL     // If item is a block of jpeg images, just stream it
+        || strstr((char *) buffer, "<HTML>") != NULL || item->streaming == TRUE) {
+        //   || stream->lastmodified == 0) {    this is not valid for many sites
+
+        // printf("BUFFER='%s'\n", buffer);
+
+        // printf("item->streaming = %i\n", item->streaming);
+        // printf("stream->lastmodified = %i\n", stream->lastmodified);
+        // printf("stream->end = %i\n", stream->end);
 
         item->streaming = TRUE;
         open_location(this, item, FALSE);
@@ -947,24 +906,20 @@
         if (item->localfp) {
             fclose(item->localfp);
         }
-        gm_log(debug_level, G_LOG_LEVEL_INFO, "Got IceCast Stream, let mplayer stream it\n");
+        printf("Got IceCast Stream, let mplayer stream it\n");
         NPN_DestroyStream(mInstance, stream, NPERR_NO_ERROR);
         return -1;
     }
-    if (upper != NULL) {
-        g_free(upper);
-        upper = NULL;
-    }
 
     if ((!item->localfp) && (!item->retrieved)) {
-        gm_log(debug_level, G_LOG_LEVEL_DEBUG, "opening %s for localcache\n", item->local);
+        // printf("opening %s for localcache\n", item->local);
         item->localfp = fopen(item->local, "w+");
     }
-    gm_log(debug_level, G_LOG_LEVEL_DEBUG, "Write item url = %s\n", item->src);
+    // printf("Write item url = %s\n",item->src);
 
     if (item->localfp == NULL) {
-        gm_log(debug_level, G_LOG_LEVEL_INFO, "Local cache file is not open, cannot write data\n");
-        NPN_DestroyStream(mInstance, stream, NPERR_GENERIC_ERROR);
+        printf("Local cache file is not open, cannot write data\n");
+        NPN_DestroyStream(mInstance, stream, NPERR_NO_ERROR);
         return -1;
     }
     fseek(item->localfp, offset, SEEK_SET);
@@ -1008,17 +963,16 @@
         }
         if (!item->opened) {
             if ((item->localsize >= (cache_size * 1024)) && (percent >= 0.2)) {
-                gm_log(debug_level, G_LOG_LEVEL_DEBUG, "Setting to play because %i > %i\n",
-                       item->localsize, cache_size * 1024);
-                item->oktoplay = TRUE;
+                printf("Setting to play because %i > %i\n", item->localsize, cache_size * 1024);
+                ok_to_play = TRUE;
             }
-            if (item->oktoplay == FALSE && (item->localsize > (cache_size * 2 * 1024))
+            if (ok_to_play == FALSE && (item->localsize > (cache_size * 2 * 1024))
                 && (cache_size >= 512)) {
-                // printf("Setting to play because %i > %i (double cache)\n", item->localsize,
-                //        cache_size * 2 * 1024);
-                item->oktoplay = TRUE;
+                printf("Setting to play because %i > %i (double cache)\n", item->localsize,
+                       cache_size * 2 * 1024);
+                ok_to_play = TRUE;
             }
-            if (item->oktoplay == FALSE) {
+            if (ok_to_play == FALSE) {
                 if (item->bitrate == 0 && item->bitrate_requests < 5
                     && ((gint) (percent * 100) > item->bitrate_requests)) {
                     item->bitrate = request_bitrate(this, item, item->local);
@@ -1026,9 +980,9 @@
                 }
                 if (item->bitrate > 0) {
                     if (item->localsize / item->bitrate >= 10 && (percent >= 0.2)) {
-                        // printf("Setting to play because %i >= 10\n",
-                        //        item->localsize / item->bitrate);
-                        item->oktoplay = TRUE;
+                        printf("Setting to play becuase %i >= 10\n",
+                               item->localsize / item->bitrate);
+                        ok_to_play = TRUE;
                         if (post_dom_events && this->id != NULL) {
                             postDOMEvent(mInstance, this->id, "qt_canplay");
                         }
@@ -1037,50 +991,51 @@
             }
 
         }
-
-        // item->playlist may have been set on an earlier pass, so do not bother
-        // checking for playlist again, if it is true.
-        
-        if (!item->opened && item->play && item->oktoplay && !item->playlist) {
-            gm_log(debug_level, G_LOG_LEVEL_MESSAGE, "item '%s' is not opened and is playable",
-                   item->src);
+        // if not opened, over cache level and not an href target then try and open it
+        if ((!item->opened) && ok_to_play == TRUE) {
+            id = item->controlid;
+            path = g_strdup(item->path);
+            ready = item->playerready;
+            newwindow = item->newwindow;
             if (!item->streaming)
                 item->streaming = streaming(item->src);
             if (!item->streaming) {
-                gm_log(debug_level, G_LOG_LEVEL_DEBUG, "in Write");
-                // we want to detect a playlist, but not add any items to the actual playlist 
-                // if we find them
-                playlist = list_parse_qt(playlist, item, TRUE);
-                playlist = list_parse_qt2(playlist, item, TRUE);
-                playlist = list_parse_asx(playlist, item, TRUE);
-                playlist = list_parse_qml(playlist, item, TRUE);
-                playlist = list_parse_ram(playlist, item, TRUE);
-            }
-
-            gm_log(debug_level, G_LOG_LEVEL_MESSAGE, "Write item (%s) playlist = %i", item->src, item->playlist);
-            
-            if (item->playlist == FALSE) {
-
-                // queuedtoplay is only true on a item when the player has requested the
-                // next item to play. So the rule is this
-                /*
-                    1. Automatically play only the first playable item on the playlist  
-                    2. Play queuedtoplay items when they are playable and not opened
-
-                */
-                if (item->queuedtoplay == FALSE) {
-                    if (!list_item_opened(playlist)) {
-                        item = list_find_first_playable(playlist);
-                    }
-                    if (item->play == TRUE && item->opened == FALSE) {
-
-                        open_location(this, item, TRUE);
-                        if (post_dom_events && this->id != NULL) {
-                            postDOMEvent(mInstance, this->id, "qt_play");
-                        }
+                playlist = list_parse_qt(playlist, item);
+                playlist = list_parse_asx(playlist, item);
+                playlist = list_parse_qml(playlist, item);
+                playlist = list_parse_ram(playlist, item);
+            }
+            // printf("item->play = %i\n",item->play);
+            // printf("item->src = %i\n", item->src);
+            // printf("calling open_location from Write\n"); 
+            if (item->play) {
+                send_signal_with_integer(this, item, "SetGUIState", PLAYING);
+                open_location(this, item, TRUE);
+                item->requested = TRUE;
+                if (post_dom_events && this->id != NULL) {
+                    postDOMEvent(mInstance, this->id, "qt_loadedfirstframe");
+                    postDOMEvent(mInstance, this->id, "qt_canplay");
+                    postDOMEvent(mInstance, this->id, "qt_play");
+                }
+            } else {
+                item = list_find_next_playable(playlist);
+                if (item != NULL) {
+                    item->controlid = id;
+                    g_strlcpy(item->path, path, 1024);
+                    item->playerready = ready;
+                    item->newwindow = newwindow;
+                    item->cancelled = FALSE;
+                    // printf("opening next playable items on the playlist\n");
+                    if (item->streaming) {
+                        open_location(this, item, FALSE);
+                        item->requested = TRUE;
+                    } else {
+                        this->GetURLNotify(mInstance, item->src, NULL, item);
+                        item->requested = TRUE;
                     }
                 }
             }
+            g_free(path);
         }
 
     }
@@ -1365,7 +1320,7 @@
     ListItem *item = (ListItem *) clientp;
     gdouble percent, rate;
     gchar *text;
-    gboolean ok_to_play = FALSE;
+    gboolean ok_to_play;
     gint id;
     gboolean ready;
     gboolean newwindow;
@@ -1377,8 +1332,7 @@
         return 0;               // keeps downloading
 
     if (item->cancelled) {
-        gm_log(plugin->debug_level, G_LOG_LEVEL_DEBUG, "cancelling download at %f for %s\n", dlnow,
-               item->src);
+        printf("cancelling download at %f for %s\n", dlnow, item->src);
         return -1;              // cancels download
     }
     //printf("item ready = %i,player ready = %i,%f,%f,%f\n", item->playerready, plugin->playerready,
@@ -1395,8 +1349,7 @@
 
             percent = (gdouble) item->localsize / (gdouble) item->mediasize;
             if (difftime(time(NULL), plugin->lastupdate) > 0.5) {
-                gm_log(plugin->debug_level, G_LOG_LEVEL_INFO, "updating display id = %i\n",
-                       item->id);
+                printf("updating display id = %i\n", item->id);
                 send_signal_with_double(plugin, item, "SetCachePercent", percent);
                 rate =
                     (gdouble) ((item->localsize -
@@ -1411,11 +1364,8 @@
                                         rate);
                 }
                 send_signal_with_string(plugin, item, "SetProgressText", text);
-                if (!item->opened) {
-                    //open_location (plugin, item, TRUE);
-                    //item->opened = TRUE;
-                    //send_signal_with_string(plugin, item, "SetURL", item->src);
-                }
+                if (!item->opened)
+                    send_signal_with_string(plugin, item, "SetURL", item->src);
                 if (plugin->post_dom_events && plugin->id != NULL) {
                     postDOMEvent(plugin->mInstance, plugin->id, "qt_progress");
                     postDOMEvent(plugin->mInstance, plugin->id, "qt_durationchange");
@@ -1426,6 +1376,87 @@
                 item->lastsize = item->localsize;
             }
         }
+        if (!item->opened) {
+            if ((item->localsize >= (plugin->cache_size * 1024)) && (percent >= 0.2)) {
+                printf("Setting to play because %i > %i\n", item->localsize,
+                       plugin->cache_size * 1024);
+                ok_to_play = TRUE;
+            }
+            if (ok_to_play == FALSE && (item->localsize > (plugin->cache_size * 2 * 1024))
+                && (plugin->cache_size >= 512)) {
+                printf("Setting to play because %i > %i (double cache)\n", item->localsize,
+                       plugin->cache_size * 2 * 1024);
+                ok_to_play = TRUE;
+            }
+            if (ok_to_play == FALSE) {
+                if (item->bitrate == 0 && item->bitrate_requests < 5
+                    && ((gint) (percent * 100) > item->bitrate_requests)) {
+                    item->bitrate = request_bitrate(plugin, item, item->local);
+                    item->bitrate_requests++;
+                }
+                if (item->bitrate > 0) {
+                    if (item->localsize / item->bitrate >= 10 && (percent >= 0.2)) {
+                        printf("Setting to play becuase %i >= 10\n",
+                               item->localsize / item->bitrate);
+                        ok_to_play = TRUE;
+                        if (plugin->post_dom_events && plugin->id != NULL) {
+                            postDOMEvent(plugin->mInstance, plugin->id, "qt_canplay");
+                        }
+                    }
+                }
+            }
+
+        }
+        // if not opened, over cache level and not an href target then try and open it
+        if ((!item->opened) && ok_to_play == TRUE) {
+            id = item->controlid;
+            path = g_strdup(item->path);
+            ready = item->playerready;
+            newwindow = item->newwindow;
+            if (!item->streaming)
+                item->streaming = streaming(item->src);
+            if (!item->streaming) {
+                printf("in progress_callback\n");
+                plugin->playlist = list_parse_qt(plugin->playlist, item);
+                plugin->playlist = list_parse_asx(plugin->playlist, item);
+                plugin->playlist = list_parse_qml(plugin->playlist, item);
+                plugin->playlist = list_parse_ram(plugin->playlist, item);
+            }
+            printf("item->play = %i\n", item->play);
+            printf("item->src = %s\n", item->src);
+            printf("calling open_location from progress_callback\n");
+            if (item->play) {
+                send_signal_with_integer(plugin, item, "SetGUIState", PLAYING);
+                open_location(plugin, item, TRUE);
+                item->requested = TRUE;
+                if (plugin->post_dom_events && plugin->id != NULL) {
+                    postDOMEvent(plugin->mInstance, plugin->id, "qt_loadedfirstframe");
+                    postDOMEvent(plugin->mInstance, plugin->id, "qt_canplay");
+                    postDOMEvent(plugin->mInstance, plugin->id, "qt_play");
+                }
+            } else {
+                item = list_find_next_playable(plugin->playlist);
+                if (item != NULL) {
+                    item->controlid = id;
+                    g_strlcpy(item->path, path, 1024);
+                    item->playerready = ready;
+                    item->newwindow = newwindow;
+                    item->cancelled = FALSE;
+                    // printf("opening next playable items on the playlist\n");
+                    if (item->streaming) {
+                        open_location(plugin, item, FALSE);
+                        item->requested = TRUE;
+                    } else {
+                        if (!item->requested) {
+                            plugin->GetURLNotify(plugin->mInstance, item->src, NULL, item);
+                            item->requested = TRUE;
+                        }
+                    }
+                }
+            }
+            g_free(path);
+        }
+
     }
 
     return 0;
@@ -1434,10 +1465,13 @@
 gpointer CURLGetURLNotify(gpointer data)
 {
     ListItem *item = (ListItem *) data;
-    ListItem *fetch_item = NULL;
     CPlugin *plugin = (CPlugin *) item->plugin;
+    gchar *path;
     FILE *local;
     CURL *curl;
+    gint id;
+    gboolean ready;
+    gboolean newwindow;
 
     if (item) {
         local = fopen(item->local, "wb");
@@ -1454,81 +1488,67 @@
 
                 curl_easy_perform(curl);
                 curl_easy_cleanup(curl);
-                gm_log(plugin->debug_level, G_LOG_LEVEL_INFO, "item retrieved using CURL\n");
+                printf("item retrieved using CURL\n");
                 //plugin->URLNotify(item->src, NPRES_DONE, item);
 
             }
             fclose(local);
-            gm_log(plugin->debug_level, G_LOG_LEVEL_DEBUG, "fetched %s to %s opened = %i\n",
-                   item->src, item->local, item->opened);
-            send_signal_with_double(plugin, item, "SetCachePercent", 1.0);
+            printf("fetched %s to %s\n", item->src, item->local);
             send_signal_with_double(plugin, item, "SetCachePercent", 0.0);
             item->retrieved = TRUE;
         }
 
-        if (!item->opened) {
+
+        if ((!item->opened)) {
+            id = item->controlid;
+            path = g_strdup(item->path);
+            ready = item->playerready;
+            newwindow = item->newwindow;
             if (!item->streaming)
                 item->streaming = streaming(item->src);
             if (!item->streaming) {
-                gm_log(plugin->debug_level, G_LOG_LEVEL_DEBUG, "in CURLGetURLNotify\n");
-                plugin->playlist = list_parse_qt(plugin->playlist, item, FALSE);
-                plugin->playlist = list_parse_qt2(plugin->playlist, item, FALSE);
-                plugin->playlist = list_parse_asx(plugin->playlist, item, FALSE);
-                plugin->playlist = list_parse_qml(plugin->playlist, item, FALSE);
-                plugin->playlist = list_parse_ram(plugin->playlist, item, FALSE);
+                printf("in CURLGetURLNotify\n");
+                plugin->playlist = list_parse_qt(plugin->playlist, item);
+                plugin->playlist = list_parse_asx(plugin->playlist, item);
+                plugin->playlist = list_parse_qml(plugin->playlist, item);
+                plugin->playlist = list_parse_ram(plugin->playlist, item);
             }
             // printf("item->play = %i\n", item->play);
             // printf("item->src = %i\n", item->src);
-            // printf("calling open_location from CURLGetURLNotify\n");
-
-            if (item->playlist == FALSE) {
-                if (item != NULL && item->queuedtoplay == FALSE) {
-                    if (!list_item_opened(plugin->playlist)) {
-                        item = list_find_first_playable(plugin->playlist);
-                    }
-                }
-                if (item != NULL) {
-                    if (item->play == TRUE && item->opened == FALSE) {
-
-                        open_location(plugin, item, TRUE);
-                        if (plugin->post_dom_events && plugin->id != NULL) {
-                            postDOMEvent(plugin->mInstance, plugin->id, "qt_loadedfirstframe");
-                            postDOMEvent(plugin->mInstance, plugin->id, "qt_canplay");
-                            postDOMEvent(plugin->mInstance, plugin->id, "qt_play");
-                        }
-                    }
+            // printf("calling open_location from Write\n");
+            if (item->play) {
+                send_signal_with_integer(plugin, item, "SetGUIState", PLAYING);
+                open_location(plugin, item, TRUE);
+                item->requested = TRUE;
+                if (plugin->post_dom_events && plugin->id != NULL) {
+                    postDOMEvent(plugin->mInstance, plugin->id, "qt_loadedfirstframe");
+                    postDOMEvent(plugin->mInstance, plugin->id, "qt_canplay");
+                    postDOMEvent(plugin->mInstance, plugin->id, "qt_play");
                 }
             } else {
-                item = list_find_first_playable(plugin->playlist);
+                item = list_find_next_playable(plugin->playlist);
                 if (item != NULL) {
-                    if (!item->streaming) {
-                        if (item->requested == FALSE) {
-                            gm_log(plugin->debug_level, G_LOG_LEVEL_INFO, "Getting URL '%s'",
-                                   item->src);
-                            item->requested = TRUE;
+                    item->controlid = id;
+                    g_strlcpy(item->path, path, 1024);
+                    item->playerready = ready;
+                    item->newwindow = newwindow;
+                    item->cancelled = FALSE;
+                    // printf("opening next playable items on the playlist\n");
+                    if (item->streaming) {
+                        open_location(plugin, item, FALSE);
+                        item->requested = TRUE;
+                    } else {
+                        if (!item->requested) {
                             plugin->GetURLNotify(plugin->mInstance, item->src, NULL, item);
+                            item->requested = TRUE;
                         }
-                    } else {
-                        if (!list_item_opened(plugin->playlist))
-                            open_location(plugin, item, FALSE);
                     }
                 }
             }
-
-            // fetch the next item on the playlist
-            fetch_item = list_find_next_playable_after_listitem(plugin->playlist, item);
-            if (fetch_item != NULL) {
-                if (!fetch_item->streaming) {
-                    gm_log(plugin->debug_level, G_LOG_LEVEL_INFO, "Getting URL '%s'",
-                           fetch_item->src);
-                    fetch_item->requested = TRUE;
-                    CURLGetURLNotify(fetch_item);
-                }
-            }
+            g_free(path);
 
         }
     }
-    return NULL;
 }
 
 
@@ -1547,8 +1567,8 @@
         return NPN_GetURLNotify(instance, url, target, notifyData);
     } else {
 #ifdef HAVE_CURL
-        gm_log(debug_level, G_LOG_LEVEL_DEBUG, "using curl to retrieve data from apple.com site\n");
-        gm_log(debug_level, G_LOG_LEVEL_DEBUG, "quicktime_emulation = %i\n", quicktime_emulation);
+        printf("using curl to retrieve data from apple.com site\n");
+        printf("quicktime_emulation = %i\n", quicktime_emulation);
 
         item = (ListItem *) notifyData;
         // item = list_find(playlist, (gchar*)stream->url);
@@ -1565,7 +1585,7 @@
                 playlist = g_list_append(playlist, item);
                 notifyData = item;
             } else {
-                gm_log(debug_level, G_LOG_LEVEL_DEBUG, "item is null\nstream url %s\n", url);
+                printf("item is null\nstream url %s\n", url);
                 return -1;
             }
         } else {
@@ -1575,7 +1595,7 @@
         }
 
         if (item->cancelled) {
-            gm_log(debug_level, G_LOG_LEVEL_DEBUG, "item has been cancelled\n");
+            printf("item has been cancelled\n");
             return -1;
         }
 
@@ -1591,7 +1611,7 @@
         }
 
         if (item->retrieved) {
-            gm_log(debug_level, G_LOG_LEVEL_DEBUG, "item is already retrieved\n");
+            printf("item is already retrieved\n");
             return -1;
         }
 
@@ -1620,10 +1640,11 @@
 // in the bin/components folder
 class ScriptablePluginObjectBase:public NPObject {
   public:
-    ScriptablePluginObjectBase(NPP npp):mNpp(npp) {
-    };
+    ScriptablePluginObjectBase(NPP npp)
+    :mNpp(npp) {
+    }
     virtual ~ ScriptablePluginObjectBase() {
-    };
+    }
 
     // Virtual NPObject hooks called through this base class. Override
     // as you see fit.
@@ -1780,8 +1801,9 @@
 
 class ScriptablePluginObjectControls:public ScriptablePluginObjectBase {
   public:
-    ScriptablePluginObjectControls(NPP npp):ScriptablePluginObjectBase(npp) {
-    };
+    ScriptablePluginObjectControls(NPP npp)
+    :ScriptablePluginObjectBase(npp) {
+    }
     virtual bool HasMethod(NPIdentifier name);
     virtual bool Invoke(NPIdentifier name, const NPVariant * args,
                         uint32_t argCount, NPVariant * result);
@@ -1818,7 +1840,7 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return PR_FALSE;
     }
 
@@ -1843,11 +1865,7 @@
 bool ScriptablePluginObjectControls::InvokeDefault(const NPVariant * args, uint32_t argCount,
                                                    NPVariant * result)
 {
-    CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
-    if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG,
-               "ScriptablePluginObjectControls default method called!\n");
-    }
+    printf("ScriptablePluginObject default method called!\n");
 
     STRINGZ_TO_NPVARIANT(strdup("default method return val"), *result);
 
@@ -1869,7 +1887,7 @@
 
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         VOID_TO_NPVARIANT(*result);
         return false;
     }
@@ -1893,7 +1911,7 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return false;
     }
 
@@ -1907,8 +1925,9 @@
 
 class ScriptablePluginObjectMedia:public ScriptablePluginObjectBase {
   public:
-    ScriptablePluginObjectMedia(NPP npp):ScriptablePluginObjectBase(npp) {
-    };
+    ScriptablePluginObjectMedia(NPP npp)
+    :ScriptablePluginObjectBase(npp) {
+    }
     virtual bool HasMethod(NPIdentifier name);
     virtual bool Invoke(NPIdentifier name, const NPVariant * args,
                         uint32_t argCount, NPVariant * result);
@@ -1943,26 +1962,26 @@
     int i;
 
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return PR_FALSE;
     }
 
     if (name == media_getItemInfo_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         arg = g_strdup(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         arg = g_strdup(NPVARIANT_TO_STRING(args[0]).utf8characters);
 #endif
 
-        if (g_ascii_strcasecmp(arg, "title") == 0) {
+        if (g_strcasecmp(arg, "title") == 0) {
             STRINGZ_TO_NPVARIANT(strdup
                                  (request_string_value(pPlugin, pPlugin->lastopened, "GetTitle")),
                                  *result);
-        } else if (g_ascii_strcasecmp(arg, "uri") == 0) {
+        } else if (g_strcasecmp(arg, "uri") == 0) {
             STRINGZ_TO_NPVARIANT(strdup
                                  (request_string_value(pPlugin, pPlugin->lastopened, "GetURI")),
                                  *result);
-        } else if (g_ascii_strcasecmp(arg, "bitrate") == 0) {
+        } else if (g_strcasecmp(arg, "bitrate") == 0) {
             pPlugin->GetBitrate(&i);
             INT32_TO_NPVARIANT(i, *result);
         } else {
@@ -1978,11 +1997,8 @@
 bool ScriptablePluginObjectMedia::InvokeDefault(const NPVariant * args, uint32_t argCount,
                                                 NPVariant * result)
 {
-    CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
-    if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG,
-               "ScriptablePluginObjectMedia default method called!\n");
-    }
+    printf("ScriptablePluginObject default method called!\n");
+
     STRINGZ_TO_NPVARIANT(strdup("default method return val"), *result);
 
     return PR_TRUE;
@@ -2003,7 +2019,7 @@
 
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         VOID_TO_NPVARIANT(*result);
         return false;
     }
@@ -2022,7 +2038,7 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return false;
     }
 
@@ -2035,8 +2051,9 @@
 
 class ScriptablePluginObjectSettings:public ScriptablePluginObjectBase {
   public:
-    ScriptablePluginObjectSettings(NPP npp):ScriptablePluginObjectBase(npp) {
-    };
+    ScriptablePluginObjectSettings(NPP npp)
+    :ScriptablePluginObjectBase(npp) {
+    }
     virtual bool HasMethod(NPIdentifier name);
     virtual bool Invoke(NPIdentifier name, const NPVariant * args,
                         uint32_t argCount, NPVariant * result);
@@ -2065,7 +2082,7 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return PR_FALSE;
     }
 
@@ -2075,11 +2092,8 @@
 bool ScriptablePluginObjectSettings::InvokeDefault(const NPVariant * args, uint32_t argCount,
                                                    NPVariant * result)
 {
-    CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
-    if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG,
-               "ScriptablePluginObjectSettings default method called!\n");
-    }
+    printf("ScriptablePluginObject default method called!\n");
+
     STRINGZ_TO_NPVARIANT(strdup("default method return val"), *result);
 
     return PR_TRUE;
@@ -2100,7 +2114,7 @@
 
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         VOID_TO_NPVARIANT(*result);
         return false;
     }
@@ -2119,7 +2133,7 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return false;
     }
 
@@ -2137,8 +2151,9 @@
 
 class ScriptablePluginObjectError:public ScriptablePluginObjectBase {
   public:
-    ScriptablePluginObjectError(NPP npp):ScriptablePluginObjectBase(npp) {
-    };
+    ScriptablePluginObjectError(NPP npp)
+    :ScriptablePluginObjectBase(npp) {
+    }
     virtual bool HasMethod(NPIdentifier name);
     virtual bool Invoke(NPIdentifier name, const NPVariant * args,
                         uint32_t argCount, NPVariant * result);
@@ -2166,7 +2181,7 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return PR_FALSE;
     }
 
@@ -2176,11 +2191,8 @@
 bool ScriptablePluginObjectError::InvokeDefault(const NPVariant * args, uint32_t argCount,
                                                 NPVariant * result)
 {
-    CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
-    if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG,
-               "ScriptablePluginObjectError default method called!\n");
-    }
+    printf("ScriptablePluginObject default method called!\n");
+
     STRINGZ_TO_NPVARIANT(strdup("default method return val"), *result);
 
     return PR_TRUE;
@@ -2199,7 +2211,7 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         VOID_TO_NPVARIANT(*result);
         return false;
     }
@@ -2217,7 +2229,7 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return false;
     }
 
@@ -2236,8 +2248,9 @@
 
 class ScriptablePluginObject:public ScriptablePluginObjectBase {
   public:
-    ScriptablePluginObject(NPP npp):ScriptablePluginObjectBase(npp) {
-    };
+    ScriptablePluginObject(NPP npp)
+    :ScriptablePluginObjectBase(npp) {
+    }
     virtual bool HasMethod(NPIdentifier name);
     virtual bool Invoke(NPIdentifier name, const NPVariant * args,
                         uint32_t argCount, NPVariant * result);
@@ -2314,7 +2327,7 @@
 
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return PR_FALSE;
     }
 
@@ -2369,7 +2382,7 @@
     }
 
     if (name == Open_id || name == SetFileName_id || name == SetHREF_id || name == SetURL_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetFilename(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         pPlugin->SetFilename(NPVARIANT_TO_STRING(args[0]).utf8characters);
@@ -2456,7 +2469,7 @@
     }
 
     if (name == onClick_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetOnClick(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         pPlugin->SetOnClick(NPVARIANT_TO_STRING(args[0]).utf8characters);
@@ -2465,7 +2478,7 @@
     }
 
     if (name == onMediaComplete_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetOnMediaComplete(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         pPlugin->SetOnMediaComplete(NPVARIANT_TO_STRING(args[0]).utf8characters);
@@ -2474,7 +2487,7 @@
     }
 
     if (name == onMouseUp_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetOnMouseUp(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         pPlugin->SetOnMouseUp(NPVARIANT_TO_STRING(args[0]).utf8characters);
@@ -2483,7 +2496,7 @@
     }
 
     if (name == onMouseDown_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetOnMouseDown(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         pPlugin->SetOnMouseDown(NPVARIANT_TO_STRING(args[0]).utf8characters);
@@ -2492,7 +2505,7 @@
     }
 
     if (name == onMouseOut_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetOnMouseOut(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         pPlugin->SetOnMouseOut(NPVARIANT_TO_STRING(args[0]).utf8characters);
@@ -2501,7 +2514,7 @@
     }
 
     if (name == onMouseOver_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetOnMouseOver(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         pPlugin->SetOnMouseOver(NPVARIANT_TO_STRING(args[0]).utf8characters);
@@ -2510,7 +2523,7 @@
     }
 
     if (name == onDestroy_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetOnDestroy(NPVARIANT_TO_STRING(args[0]).UTF8Characters);
 #else
         pPlugin->SetOnDestroy(NPVARIANT_TO_STRING(args[0]).utf8characters);
@@ -2524,11 +2537,7 @@
 bool ScriptablePluginObject::InvokeDefault(const NPVariant * args, uint32_t argCount,
                                            NPVariant * result)
 {
-    CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
-    if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG,
-               "ScriptablePluginObject default method called!\n");
-    }
+    printf("ScriptablePluginObject default method called!\n");
 
     STRINGZ_TO_NPVARIANT(strdup("default method return val"), *result);
 
@@ -2546,10 +2555,7 @@
         || name == URL_id
         || name == versionInfo_id
         || name == status_id
-        || name == controls_id
-        || name == media_id
-        || name == settings_id
-        || name == error_id || name == enabled_id || name == enableContextMenu_id) {
+        || name == controls_id || name == media_id || name == settings_id || name == error_id) {
         return true;
     } else {
         return false;
@@ -2566,18 +2572,15 @@
 
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         VOID_TO_NPVARIANT(*result);
         return false;
     }
 
     if (name == filename_id || name == src_id || name == URL_id) {
         pPlugin->GetFilename(&filename);
-        if (filename != NULL) {
+        if (filename != NULL)
             STRINGZ_TO_NPVARIANT(filename, *result);
-        } else {
-            STRINGZ_TO_NPVARIANT(strdup(""), *result);
-        }
         return true;
     }
 
@@ -2613,40 +2616,27 @@
 
     if (name == status_id) {
         pPlugin->GetPlayState(&state);
-        switch (state) {
-        case STATE_PLAYING:
-            status = g_strdup(_("Playing"));
-            break;
-        case STATE_PAUSED:
-            status = g_strdup(_("Paused"));
-            break;
-        case STATE_STOPPED:
-            status = g_strdup(_("Stopped"));
-            break;
-        case STATE_BUFFERING:
-            status =
-                g_strdup_printf(_("Buffering %2.1lf%%"),
-                                request_double_value(pPlugin, pPlugin->lastopened,
-                                                     "GetCachePercent") * 100.0);
-            break;
-        default:
-            status = g_strdup(_("Unknown Status"));
+        switch(state) {
+            case STATE_PLAYING:
+                status = g_strdup(_("Playing"));
+                break;
+            case STATE_PAUSED:
+                status = g_strdup(_("Paused"));
+                break;
+            case STATE_STOPPED:
+                status = g_strdup(_("Stopped"));
+                break;
+            case STATE_BUFFERING:
+                status = g_strdup_printf(_("Buffering %2.1lf%%"), request_double_value(pPlugin, pPlugin->lastopened, "GetCachePercent") * 100.0);
+                break;
+            default:
+                status = g_strdup(_("Unknown Status"));
         }
         // printf("Status = %s\n", status);
         STRINGZ_TO_NPVARIANT(status, *result);
         return true;
     }
 
-    if (name == enabled_id) {
-        BOOLEAN_TO_NPVARIANT(true, *result);
-        return true;
-    }
-
-    if (name == enableContextMenu_id) {
-        BOOLEAN_TO_NPVARIANT(!(pPlugin->disable_context_menu), *result);
-        return true;
-    }
-
     if (name == controls_id) {
         OBJECT_TO_NPVARIANT(pPlugin->GetScriptableObjectControls(), *result);
         return true;
@@ -2675,12 +2665,12 @@
 {
     CPlugin *pPlugin = (CPlugin *) mNpp->pdata;
     if (pPlugin == NULL) {
-        gm_log(pPlugin->debug_level, G_LOG_LEVEL_DEBUG, "Can't find plugin pointer\n");
+        printf("Can't find plugin pointer\n");
         return false;
     }
 
     if (name == filename_id || name == src_id || name == URL_id) {
-#ifdef NPAPI_USE_UPPERCASE_UTF8
+#ifdef HAVE_NEW_XULRUNNER
         pPlugin->SetFilename(NPVARIANT_TO_STRING(*value).UTF8Characters);
 #else
         pPlugin->SetFilename(NPVARIANT_TO_STRING(*value).utf8characters);
@@ -2707,15 +2697,6 @@
         return true;
     }
 
-    if (name == enabled_id) {
-        return true;
-    }
-
-    if (name == enableContextMenu_id) {
-        pPlugin->disable_context_menu = !(NPVARIANT_TO_BOOLEAN(*value));
-        return true;
-    }
-
     return false;
 }
 
diff -Nru gecko-mediaplayer-1.0.7/src/plugin.h gecko-mediaplayer-1.0.4/src/plugin.h
--- gecko-mediaplayer-1.0.7/src/plugin.h	2012-09-04 22:18:35.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin.h	2011-06-06 21:47:44.000000000 +0000
@@ -46,6 +46,11 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#ifdef HAVE_GCONF
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+#include <gconf/gconf-value.h>
+#endif
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -59,7 +64,7 @@
 #include <curl/curl.h>
 #endif
 
-#include <gmlib.h>
+#include "libgmlib/gmlib.h"
 
 // JavaScript Playstates
 #define STATE_UNDEFINED     0
@@ -93,8 +98,6 @@
 
 void postDOMEvent(NPP mInstance, const gchar * id, const gchar * event);
 void postPlayStateChange(NPP mInstance, const gint state);
-const gchar *NPErrorToString(NPError error);
-const gchar *NPReasonToString(NPReason reason);
 
 class CPlugin {
   private:
diff -Nru gecko-mediaplayer-1.0.7/src/plugin_dbus.cpp gecko-mediaplayer-1.0.4/src/plugin_dbus.cpp
--- gecko-mediaplayer-1.0.7/src/plugin_dbus.cpp	2012-09-04 22:18:35.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin_dbus.cpp	2011-06-24 15:40:45.000000000 +0000
@@ -50,7 +50,6 @@
     gchar *path;
     CPlugin *instance;
     ListItem *item = NULL;
-    ListItem *fetch_item = NULL;
     gchar *arg[10];
     gint i;
     GRand *rand;
@@ -121,7 +120,7 @@
 
             if (g_ascii_strcasecmp(dbus_message_get_member(message), "ListDump") == 0) {
 
-                gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "playlist:\n");
+                printf("playlist:\n");
                 list_dump(instance->playlist);
 
                 return DBUS_HANDLER_RESULT_HANDLED;
@@ -130,23 +129,19 @@
             if (g_ascii_strcasecmp(dbus_message_get_member(message), "RequestById") == 0) {
                 dbus_error_init(&error);
                 if (dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID)) {
-                    gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Got id %s\n", s);
+                    printf("Got id %s\n", s);
                     item = list_find_by_id(instance->playlist, (gint) g_strtod(s, NULL));
                     if (item != NULL) {
                         item->play = TRUE;
                         item->cancelled = FALSE;
                         item->retrieved = FALSE;
-                        gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "id %s has url of %s\n", s,
-                               item->src);
-                        gm_log(instance->debug_level, G_LOG_LEVEL_INFO,
-                               "id %s has newwindow = %i\n", s, item->newwindow);
+                        printf("id %s has url of %s\n", s, item->src);
+                        printf("id %s has newwindow = %i\n", s, item->newwindow);
                         if (item->newwindow == 0) {
                             send_signal_with_boolean(instance, item, "SetShowControls", TRUE);
                             if (item->streaming) {
                                 send_signal_with_string(instance, item, "Open", item->src);
                             } else {
-                                item->requested = TRUE;
-                                item->queuedtoplay = TRUE;
                                 instance->GetURLNotify(instance->mInstance, item->src, NULL, item);
                             }
                         } else {
@@ -177,16 +172,12 @@
                             if (g_spawn_async(NULL, arg, NULL,
                                               G_SPAWN_SEARCH_PATH, NULL, NULL, NULL,
                                               &gerror) == FALSE) {
-                                gm_log(instance->debug_level, G_LOG_LEVEL_INFO,
-                                       "Unable to launch %s: %s\n", app_name, gerror->message);
+                                printf("Unable to launch %s: %s\n", app_name, gerror->message);
                                 g_error_free(gerror);
                                 gerror = NULL;
                             }
                             g_free(app_name);
-                            gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "requesting %s \n",
-                                   item->src);
-                            item->requested = TRUE;
-                            item->queuedtoplay = TRUE;
+                            printf("requesting %s \n", item->src);
                             instance->GetURLNotify(instance->mInstance, item->src, NULL, item);
                         }
                         instance->lastopened->played = TRUE;
@@ -227,14 +218,9 @@
                     }
                 }
 
-                if (item != NULL) {
-                    printf("next item src = %s\n", item->src);
-                    printf("next item local = %s\n", item->local);
-                    printf("next item streaming = %i\n", item->streaming);
-                } else {
-                    printf("do not know what the next item is\n");
-                    list_dump(instance->playlist);
-                }
+                //printf("next item src = %s\n", item->src);
+                //printf("next item local = %s\n", item->local);
+                //printf("next item streaming = %i\n", item->streaming);
 
                 if (item != NULL) {
                     /*
@@ -263,35 +249,11 @@
                         item->cancelled = FALSE;
                         if (item->retrieved) {
                             open_location(instance, item, TRUE);
-                            fetch_item =
-                                list_find_next_playable_after_listitem(instance->playlist, item);
-                            if (fetch_item != NULL) {
-                                if (!fetch_item->streaming) {
-                                    gm_log(instance->debug_level, G_LOG_LEVEL_INFO,
-                                           "Getting URL '%s'", fetch_item->src);
-                                    fetch_item->requested = TRUE;
-                                    instance->GetURLNotify(instance->mInstance, fetch_item->src,
-                                                           NULL, fetch_item);
-                                }
-                            }
                         } else {
-                            item->requested = TRUE;
-                            item->queuedtoplay = TRUE;
                             instance->GetURLNotify(instance->mInstance, item->src, NULL, item);
                         }
                     } else {
                         open_location(instance, item, FALSE);
-                        fetch_item =
-                            list_find_next_playable_after_listitem(instance->playlist, item);
-                        if (fetch_item != NULL) {
-                            if (!fetch_item->streaming) {
-                                gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Getting URL '%s'",
-                                       fetch_item->src);
-                                fetch_item->requested = TRUE;
-                                instance->GetURLNotify(instance->mInstance, fetch_item->src, NULL,
-                                                       fetch_item);
-                            }
-                        }
                     }
                 }
                 return DBUS_HANDLER_RESULT_HANDLED;
@@ -309,25 +271,21 @@
                             NPN_GetURL(instance->mInstance, instance->event_mediacomplete, NULL);
                         }
                         postPlayStateChange(instance->mInstance, STATE_MEDIAENDED);
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "MouseClicked") == 0) {
                         if (instance->event_mouseclicked != NULL) {
                             NPN_GetURL(instance->mInstance, instance->event_mouseclicked, NULL);
                         }
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "EnterWindow") == 0) {
                         if (instance->event_enterwindow != NULL) {
                             NPN_GetURL(instance->mInstance, instance->event_enterwindow, NULL);
                         }
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "LeaveWindow") == 0) {
                         if (instance->event_leavewindow != NULL) {
                             NPN_GetURL(instance->mInstance, instance->event_leavewindow, NULL);
                         }
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "MouseDown") == 0) {
                         if (instance->event_mousedown != NULL) {
@@ -335,7 +293,6 @@
                             NPN_GetURL(instance->mInstance, tmp, NULL);
                             g_free(tmp);
                         }
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "MouseUp") == 0) {
                         if (instance->event_mouseup != NULL) {
@@ -343,43 +300,36 @@
                             NPN_GetURL(instance->mInstance, tmp, NULL);
                             g_free(tmp);
                         }
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "TimeChanged") == 0) {
                         if (instance->post_dom_events && instance->id != NULL) {
                             postDOMEvent(instance->mInstance, instance->id, "qt_timechanged");
                         }
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "Ended") == 0) {
                         if (instance->post_dom_events && instance->id != NULL) {
                             postDOMEvent(instance->mInstance, instance->id, "qt_ended");
                         }
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "MediaStopped") == 0) {
                         if (instance->post_dom_events && instance->id != NULL) {
                             postDOMEvent(instance->mInstance, instance->id, "qt_ended");
                         }
                         postPlayStateChange(instance->mInstance, STATE_STOPPED);
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "MediaPlaying") == 0) {
                         if (instance->post_dom_events && instance->id != NULL) {
                             postDOMEvent(instance->mInstance, instance->id, "qt_play");
                         }
                         postPlayStateChange(instance->mInstance, STATE_PLAYING);
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                     if (g_ascii_strcasecmp(s, "MediaPaused") == 0) {
                         if (instance->post_dom_events && instance->id != NULL) {
                             postDOMEvent(instance->mInstance, instance->id, "qt_pause");
                         }
                         postPlayStateChange(instance->mInstance, STATE_PAUSED);
-                        return DBUS_HANDLER_RESULT_HANDLED;
                     }
                 }
-                return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
             }
         }
     } else {
@@ -402,8 +352,7 @@
     dbus_bus_add_match(connection, "type='signal',interface='com.gecko.mediaplayer'", NULL);
     dbus_connection_add_filter(connection, filter_func, instance, NULL);
 
-    gm_log(instance->debug_level, G_LOG_LEVEL_INFO,
-           "DBUS connection created\nListening to path %s\n", instance->path);
+    printf("DBUS connection created\nListening to path %s\n", instance->path);
 
     return connection;
 }
@@ -447,10 +396,6 @@
                 file = g_strdup(item->src);
             }
 
-            gm_log(instance->debug_level, G_LOG_LEVEL_INFO,
-                   "Opening %s with launch\nitem->hrefid = %i item->src = %s", file, item->hrefid,
-                   item->src);
-
             //printf("launching gnome-mplayer from Open with id = %i\n",instance->controlid);
             app_name = NULL;
             if (instance->player_backend != NULL) {
@@ -513,8 +458,7 @@
             path = instance->path;
         }
 
-        gm_log(instance->debug_level, G_LOG_LEVEL_INFO,
-               "Sending Open %s to connection %p\nitem->hrefid = %i item->src = %s\n", file,
+        printf("Sending Open %s to connection %p\nitem->hrefid = %i item->src = %s\n", file,
                instance->connection, item->hrefid, item->src);
         if (item->hrefid == 0) {
             if (item->streaming) {
@@ -543,8 +487,7 @@
         item->opened = TRUE;
         instance->lastopened = item;
     } else {
-        gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Item '%s' already opened before",
-               item->src);
+        printf("Item already opened before\n");
     }
 }
 
@@ -645,10 +588,9 @@
     const char *localstr;
     gchar *path;
 
+    printf("Sending %s to connection %p\n", signal, instance->connection);
     if (instance == NULL)
         return;
-//    gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Sending %s to connection %p\n", signal,
-//           instance->connection);
 
     if (instance->console != NULL) {
         path = g_strdup_printf("/console/%s", instance->console);
@@ -678,12 +620,10 @@
     const char *localsignal;
     gchar *path;
 
+    //printf("Sending %s to connection %p\n", signal, instance->connection);
     if (instance == NULL)
         return;
 
-//    gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Sending %s to connection %p\n", signal,
-//           instance->connection);
-
     if (instance->console != NULL) {
         path = g_strdup_printf("/console/%s", instance->console);
     } else {
@@ -801,7 +741,7 @@
         replymessage =
             dbus_connection_send_with_reply_and_block(instance->connection, message, -1, &error);
         if (dbus_error_is_set(&error)) {
-            gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Error message = %s\n", error.message);
+            printf("Error message = %s\n", error.message);
         }
         dbus_message_get_args(replymessage, &error, DBUS_TYPE_BOOLEAN, &result, DBUS_TYPE_INVALID);
         dbus_message_unref(message);
@@ -844,7 +784,7 @@
         replymessage =
             dbus_connection_send_with_reply_and_block(instance->connection, message, -1, &error);
         if (dbus_error_is_set(&error)) {
-            gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Error message = %s\n", error.message);
+            printf("Error message = %s\n", error.message);
         }
         dbus_message_get_args(replymessage, &error, DBUS_TYPE_DOUBLE, &result, DBUS_TYPE_INVALID);
         dbus_message_unref(message);
@@ -888,7 +828,7 @@
         replymessage =
             dbus_connection_send_with_reply_and_block(instance->connection, message, -1, &error);
         if (dbus_error_is_set(&error)) {
-            gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Error message = %s\n", error.message);
+            printf("Error message = %s\n", error.message);
         }
         dbus_message_get_args(replymessage, &error, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID);
         dbus_message_unref(message);
@@ -931,7 +871,7 @@
         replymessage =
             dbus_connection_send_with_reply_and_block(instance->connection, message, -1, &error);
         if (dbus_error_is_set(&error)) {
-            gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Error message = %s\n", error.message);
+            printf("Error message = %s\n", error.message);
         }
         dbus_message_get_args(replymessage, &error, DBUS_TYPE_STRING, &result, DBUS_TYPE_INVALID);
         dbus_message_unref(message);
@@ -1013,7 +953,7 @@
         replymessage =
             dbus_connection_send_with_reply_and_block(instance->connection, message, -1, &error);
         if (dbus_error_is_set(&error)) {
-            gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "Error message = %s\n", error.message);
+            printf("Error message = %s\n", error.message);
         }
         if (replymessage != NULL) {
             dbus_message_get_args(replymessage, &error, DBUS_TYPE_INT32, &result,
diff -Nru gecko-mediaplayer-1.0.7/src/plugin_list.cpp gecko-mediaplayer-1.0.4/src/plugin_list.cpp
--- gecko-mediaplayer-1.0.7/src/plugin_list.cpp	2012-09-04 22:18:35.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin_list.cpp	2011-06-06 21:47:44.000000000 +0000
@@ -40,7 +40,6 @@
 gint entry_id = 0;
 GList *parser_list;
 ListItem *parser_item;
-gboolean global_detect_only;
 extern gint streaming(gchar * url);
 
 ListItem *list_find(GList * list, gchar * url)
@@ -56,6 +55,11 @@
                 // printf("found %s at %p\n",url,item);
                 return item;
             }
+//            if (g_strrstr(url, item->src) != NULL && item->play == TRUE) {
+//                // printf("found %s at %p\n",url,item);
+//                return item;
+//            }
+
         }
     }
 
@@ -172,62 +176,6 @@
     return NULL;
 }
 
-ListItem *list_find_next_playable_after_listitem(GList * list, ListItem * find)
-{
-    ListItem *item;
-    GList *iter;
-    ListItem *found = NULL;
-
-    if (list != NULL && find != NULL) {
-        for (iter = g_list_last(list); iter != NULL; iter = g_list_previous(iter)) {
-            item = (ListItem *) iter->data;
-            if (item != NULL) {
-                if (g_ascii_strcasecmp(find->src, item->src) == 0) {
-                    return found;
-                }
-                if (item->played == FALSE && item->play == TRUE) {
-                    found = item;
-                }
-            }
-        }
-    }
-    return NULL;
-}
-
-ListItem *list_find_first_playable(GList * list)
-{
-    ListItem *item;
-    GList *iter;
-
-    for (iter = list; iter != NULL; iter = g_list_next(iter)) {
-        item = (ListItem *) iter->data;
-        if (item != NULL) {
-            if (item->play == TRUE) {
-                return item;
-            }
-        }
-    }
-    return NULL;
-}
-
-gboolean list_item_opened(GList * list)
-{
-    ListItem *item;
-    GList *iter;
-
-    for (iter = list; iter != NULL; iter = g_list_next(iter)) {
-        item = (ListItem *) iter->data;
-        if (item != NULL) {
-            if (item->opened == TRUE) {
-                return TRUE;
-            }
-        }
-    }
-    return FALSE;
-}
-
-
-
 void list_qualify_url(GList * list, gchar * page_url)
 {
     ListItem *item;
@@ -282,43 +230,34 @@
 {
     ListItem *item;
     GList *iter;
-    gint count = 1;
 
     if (list != NULL) {
         for (iter = list; iter != NULL; iter = g_list_next(iter)) {
             item = (ListItem *) iter->data;
             if (item != NULL) {
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "----- Item %i -----", count++);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "src = %s", item->src);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "local = %s", item->local);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "id = %i", item->id);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "localsize = %i", item->localsize);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "lastsize = %i", item->lastsize);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "hrefid = %i", item->hrefid);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "requested = %i", item->requested);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "retrieved = %i", item->retrieved);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "cancelled = %i", item->cancelled);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "streaming = %i", item->streaming);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "opened = %i", item->opened);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "oktoplay = %i", item->oktoplay);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "queuedtoplay = %i", item->queuedtoplay);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "play = %i", item->play);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "played = %i", item->played);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "playlist = %i", item->playlist);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "path = %s", item->path);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "controlid = %i", item->controlid);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "playerready = %i", item->playerready);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "newwindow = %i", item->newwindow);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "loop = %i", item->loop);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "loopcount = %i", item->loopcount);
-                gm_log(TRUE, G_LOG_LEVEL_INFO, "plugin = %p", item->plugin);
+                printf("Item \n");
+                printf("src = %s\n", item->src);
+                printf("local = %s\n", item->local);
+                printf("id = %i\n", item->id);
+                printf("hrefid = %i\n", item->hrefid);
+                printf("play = %i\n", item->play);
+                printf("played = %i\n", item->played);
+                printf("path = %s\n", item->path);
+                printf("controlid = %i\n", item->controlid);
+                printf("playerready = %i\n", item->playerready);
+                printf("newwindow = %i\n", item->newwindow);
+                printf("cancelled = %i\n", item->cancelled);
+                printf("streaming = %i\n", item->streaming);
+                printf("loop = %i\n", item->loop);
+                printf("loopcount = %i\n", item->loopcount);
+                printf("plugin = %p\n", item->plugin);
             }
         }
     }
 }
 
 
-GList *list_parse_qt(GList * list, ListItem * item, gboolean detect_only)
+GList *list_parse_qt(GList * list, ListItem * item)
 {
     ListItem *newitem;
     gchar *data;
@@ -332,14 +271,14 @@
     unsigned int code = 0;      // some value about the URL
     gboolean added = FALSE;
 
-    // printf("Entering list_parse_qt localsize = %i\n", item->localsize);
+    printf("Entering list_parse_qt localsize = %i\n", item->localsize);
 
     if (item->localsize < (16 * 1024)) {
         if (g_file_get_contents(item->local, &data, &datalen, NULL)) {
             //printf("read %i bytes from %s\n",datalen, item->local);
             p = (gchar *) memmem_compat(data, datalen, "rmda", 4);
             if (p == NULL) {
-                gm_log(TRUE, G_LOG_LEVEL_DEBUG, "unable to find rmda in %s", item->local);
+                printf("unable to find rmda in %s\n", item->local);
                 return list;
             } else {
                 if (datalen > 4) {
@@ -381,21 +320,19 @@
                         if (code == 163 || code == 165 || code == 167
                             || code == (unsigned int) -93
                             || code == (unsigned int) -91 || code == (unsigned int) -89) {
-                            gm_log(TRUE, G_LOG_LEVEL_INFO, "Skipped URL: %s\n", rdrf);
+                            printf("Skipped URL: %s\n", rdrf);
                         } else {
                             if (list_find(list, url) == NULL && strlen(rdrf) > 0) {
-                                if (!detect_only) {
-                                    item->play = FALSE;
-                                    newitem = g_new0(ListItem, 1);
-                                    g_strlcpy(newitem->src, url, 1024);
-                                    // newitem->streaming = streaming(newitem->src);
-                                    newitem->play = TRUE;
-                                    newitem->id = item->id;
-                                    newitem->controlid = item->controlid;
-                                    g_strlcpy(newitem->path, item->path, 1024);
-                                    item->id = -1;
-                                    list = g_list_append(list, newitem);
-                                }
+                                item->play = FALSE;
+                                newitem = g_new0(ListItem, 1);
+                                g_strlcpy(newitem->src, url, 1024);
+                                // newitem->streaming = streaming(newitem->src);
+                                newitem->play = TRUE;
+                                newitem->id = item->id;
+                                newitem->controlid = item->controlid;
+                                g_strlcpy(newitem->path, item->path, 1024);
+                                item->id = -1;
+                                list = g_list_append(list, newitem);
                                 added = TRUE;
                             }
                         }
@@ -418,22 +355,19 @@
         } else {
             // printf("Unable to open %s \n",item->local); 
         }
-        // list_dump(list);
+        list_dump(list);
 
     } else {
         // if file is over 16K it is probably not a playlist
         // so skip parsing it.
         //printf("file not parsed > 16K actual size is %i\n",item->localsize);
     }
-    // printf("Exiting list_parse_qt\n");
-    if (added) {
-        item->playlist = TRUE;
-    }
+    printf("Exiting list_parse_qt\n");
     return list;
 
 }
 
-GList *list_parse_qt2(GList * list, ListItem * item, gboolean detect_only)
+GList *list_parse_qt2(GList * list, ListItem * item)
 {
     ListItem *newitem;
     gchar *data;
@@ -444,14 +378,14 @@
     gchar *urlptr;
     gboolean added = FALSE;
 
-    // printf("Entering list_parse_qt2 localsize = %i\n", item->localsize);
+    printf("Entering list_parse_qt2 localsize = %i\n", item->localsize);
 
     if (item->localsize < (256 * 1024)) {
         if (g_file_get_contents(item->local, &data, &datalen, NULL)) {
             //printf("read %i bytes from %s\n",datalen, item->local);
             p = (gchar *) memmem_compat(data, datalen, "mmdr", 4);
             if (p == NULL) {
-                gm_log(TRUE, G_LOG_LEVEL_DEBUG, "unable to find mmdr in %s", item->local);
+                printf("unable to find mmdr in %s\n", item->local);
                 return list;
             } else {
                 while (p != NULL && !added) {
@@ -473,18 +407,16 @@
                         }
 
                         if (list_find(list, url) == NULL) {
-                            if (!detect_only) {
-                                item->play = FALSE;
-                                newitem = g_new0(ListItem, 1);
-                                g_strlcpy(newitem->src, url, 1024);
-                                // newitem->streaming = streaming(newitem->src);
-                                newitem->play = TRUE;
-                                newitem->id = item->id;
-                                newitem->controlid = item->controlid;
-                                g_strlcpy(newitem->path, item->path, 1024);
-                                item->id = -1;
-                                list = g_list_append(list, newitem);
-                            }
+                            item->play = FALSE;
+                            newitem = g_new0(ListItem, 1);
+                            g_strlcpy(newitem->src, url, 1024);
+                            // newitem->streaming = streaming(newitem->src);
+                            newitem->play = TRUE;
+                            newitem->id = item->id;
+                            newitem->controlid = item->controlid;
+                            g_strlcpy(newitem->path, item->path, 1024);
+                            item->id = -1;
+                            list = g_list_append(list, newitem);
                             added = TRUE;
                         }
                         p = (gchar *) memmem_compat(urlptr, datalen - (urlptr - data), "mmdr", 4);
@@ -497,17 +429,14 @@
         } else {
             // printf("Unable to open %s \n",item->local); 
         }
-        // list_dump(list);
+        list_dump(list);
 
     } else {
         // if file is over 256K it is probably not a playlist
         // so skip parsing it.
         //printf("file not parsed > 256K actual size is %i\n",item->localsize);
     }
-    // printf("Exiting list_parse_qt2\n");
-    if (added) {
-        item->playlist = TRUE;
-    }
+    printf("Exiting list_parse_qt2\n");
     return list;
 
 }
@@ -565,19 +494,18 @@
 
 }
 
-GList *list_parse_asx(GList * list, ListItem * item, gboolean detect_only)
+GList *list_parse_asx(GList * list, ListItem * item)
 {
     GMarkupParseContext *context;
     gchar *data;
     gsize datalen;
 
-    // printf("Entering list_parse_asx localsize = %i\n", item->localsize);
+    printf("Entering list_parse_asx localsize = %i\n", item->localsize);
 
     if (item->localsize < (16 * 1024)) {
         if (g_file_get_contents(item->local, &data, &datalen, NULL)) {
             parser_list = list;
             parser_item = item;
-            global_detect_only = detect_only;
             asx_loop = 0;
             strip_unicode(data, datalen);
             replace_amp(data);
@@ -585,13 +513,12 @@
             context = g_markup_parse_context_new(&asx_parser, (GMarkupParseFlags) 0, data, NULL);
             g_markup_parse_context_parse(context, data, datalen, NULL);
             g_markup_parse_context_free(context);
-            global_detect_only = FALSE;
             parser_item = NULL;
             parser_list = NULL;
         }
-        // list_dump(list);
+        list_dump(list);
     }
-    // printf("Exiting list_parse_asx\n");
+    printf("Exiting list_parse_asx\n");
     return list;
 }
 
@@ -614,48 +541,45 @@
                 if (list_find(parser_list, (gchar *) attribute_values[i])
                     == NULL) {
                     parser_item->play = FALSE;
-                    parser_item->playlist = TRUE;
-                    if (!global_detect_only) {
-                        newitem = g_new0(ListItem, 1);
-                        value = g_strdup(attribute_values[i]);
-                        unreplace_amp(value);
-                        ptr = g_strrstr(value, "/");
-                        if (ptr == NULL) {
-                            g_strlcpy(url, parser_item->src, 1024);
-                            ptr = g_strrstr(url, "/");
-                            if (ptr != NULL) {
-                                ptr[1] = (char) NULL;
-                                g_strlcpy(newitem->src, url, 1024);
-                                g_strlcat(newitem->src, value, 1024);
-                            }
-                        } else {
-                            g_strlcpy(newitem->src, value, 1024);
+                    newitem = g_new0(ListItem, 1);
+                    value = g_strdup(attribute_values[i]);
+                    unreplace_amp(value);
+                    ptr = g_strrstr(value, "/");
+                    if (ptr == NULL) {
+                        g_strlcpy(url, parser_item->src, 1024);
+                        ptr = g_strrstr(url, "/");
+                        if (ptr != NULL) {
+                            ptr[1] = (char) NULL;
+                            g_strlcpy(newitem->src, url, 1024);
+                            g_strlcat(newitem->src, value, 1024);
                         }
+                    } else {
+                        g_strlcpy(newitem->src, value, 1024);
+                    }
 
-                        g_free(value);
-                        newitem->streaming = streaming(newitem->src);
-                        // crappy hack, mplayer needs the protocol in lower case, some sites don't
-                        if (newitem->streaming) {
-                            newitem->src[0] = g_ascii_tolower(newitem->src[0]);
-                            newitem->src[1] = g_ascii_tolower(newitem->src[1]);
-                            newitem->src[2] = g_ascii_tolower(newitem->src[2]);
-                            newitem->src[3] = g_ascii_tolower(newitem->src[3]);
-                        }
-                        newitem->play = TRUE;
-                        if (entry_id != 0) {
-                            newitem->id = entry_id;
-                        } else {
-                            newitem->id = parser_item->id;
-                            parser_item->id = -1;
-                        }
-                        newitem->controlid = parser_item->controlid;
-                        if (asx_loop != 0) {
-                            newitem->loop = TRUE;
-                            newitem->loopcount = asx_loop;
-                        }
-                        g_strlcpy(newitem->path, parser_item->path, 1024);
-                        parser_list = g_list_append(parser_list, newitem);
+                    g_free(value);
+                    newitem->streaming = streaming(newitem->src);
+                    // crappy hack, mplayer needs the protocol in lower case, some sites don't
+                    if (newitem->streaming) {
+                        newitem->src[0] = g_ascii_tolower(newitem->src[0]);
+                        newitem->src[1] = g_ascii_tolower(newitem->src[1]);
+                        newitem->src[2] = g_ascii_tolower(newitem->src[2]);
+                        newitem->src[3] = g_ascii_tolower(newitem->src[3]);
                     }
+                    newitem->play = TRUE;
+                    if (entry_id != 0) {
+                        newitem->id = entry_id;
+                    } else {
+                        newitem->id = parser_item->id;
+                        parser_item->id = -1;
+                    }
+                    newitem->controlid = parser_item->controlid;
+                    if (asx_loop != 0) {
+                        newitem->loop = TRUE;
+                        newitem->loopcount = asx_loop;
+                    }
+                    g_strlcpy(newitem->path, parser_item->path, 1024);
+                    parser_list = g_list_append(parser_list, newitem);
                 }
 
             }
@@ -672,7 +596,6 @@
                 if (list_find(parser_list, (gchar *) attribute_values[i])
                     == NULL) {
                     parser_item->play = FALSE;
-                    parser_item->playlist = TRUE;
                     newitem = g_new0(ListItem, 1);
                     value = g_strdup(attribute_values[i]);
                     unreplace_amp(value);
@@ -727,19 +650,18 @@
 
 }
 
-GList *list_parse_qml(GList * list, ListItem * item, gboolean detect_only)
+GList *list_parse_qml(GList * list, ListItem * item)
 {
     GMarkupParseContext *context;
     gchar *data;
     gsize datalen;
 
-    // printf("Entering list_parse_qml localsize = %i\n", item->localsize);
+    printf("Entering list_parse_qml localsize = %i\n", item->localsize);
 
     if (item->localsize < (16 * 1024)) {
         if (g_file_get_contents(item->local, &data, &datalen, NULL)) {
             parser_list = list;
             parser_item = item;
-            global_detect_only = detect_only;
             asx_loop = 0;
             strip_unicode(data, datalen);
             replace_amp(data);
@@ -749,11 +671,10 @@
             g_markup_parse_context_free(context);
             parser_item = NULL;
             parser_list = NULL;
-            global_detect_only = FALSE;
         }
-        // list_dump(list);
+        list_dump(list);
     }
-    // printf("Exiting list_parse_qml\n");
+    printf("Exiting list_parse_qml\n");
     return list;
 }
 
@@ -775,36 +696,33 @@
                     == NULL) {
                     if (parser_item->play) {
                         parser_item->play = FALSE;
-                        parser_item->playlist = TRUE;
-                        if (!global_detect_only) {
-                            newitem = g_new0(ListItem, 1);
-                            value = g_strdup(attribute_values[i]);
-                            unreplace_amp(value);
-                            g_strlcpy(newitem->src, value, 1024);
-                            g_free(value);
-                            newitem->streaming = streaming(newitem->src);
-                            // crappy hack, mplayer needs the protocol in lower case, some sites don't
-                            if (newitem->streaming) {
-                                newitem->src[0] = g_ascii_tolower(newitem->src[0]);
-                                newitem->src[1] = g_ascii_tolower(newitem->src[1]);
-                                newitem->src[2] = g_ascii_tolower(newitem->src[2]);
-                                newitem->src[3] = g_ascii_tolower(newitem->src[3]);
-                            }
-                            newitem->play = TRUE;
-                            if (entry_id != 0) {
-                                newitem->id = entry_id;
-                            } else {
-                                newitem->id = parser_item->id;
-                                parser_item->id = -1;
-                            }
-                            newitem->controlid = parser_item->controlid;
-                            if (asx_loop != 0) {
-                                newitem->loop = TRUE;
-                                newitem->loopcount = asx_loop;
-                            }
-                            g_strlcpy(newitem->path, parser_item->path, 1024);
-                            parser_list = g_list_append(parser_list, newitem);
+                        newitem = g_new0(ListItem, 1);
+                        value = g_strdup(attribute_values[i]);
+                        unreplace_amp(value);
+                        g_strlcpy(newitem->src, value, 1024);
+                        g_free(value);
+                        newitem->streaming = streaming(newitem->src);
+                        // crappy hack, mplayer needs the protocol in lower case, some sites don't
+                        if (newitem->streaming) {
+                            newitem->src[0] = g_ascii_tolower(newitem->src[0]);
+                            newitem->src[1] = g_ascii_tolower(newitem->src[1]);
+                            newitem->src[2] = g_ascii_tolower(newitem->src[2]);
+                            newitem->src[3] = g_ascii_tolower(newitem->src[3]);
+                        }
+                        newitem->play = TRUE;
+                        if (entry_id != 0) {
+                            newitem->id = entry_id;
+                        } else {
+                            newitem->id = parser_item->id;
+                            parser_item->id = -1;
                         }
+                        newitem->controlid = parser_item->controlid;
+                        if (asx_loop != 0) {
+                            newitem->loop = TRUE;
+                            newitem->loopcount = asx_loop;
+                        }
+                        g_strlcpy(newitem->path, parser_item->path, 1024);
+                        parser_list = g_list_append(parser_list, newitem);
                     }
                 }
             }
@@ -813,7 +731,7 @@
     }
 }
 
-GList *list_parse_ram(GList * list, ListItem * item, gboolean detect_only)
+GList *list_parse_ram(GList * list, ListItem * item)
 {
     gchar *data;
     gsize datalen;
@@ -825,7 +743,7 @@
     gchar *ptr;
     gchar url[1024];
 
-    // printf("Entering list_parse_ram localsize = %i\n", item->localsize);
+    printf("Entering list_parse_ram localsize = %i\n", item->localsize);
 
     if (item->localsize < (16 * 1024)) {
         if (g_file_get_contents(item->local, &data, &datalen, NULL)) {
@@ -847,38 +765,35 @@
                         if (list_find(parser_list, (gchar *) output[i])
                             == NULL) {
                             parser_item->play = FALSE;
-                            parser_item->playlist = TRUE;
-                            if (!detect_only) {
-                                newitem = g_new0(ListItem, 1);
-                                value = g_strdup(output[i]);
-                                unreplace_amp(value);
-                                ptr = g_strrstr(value, "/");
-                                if (ptr == NULL) {
-                                    g_strlcpy(url, parser_item->src, 1024);
-                                    ptr = g_strrstr(url, "/");
-                                    if (ptr != NULL) {
-                                        ptr[1] = (char) NULL;
-                                        g_strlcpy(newitem->src, url, 1024);
-                                        g_strlcat(newitem->src, value, 1024);
-                                    }
-                                } else {
-                                    g_strlcpy(newitem->src, value, 1024);
-                                }
-                                g_free(value);
-                                newitem->streaming = streaming(newitem->src);
-                                // crappy hack, mplayer needs the protocol in lower case, some sites don't
-                                if (newitem->streaming) {
-                                    newitem->src[0] = g_ascii_tolower(newitem->src[0]);
-                                    newitem->src[1] = g_ascii_tolower(newitem->src[1]);
-                                    newitem->src[2] = g_ascii_tolower(newitem->src[2]);
-                                    newitem->src[3] = g_ascii_tolower(newitem->src[3]);
+                            newitem = g_new0(ListItem, 1);
+                            value = g_strdup(output[i]);
+                            unreplace_amp(value);
+                            ptr = g_strrstr(value, "/");
+                            if (ptr == NULL) {
+                                g_strlcpy(url, parser_item->src, 1024);
+                                ptr = g_strrstr(url, "/");
+                                if (ptr != NULL) {
+                                    ptr[1] = (char) NULL;
+                                    g_strlcpy(newitem->src, url, 1024);
+                                    g_strlcat(newitem->src, value, 1024);
                                 }
-                                newitem->play = TRUE;
-                                newitem->id = ++entry_id;
-                                newitem->controlid = parser_item->controlid;
-                                g_strlcpy(newitem->path, parser_item->path, 1024);
-                                parser_list = g_list_append(parser_list, newitem);
+                            } else {
+                                g_strlcpy(newitem->src, value, 1024);
+                            }
+                            g_free(value);
+                            newitem->streaming = streaming(newitem->src);
+                            // crappy hack, mplayer needs the protocol in lower case, some sites don't
+                            if (newitem->streaming) {
+                                newitem->src[0] = g_ascii_tolower(newitem->src[0]);
+                                newitem->src[1] = g_ascii_tolower(newitem->src[1]);
+                                newitem->src[2] = g_ascii_tolower(newitem->src[2]);
+                                newitem->src[3] = g_ascii_tolower(newitem->src[3]);
                             }
+                            newitem->play = TRUE;
+                            newitem->id = ++entry_id;
+                            newitem->controlid = parser_item->controlid;
+                            g_strlcpy(newitem->path, parser_item->path, 1024);
+                            parser_list = g_list_append(parser_list, newitem);
                         }
                     }
                     i++;
@@ -888,8 +803,8 @@
                 parser_item = NULL;
             }
         }
-        // list_dump(list);
+        list_dump(list);
     }
-    // printf("Exiting list_parse_ram\n");
+    printf("Exiting list_parse_ram\n");
     return list;
 }
diff -Nru gecko-mediaplayer-1.0.7/src/plugin_list.h gecko-mediaplayer-1.0.4/src/plugin_list.h
--- gecko-mediaplayer-1.0.7/src/plugin_list.h	2012-09-04 22:18:35.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin_list.h	2011-06-06 21:47:44.000000000 +0000
@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "memmem_compat.h"
-#include <gmlib.h>
 
 typedef struct _ListItem {
     gchar src[4096];
@@ -57,12 +56,9 @@
     gboolean streaming;
     gboolean requested;
     gboolean retrieved;
-    gboolean oktoplay;
-    gboolean queuedtoplay;
     gboolean play;
     gboolean played;
     gboolean opened;
-    gboolean playlist;
     guint mediasize;
     gint localsize;
     gint lastsize;
@@ -117,16 +113,13 @@
 void list_mark_controlid_cancelled(GList * list, gint id, gboolean cancelled);
 void list_mark_id_played(GList * list, gint id);
 ListItem *list_find_next_playable(GList * list);
-ListItem *list_find_next_playable_after_listitem(GList * list, ListItem * find);
-ListItem *list_find_first_playable(GList * list);
 void list_qualify_url(GList * list, gchar * page_url);
 GList *list_clear(GList * list);
 void list_dump(GList * list);
-GList *list_parse_qt(GList * list, ListItem * item, gboolean detect_only);
-GList *list_parse_qt2(GList * list, ListItem * item, gboolean detect_only);
-GList *list_parse_asx(GList * list, ListItem * item, gboolean detect_only);
-GList *list_parse_qml(GList * list, ListItem * item, gboolean detect_only);     // Quick Time Media Link
-GList *list_parse_ram(GList * list, ListItem * item, gboolean detect_only);     // Real Audio Playlist
-gboolean list_item_opened(GList * list);
+GList *list_parse_qt(GList * list, ListItem * item);
+GList *list_parse_qt2(GList * list, ListItem * item);
+GList *list_parse_asx(GList * list, ListItem * item);
+GList *list_parse_qml(GList * list, ListItem * item);   // Quick Time Media Link
+GList *list_parse_ram(GList * list, ListItem * item);   // Real Audio Playlist
 
 #endif                          // _PLUGIN_LIST_H
diff -Nru gecko-mediaplayer-1.0.7/src/plugin_setup.cpp gecko-mediaplayer-1.0.4/src/plugin_setup.cpp
--- gecko-mediaplayer-1.0.7/src/plugin_setup.cpp	2012-09-04 22:18:35.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin_setup.cpp	2011-06-07 19:22:50.000000000 +0000
@@ -65,22 +65,13 @@
     gchar *app_name;
 
     if (instance->mode == NP_EMBED) {
-
-        /*
-           printf("argc = %i\n", argc);
-           for (i = 0; i < argc; i++) {
-           printf("ARG[%i]: %s = %s\n", i, argn[i], argv[i]);
-           }
-         */
-
         for (i = 0; i < argc; i++) {
 
-            gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "ARG[%i]: %s = %s", i, argn[i],
-                   argv[i]);
-
             if (argn[i] == NULL)
                 continue;
 
+            printf("ARG: %s = %s\n", argn[i], argv[i]);
+
             if (g_ascii_strcasecmp(argn[i], "name") == 0) {
                 instance->name = g_strdup(argv[i]);
             }
@@ -124,12 +115,9 @@
 
             if (g_ascii_strcasecmp(argn[i], "style") == 0) {
                 tmp = g_strrstr(argv[i], "width:");
-                if (tmp)
-                    sscanf(tmp + strlen("width:"), "%i", &width);
+                sscanf(tmp + strlen("width:"), "%i", &width);
                 tmp = g_strrstr(argv[i], "height:");
-                if (tmp)
-                    sscanf(tmp + strlen("height:"), "%i", &height);
-                gm_log(instance->debug_level, G_LOG_LEVEL_DEBUG, "done with style\n");
+                sscanf(tmp + strlen("height:"), "%i", &height);
             }
 
 
@@ -448,7 +436,7 @@
             if (argn[i] == NULL)
                 continue;
 
-            gm_log(instance->debug_level, G_LOG_LEVEL_INFO, "ARG: %s = %s\n", argn[i], argv[i]);
+            printf("ARG: %s = %s\n", argn[i], argv[i]);
 
             if (g_ascii_strcasecmp(argn[i], "src") == 0) {
                 item = g_new0(ListItem, 1);
@@ -464,8 +452,7 @@
                     g_strlcpy(item->src, argv[i], 4096);
                 }
                 item->streaming = streaming(item->src);
-                gm_log(instance->debug_level, G_LOG_LEVEL_DEBUG, "this should match %s\n",
-                       item->src);
+                printf("this should match %s\n", item->src);
                 item->play = TRUE;
                 item->id = instance->nextid++;
                 instance->playlist = g_list_append(instance->playlist, item);
@@ -576,7 +563,7 @@
         arg[i] = NULL;
         error = NULL;
         if (g_spawn_async(NULL, arg, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error) == FALSE) {
-            gm_log(TRUE, G_LOG_LEVEL_INFO, "Unable to launch: %s\n", error->message);
+            printf("Unable to launch: %s\n", error->message);
             g_error_free(error);
             error = NULL;
         }
@@ -604,9 +591,6 @@
     if (g_ascii_strncasecmp(url, "rtsp://", 7) == 0)
         ret = TRUE;
 
-    if (g_ascii_strncasecmp(url, "rtp://", 6) == 0)
-        ret = TRUE;
-
     if (g_ascii_strncasecmp(url, "tv://", 5) == 0)
         ret = TRUE;
 
diff -Nru gecko-mediaplayer-1.0.7/src/plugin_types_dvx.cpp gecko-mediaplayer-1.0.4/src/plugin_types_dvx.cpp
--- gecko-mediaplayer-1.0.7/src/plugin_types_dvx.cpp	2012-08-04 17:18:47.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin_types_dvx.cpp	2011-06-06 21:47:44.000000000 +0000
@@ -97,5 +97,5 @@
 
 void pluginSpecific(CPlugin * instance)
 {
-    instance->quicktime_emulation = FALSE;
+
 }
diff -Nru gecko-mediaplayer-1.0.7/src/plugin_types_qt.cpp gecko-mediaplayer-1.0.4/src/plugin_types_qt.cpp
--- gecko-mediaplayer-1.0.7/src/plugin_types_qt.cpp	2012-08-04 17:18:47.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin_types_qt.cpp	2011-06-06 21:47:44.000000000 +0000
@@ -102,6 +102,6 @@
 {
     //printf("calling pluginSpecific for qt plugin\n");
     //setPreference(instance, "general.useragent.override", "QuickTime/7.6.9");
-    gm_log(TRUE, G_LOG_LEVEL_INFO, "Loading QuickTime compatibility\n");
+    printf("Loading QuickTime compatibility\n");
     instance->quicktime_emulation = TRUE;
 }
diff -Nru gecko-mediaplayer-1.0.7/src/plugin_types_rm.cpp gecko-mediaplayer-1.0.4/src/plugin_types_rm.cpp
--- gecko-mediaplayer-1.0.7/src/plugin_types_rm.cpp	2012-08-04 17:18:47.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin_types_rm.cpp	2011-06-06 21:47:44.000000000 +0000
@@ -103,5 +103,5 @@
 
 void pluginSpecific(CPlugin * instance)
 {
-    instance->quicktime_emulation = FALSE;
+
 }
diff -Nru gecko-mediaplayer-1.0.7/src/plugin_types_wmp.cpp gecko-mediaplayer-1.0.4/src/plugin_types_wmp.cpp
--- gecko-mediaplayer-1.0.7/src/plugin_types_wmp.cpp	2012-08-04 17:18:47.000000000 +0000
+++ gecko-mediaplayer-1.0.4/src/plugin_types_wmp.cpp	2011-06-06 22:01:03.000000000 +0000
@@ -116,5 +116,5 @@
 
 void pluginSpecific(CPlugin * instance)
 {
-    instance->quicktime_emulation = FALSE;
+
 }