Hello community, here is the log from the commit of package gupnp-tools for openSUSE:Factory checked in at 2013-11-24 11:57:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gupnp-tools (Old) and /work/SRC/openSUSE:Factory/.gupnp-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gupnp-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/gupnp-tools/gupnp-tools.changes 2013-08-30 16:32:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gupnp-tools.new/gupnp-tools.changes 2013-11-24 11:57:36.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 11 22:28:44 UTC 2013 - dims...@opensuse.org + +- Update to version 0.8.8 (bnc#849913): + + Add --interface/--port options to all GUI tools. + + Universal CP: + - Don't crash on variable-only services. + - Select first combo box value by default for restricted value + lists. + + Bugs fixed: bgo#672863, bgo#708370. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gupnp-tools-0.8.7.tar.xz New: ---- gupnp-tools-0.8.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gupnp-tools.spec ++++++ --- /var/tmp/diff_new_pack.HWQLKY/_old 2013-11-24 11:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.HWQLKY/_new 2013-11-24 11:57:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: gupnp-tools -Version: 0.8.7 +Version: 0.8.8 Release: 0 Summary: UPnP tools to test and debug UPnP devices and control points License: GPL-2.0+ @@ -31,7 +31,7 @@ BuildRequires: pkgconfig(gssdp-1.0) >= 0.13.3 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.2.0 -BuildRequires: pkgconfig(gupnp-1.0) >= 0.18 +BuildRequires: pkgconfig(gupnp-1.0) >= 0.20.8 BuildRequires: pkgconfig(gupnp-av-1.0) >= 0.5.5 BuildRequires: pkgconfig(libsoup-2.4) >= 2.4 BuildRequires: pkgconfig(libxml-2.0) >= 2.0 ++++++ gupnp-tools-0.8.7.tar.xz -> gupnp-tools-0.8.8.tar.xz ++++++ ++++ 2230 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/ChangeLog new/gupnp-tools-0.8.8/ChangeLog --- old/gupnp-tools-0.8.7/ChangeLog 2013-08-20 15:31:15.000000000 +0200 +++ new/gupnp-tools-0.8.8/ChangeLog 2013-11-11 20:59:27.000000000 +0100 @@ -1,5 +1,124 @@ # Generated by Makefile. Do not edit. +commit 631df9fad4d7f0e13ea25da7dd98c6aea289037a +Author: Jens Georg <m...@jensge.org> +Date: Mon Nov 11 20:55:48 2013 +0100 + + Prepare 0.8.8 + + NEWS | 32 ++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 33 insertions(+), 1 deletion(-) + +commit 3067ebbf02e5e6c56512324325cfe1b83d7f3044 +Author: tuhaihe <113232173...@gmail.com> +Date: Fri Nov 1 22:43:41 2013 +0800 + + Added Chinese simplified translation + + po/LINGUAS | 1 + + po/zh_CN.po | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 465 insertions(+) + +commit ef380cb4a581e6424e69e7f777c009a9c4e91d70 +Author: Jussi Kukkonen <jussi.kukko...@intel.com> +Date: Wed Sep 18 23:36:07 2013 +0300 + + universal-cp: Select first combobox value by default + + Even if a restricted value list does not have a default value, it makes + sense to select one of the values in the combobox: it might save the + user a button press. + + https://bugzilla.gnome.org/show_bug.cgi?id=708370 + + src/universal-cp/action-dialog.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 895976c52601f49bf22936c1cee9802d3e037dc1 +Author: Enrico Nicoletto <live...@gmail.com> +Date: Wed Oct 23 12:30:50 2013 -0200 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +commit df818cda010591e9337491ba001917dc3eae8405 +Author: Daniel Mustieles <daniel.mustie...@gmail.com> +Date: Tue Oct 22 14:36:54 2013 +0200 + + Updated Spanish translation + + po/es.po | 34 +++++++++++++++++++++------------- + 1 file changed, 21 insertions(+), 13 deletions(-) + +commit 5865350f237afc14591de4e535b50658b0d75e1e +Author: Matej Urbančič <mat...@svn.gnome.org> +Date: Sun Oct 20 18:24:48 2013 +0200 + + Updated Slovenian translation + + po/sl.po | 64 ++++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 34 insertions(+), 30 deletions(-) + +commit 7d8e77fac2099680e0547febaef944a8169dbae0 +Author: Piotr Drąg <piotrd...@gmail.com> +Date: Sun Oct 20 15:12:10 2013 +0200 + + Updated Polish translation + + po/pl.po | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +commit 8e640cfd3089d234dac8c3ed3d91bdceb81f3209 +Author: Jens Georg <m...@jensge.org> +Date: Sun Oct 20 13:10:13 2013 +0200 + + network-light: Add --interface and --port option + + src/network-light/main.c | 31 ++++++++++++++++++++++++++++--- + src/network-light/upnp.c | 12 ++++++++++-- + src/network-light/upnp.h | 2 +- + 3 files changed, 39 insertions(+), 6 deletions(-) + +commit a3fad1985ec6b66ce2c34fb9f30c2c564de255f1 +Author: Jens Georg <m...@jensge.org> +Date: Sun Oct 20 13:02:07 2013 +0200 + + universal-cp: Add --interface and --port options + + src/universal-cp/main.c | 36 +++++++++++++++++++++++++++++++++++- + 1 file changed, 35 insertions(+), 1 deletion(-) + +commit 95e430fc63396c4e73f01a7b9bce9c1a4f3ccb81 +Author: Jens Georg <m...@jensge.org> +Date: Sun Oct 20 12:53:05 2013 +0200 + + av-cp: Add --interface option + + --interface allows a dedicated interface to use to be set. --interface can be + used multiple times to specify a list of network interfaces. + + configure.ac | 2 +- + src/av-cp/main.c | 13 +++++++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit f9e0333da773d0afbec2f8e7b412f57d2830ef8c +Author: Jens Georg <m...@jensge.org> +Date: Sun Oct 20 12:11:28 2013 +0200 + + Don't crash on variable-only service + + Also keep a reference to introspection when adding service variables into the + treeview. Otherwise the introspection gets unreffed in device-treeview.c:528 + and the state variables become invalid. + + https://bugzilla.gnome.org/show_bug.cgi?id=672863 + + src/universal-cp/device-treeview.c | 3 +++ + 1 file changed, 3 insertions(+) + commit 7ba8545fa891bbbb34ae560f8041cb4733b8832b Author: Jens Georg <m...@jensge.org> Date: Tue Aug 20 15:29:24 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/NEWS new/gupnp-tools-0.8.8/NEWS --- old/gupnp-tools-0.8.7/NEWS 2013-08-20 15:16:45.000000000 +0200 +++ new/gupnp-tools-0.8.8/NEWS 2013-11-11 20:58:10.000000000 +0100 @@ -1,3 +1,35 @@ +0.8.8 +===== + +Changes since 0.8.7: + +- Updated translations. +- Add --interface/--port options to all GUI tools. + +Universal CP: + - Don't crash on variable-only services. + - Select first combo box value by default for restricted value lists. + +Bugs fixed in this release: + - https://bugzilla.gnome.org/show_bug.cgi?id=672863 + - https://bugzilla.gnome.org/show_bug.cgi?id=708370 + +All contributors to this release: + - Jens Georg <m...@jensge.org> + - tuhaihe <113232173...@gmail.com> + - Piotr Drąg <piotrd...@gmail.com> + - Matej Urbančič <mat...@svn.gnome.org> + - Jussi Kukkonen <jussi.kukko...@intel.com> + - Enrico Nicoletto <live...@gmail.com> + - Daniel Mustieles <daniel.mustie...@gmail.com> + +Added/updated translations + - es, courtesy of Daniel Mustieles + - pl, courtesy of Piotr Drąg + - pt_BR, courtesy of Enrico Nicoletto + - sl, courtesy of Matej Urbančič + - zh_CN, courtesy of tuhaihe + 0.8.7 ===== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/configure.ac new/gupnp-tools-0.8.8/configure.ac --- old/gupnp-tools-0.8.7/configure.ac 2013-08-20 15:29:17.000000000 +0200 +++ new/gupnp-tools-0.8.8/configure.ac 2013-11-11 20:55:39.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([gupnp-tools], - [0.8.7], + [0.8.8], [https://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gupnp-tools], [gupnp-tools], [http://www.gupnp.org/]) @@ -25,7 +25,7 @@ GLIB_REQUIRED=2.24 GSSDP_REQUIRED=0.13.3 -GUPNP_REQUIRED=0.18.0 +GUPNP_REQUIRED=0.20.8 SOUP_REQUIRED=2.4 GUPNP_AV_REQUIRED=0.5.5 GTK_REQUIRED=3.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/po/LINGUAS new/gupnp-tools-0.8.8/po/LINGUAS --- old/gupnp-tools-0.8.7/po/LINGUAS 2013-08-20 15:01:38.000000000 +0200 +++ new/gupnp-tools-0.8.8/po/LINGUAS 2013-11-11 20:50:03.000000000 +0100 @@ -8,3 +8,4 @@ sl sr sr@latin +zh_CN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/po/es.po new/gupnp-tools-0.8.8/po/es.po --- old/gupnp-tools-0.8.7/po/es.po 2013-04-01 12:51:55.000000000 +0200 +++ new/gupnp-tools-0.8.8/po/es.po 2013-11-11 20:50:03.000000000 +0100 @@ -8,15 +8,15 @@ "Project-Id-Version: gupnp-tools master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp-"; "tools&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-20 11:32+0000\n" -"PO-Revision-Date: 2013-03-28 17:33+0100\n" +"POT-Creation-Date: 2013-10-20 11:17+0000\n" +"PO-Revision-Date: 2013-10-22 14:35+0200\n" "Last-Translator: Daniel Mustieles <daniel.mustie...@gmail.com>\n" -"Language-Team: Español; Castellano <gnome-es-l...@gnome.org>\n" +"Language-Team: Español <gnome-es-l...@gnome.org>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Gtranslator 2.91.5\n" #: ../data/gupnp-av-cp.desktop.in.in.h:1 @@ -244,21 +244,29 @@ msgid "Event _log" msgstr "Registro de _eventos" -#: ../src/av-cp/main.c:44 +#: ../src/av-cp/main.c:47 ../src/network-light/main.c:46 +#: ../src/universal-cp/main.c:41 msgid "Network PORT to use for UPnP" msgstr "PUERTO de red que usar para UPnP" -#: ../src/av-cp/main.c:183 -#| msgid "UPnP AV Control Point" +#: ../src/av-cp/main.c:48 ../src/network-light/main.c:47 +#: ../src/universal-cp/main.c:42 +#| msgid "Network PORT to use for UPnP" +msgid "Network interfaces to use for UPnP communication" +msgstr "Interfaces de red que usar para comunicación UPnP" + +#: ../src/av-cp/main.c:196 ../src/network-light/main.c:100 +#: ../src/universal-cp/main.c:145 msgid "- UPnP AV control point" msgstr "- Punto de control AV de UPnP" -#: ../src/av-cp/main.c:188 +#: ../src/av-cp/main.c:201 ../src/network-light/main.c:105 +#: ../src/universal-cp/main.c:150 #, c-format msgid "Could not parse options: %s\n" msgstr "No se pudieron analizar las opciones: %s\n" -#: ../src/universal-cp/action-dialog.c:714 +#: ../src/universal-cp/action-dialog.c:709 #, c-format msgid "" "Action failed.\n" @@ -423,19 +431,19 @@ msgid "Author" msgstr "Autor" -#: ../src/universal-cp/device-treeview.c:459 +#: ../src/universal-cp/device-treeview.c:460 msgid "State variables" msgstr "Variables de estado" -#: ../src/universal-cp/device-treeview.c:499 +#: ../src/universal-cp/device-treeview.c:501 msgid "Information not available" msgstr "Información no disponible" -#: ../src/universal-cp/device-treeview.c:676 +#: ../src/universal-cp/device-treeview.c:679 msgid "UPnP Network" msgstr "Red UPnP" -#: ../src/universal-cp/device-treeview.c:689 +#: ../src/universal-cp/device-treeview.c:692 #: ../src/universal-cp/event-treeview.c:373 msgid "Device" msgstr "Dispositivo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/po/pl.po new/gupnp-tools-0.8.8/po/pl.po --- old/gupnp-tools-0.8.7/po/pl.po 2013-04-01 12:51:55.000000000 +0200 +++ new/gupnp-tools-0.8.8/po/pl.po 2013-11-11 20:50:03.000000000 +0100 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: gupnp-tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-20 19:03+0100\n" -"PO-Revision-Date: 2013-03-20 19:04+0100\n" +"POT-Creation-Date: 2013-10-20 15:11+0200\n" +"PO-Revision-Date: 2013-10-20 15:12+0200\n" "Last-Translator: Piotr Drąg <piotrd...@gmail.com>\n" "Language-Team: Polish <gnom...@aviary.pl>\n" "Language: pl\n" @@ -250,20 +250,28 @@ msgid "Event _log" msgstr "_Dziennik zdarzeń" -#: ../src/av-cp/main.c:44 +#: ../src/av-cp/main.c:47 ../src/network-light/main.c:46 +#: ../src/universal-cp/main.c:41 msgid "Network PORT to use for UPnP" msgstr "PORT sieciowy używany dla UPnP" -#: ../src/av-cp/main.c:183 +#: ../src/av-cp/main.c:48 ../src/network-light/main.c:47 +#: ../src/universal-cp/main.c:42 +msgid "Network interfaces to use for UPnP communication" +msgstr "Interfejsy sieciowe używane do komunikacji UPnP" + +#: ../src/av-cp/main.c:196 ../src/network-light/main.c:100 +#: ../src/universal-cp/main.c:145 msgid "- UPnP AV control point" msgstr "- punkt kontrolny UPnP AV" -#: ../src/av-cp/main.c:188 +#: ../src/av-cp/main.c:201 ../src/network-light/main.c:105 +#: ../src/universal-cp/main.c:150 #, c-format msgid "Could not parse options: %s\n" msgstr "Nie można przetworzyć opcji: %s\n" -#: ../src/universal-cp/action-dialog.c:714 +#: ../src/universal-cp/action-dialog.c:709 #, c-format msgid "" "Action failed.\n" @@ -428,19 +436,19 @@ msgid "Author" msgstr "Autor" -#: ../src/universal-cp/device-treeview.c:459 +#: ../src/universal-cp/device-treeview.c:460 msgid "State variables" msgstr "Zmienne stanu" -#: ../src/universal-cp/device-treeview.c:499 +#: ../src/universal-cp/device-treeview.c:501 msgid "Information not available" msgstr "Informacja jest niedostępna" -#: ../src/universal-cp/device-treeview.c:676 +#: ../src/universal-cp/device-treeview.c:679 msgid "UPnP Network" msgstr "Sieć UPnP" -#: ../src/universal-cp/device-treeview.c:689 +#: ../src/universal-cp/device-treeview.c:692 #: ../src/universal-cp/event-treeview.c:373 msgid "Device" msgstr "Urządzenie" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/po/pt_BR.po new/gupnp-tools-0.8.8/po/pt_BR.po --- old/gupnp-tools-0.8.7/po/pt_BR.po 2013-06-11 12:30:48.000000000 +0200 +++ new/gupnp-tools-0.8.8/po/pt_BR.po 2013-11-11 20:50:03.000000000 +0100 @@ -8,16 +8,16 @@ "Project-Id-Version: gupnp-tools master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp-"; "tools&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-04-01 13:17+0000\n" -"PO-Revision-Date: 2013-03-20 20:59-0300\n" -"Last-Translator: Rafael Ferreira <rafael.f...@gmail.com>\n" +"POT-Creation-Date: 2013-10-20 16:24+0000\n" +"PO-Revision-Date: 2013-10-21 13:04-0300\n" +"Last-Translator: Enrico Nicoletto <live...@gmail.com>\n" "Language-Team: Brazilian Portuguese <gnome-pt_br-l...@gnome.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.5.7\n" # GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP. #: ../data/gupnp-av-cp.desktop.in.in.h:1 @@ -246,16 +246,24 @@ msgid "Event _log" msgstr "Re_gistro do evento" -#: ../src/av-cp/main.c:44 +#: ../src/av-cp/main.c:47 ../src/network-light/main.c:46 +#: ../src/universal-cp/main.c:41 msgid "Network PORT to use for UPnP" msgstr "PORTA de rede a ser usada para UPnp" +#: ../src/av-cp/main.c:48 ../src/network-light/main.c:47 +#: ../src/universal-cp/main.c:42 +msgid "Network interfaces to use for UPnP communication" +msgstr "Interfaces de rede a serem usadas para comunicação UPnP" + # GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP. -#: ../src/av-cp/main.c:183 +#: ../src/av-cp/main.c:196 ../src/network-light/main.c:100 +#: ../src/universal-cp/main.c:145 msgid "- UPnP AV control point" msgstr "- Ponto de controle áudio/vídeo (AV) UPnP" -#: ../src/av-cp/main.c:188 +#: ../src/av-cp/main.c:201 ../src/network-light/main.c:105 +#: ../src/universal-cp/main.c:150 #, c-format msgid "Could not parse options: %s\n" msgstr "Não foi possível analisar as opções: %s\n" @@ -425,19 +433,19 @@ msgid "Author" msgstr "Autor" -#: ../src/universal-cp/device-treeview.c:459 +#: ../src/universal-cp/device-treeview.c:460 msgid "State variables" msgstr "Variáveis de estado" -#: ../src/universal-cp/device-treeview.c:499 +#: ../src/universal-cp/device-treeview.c:501 msgid "Information not available" msgstr "Informação não disponível" -#: ../src/universal-cp/device-treeview.c:676 +#: ../src/universal-cp/device-treeview.c:679 msgid "UPnP Network" msgstr "Rede UPnP" -#: ../src/universal-cp/device-treeview.c:689 +#: ../src/universal-cp/device-treeview.c:692 #: ../src/universal-cp/event-treeview.c:373 msgid "Device" msgstr "Dispositivo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/po/sl.po new/gupnp-tools-0.8.8/po/sl.po --- old/gupnp-tools-0.8.7/po/sl.po 2013-04-01 12:51:55.000000000 +0200 +++ new/gupnp-tools-0.8.8/po/sl.po 2013-11-11 20:50:03.000000000 +0100 @@ -7,27 +7,26 @@ msgid "" msgstr "" "Project-Id-Version: gupnp-tools master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp-tools&keywords=I18N+L10N&component=general\n"; -"POT-Creation-Date: 2013-03-20 11:32+0000\n" -"PO-Revision-Date: 2013-03-22 09:50+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp-"; +"tools&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-10-20 13:12+0000\n" +"PO-Revision-Date: 2013-10-20 18:24+0100\n" "Last-Translator: Matej Urbančič <mat...@svn.gnome.org>\n" "Language-Team: Slovenian <gnome...@googlegroups.com>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" "X-Generator: Poedit 1.5.4\n" -"X-Poedit-Language: Slovenian\n" -"X-Poedit-Country: SLOVENIA\n" "X-Poedit-SourceCharset: utf-8\n" #: ../data/gupnp-av-cp.desktop.in.in.h:1 msgid "UPnP AV Control Point" msgstr "Nadzorna točka UPnP AV" -#: ../data/gupnp-av-cp.ui.in.h:1 -#: ../data/gupnp-network-light.ui.h:1 +#: ../data/gupnp-av-cp.ui.in.h:1 ../data/gupnp-network-light.ui.h:1 #: ../data/gupnp-universal-cp.ui.h:1 msgid "Copyright (C) 2007 Zeeshan Ali (Khattak)" msgstr "Avtorske pravice (C) 2007 Zeeshan Ali (Khattak)" @@ -40,15 +39,13 @@ "Nadzorna točka UPnP AV, ki temelji na ogrodju GUPnP.\n" "Navdihnjeno z orodji Intel Tools za UPnP." -#: ../data/gupnp-av-cp.ui.in.h:4 -#: ../data/gupnp-network-light.ui.h:4 +#: ../data/gupnp-av-cp.ui.in.h:4 ../data/gupnp-network-light.ui.h:4 #: ../data/gupnp-universal-cp.ui.h:4 msgid "GUPnP homepage" msgstr "Spletna stran programa GUPnP" #. TRANSLATORS: Replace this string with your names, one name per line. -#: ../data/gupnp-av-cp.ui.in.h:6 -#: ../data/gupnp-network-light.ui.h:6 +#: ../data/gupnp-av-cp.ui.in.h:6 ../data/gupnp-network-light.ui.h:6 #: ../data/gupnp-universal-cp.ui.h:6 msgid "translator-credits" msgstr "Matej Urbančič" @@ -61,8 +58,7 @@ msgid "GUPnP AV Control Point" msgstr "Nadzorna točka GUPnP AV" -#: ../data/gupnp-av-cp.ui.in.h:9 -#: ../data/gupnp-universal-cp.ui.h:24 +#: ../data/gupnp-av-cp.ui.in.h:9 ../data/gupnp-universal-cp.ui.h:24 msgid "_File" msgstr "_Datoteka" @@ -74,8 +70,7 @@ msgid "_Lenient Mode" msgstr "_Strogi način" -#: ../data/gupnp-av-cp.ui.in.h:12 -#: ../data/gupnp-universal-cp.ui.h:27 +#: ../data/gupnp-av-cp.ui.in.h:12 ../data/gupnp-universal-cp.ui.h:27 msgid "_Help" msgstr "Pomo_č" @@ -84,8 +79,12 @@ msgstr "_Izrisovalnik:" #: ../data/gupnp-av-cp.ui.in.h:14 -msgid "Clears the CP's idea of the state of the currently selected AV Renderer. Useful for dealing with AV Renderers that don't report state changes." -msgstr "Počisti zamisel stanja CP trenutno izbranega izrisovalnika AV. Uporabno za delo z izrisovalniki AV, ki ne poročajo o spremembi stanj." +msgid "" +"Clears the CP's idea of the state of the currently selected AV Renderer. " +"Useful for dealing with AV Renderers that don't report state changes." +msgstr "" +"Počisti zamisel stanja CP trenutno izbranega izrisovalnika AV. Uporabno za " +"delo z izrisovalniki AV, ki ne poročajo o spremembi stanj." #: ../data/gupnp-av-cp.ui.in.h:15 msgid "_Clear state" @@ -235,8 +234,7 @@ msgstr "_Počisti dnevnik dogodkov" #. default details -#: ../data/gupnp-universal-cp.ui.h:23 -#: ../src/universal-cp/device-treeview.c:35 +#: ../data/gupnp-universal-cp.ui.h:23 ../src/universal-cp/device-treeview.c:35 msgid "GUPnP Universal Control Point" msgstr "Univerzalna nadzorna točka GUPnP" @@ -248,21 +246,28 @@ msgid "Event _log" msgstr "Dn_evnik dogodkov" -#: ../src/av-cp/main.c:44 +#: ../src/av-cp/main.c:47 ../src/network-light/main.c:46 +#: ../src/universal-cp/main.c:41 msgid "Network PORT to use for UPnP" msgstr "Omrežna VRATA, ki se uporabljajo za UPnP" -#: ../src/av-cp/main.c:183 -#| msgid "UPnP AV Control Point" +#: ../src/av-cp/main.c:48 ../src/network-light/main.c:47 +#: ../src/universal-cp/main.c:42 +msgid "Network interfaces to use for UPnP communication" +msgstr "Omrežni vmesniki, ki se uporabljajo za UPnP" + +#: ../src/av-cp/main.c:196 ../src/network-light/main.c:100 +#: ../src/universal-cp/main.c:145 msgid "- UPnP AV control point" msgstr "- nadzorna točka UPnP AV" -#: ../src/av-cp/main.c:188 +#: ../src/av-cp/main.c:201 ../src/network-light/main.c:105 +#: ../src/universal-cp/main.c:150 #, c-format msgid "Could not parse options: %s\n" msgstr "Možnosti ni mogoče razčleniti: %s\n" -#: ../src/universal-cp/action-dialog.c:714 +#: ../src/universal-cp/action-dialog.c:709 #, c-format msgid "" "Action failed.\n" @@ -427,19 +432,19 @@ msgid "Author" msgstr "Avtor" -#: ../src/universal-cp/device-treeview.c:459 +#: ../src/universal-cp/device-treeview.c:460 msgid "State variables" msgstr "Spremenljivke stanja" -#: ../src/universal-cp/device-treeview.c:499 +#: ../src/universal-cp/device-treeview.c:501 msgid "Information not available" msgstr "Podrobnosti niso na voljo" -#: ../src/universal-cp/device-treeview.c:676 +#: ../src/universal-cp/device-treeview.c:679 msgid "UPnP Network" msgstr "Omrežje UPnP" -#: ../src/universal-cp/device-treeview.c:689 +#: ../src/universal-cp/device-treeview.c:692 #: ../src/universal-cp/event-treeview.c:373 msgid "Device" msgstr "Naprava" @@ -455,4 +460,3 @@ #: ../src/universal-cp/event-treeview.c:375 msgid "State Variable" msgstr "Spremenljivka stanja" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/po/zh_CN.po new/gupnp-tools-0.8.8/po/zh_CN.po --- old/gupnp-tools-0.8.7/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gupnp-tools-0.8.8/po/zh_CN.po 2013-11-11 20:50:03.000000000 +0100 @@ -0,0 +1,464 @@ +# Chinese (China) translation for gupnp-tools. +# Copyright (C) 2013 gupnp-tools's COPYRIGHT HOLDER +# This file is distributed under the same license as the gupnp-tools package. +# tuhaihe <113232173...@gmail.com>, 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: gupnp-tools master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp-"; +"tools&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-10-30 19:09+0000\n" +"PO-Revision-Date: 2013-02-22 13:49+0800\n" +"Last-Translator: tuhaihe <113232173...@gmail.com>\n" +"Language-Team: Chinese (China) <i18n...@googlegroups.com>\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" + +#: ../data/gupnp-av-cp.desktop.in.in.h:1 +msgid "UPnP AV Control Point" +msgstr "UPnP AV 控制点" + +#: ../data/gupnp-av-cp.ui.in.h:1 ../data/gupnp-network-light.ui.h:1 +#: ../data/gupnp-universal-cp.ui.h:1 +msgid "Copyright (C) 2007 Zeeshan Ali (Khattak)" +msgstr "版权 (C) 2007 Zeeshan Ali (Khattak)" + +#: ../data/gupnp-av-cp.ui.in.h:2 +#| msgid "" +#| "A UPNP AV Control Point based on GUPnP framework.\n" +#| "Inspired by Intel Tools for UPnP." +msgid "" +"An UPnP AV Control Point based on GUPnP framework.\n" +"Inspired by Intel Tools for UPnP." +msgstr "" +"一个基于 GUPnP 架构的 UPNP AV 控制点。\n" +"灵感源于英特尔的 UPnP 工具。" + +#: ../data/gupnp-av-cp.ui.in.h:4 ../data/gupnp-network-light.ui.h:4 +#: ../data/gupnp-universal-cp.ui.h:4 +msgid "GUPnP homepage" +msgstr "GUPnP 主页" + +#. TRANSLATORS: Replace this string with your names, one name per line. +#: ../data/gupnp-av-cp.ui.in.h:6 ../data/gupnp-network-light.ui.h:6 +#: ../data/gupnp-universal-cp.ui.h:6 +msgid "translator-credits" +msgstr "tuhaihe <113232173...@gmail.com>, 2013" + +#: ../data/gupnp-av-cp.ui.in.h:7 +msgid "GUPnP AV CP - Metadata View" +msgstr "GUPnP AV CP - 元数据视图" + +#: ../data/gupnp-av-cp.ui.in.h:8 +msgid "GUPnP AV Control Point" +msgstr "GUPnP AV 控制点" + +#: ../data/gupnp-av-cp.ui.in.h:9 ../data/gupnp-universal-cp.ui.h:24 +msgid "_File" +msgstr "文件(_F)" + +#: ../data/gupnp-av-cp.ui.in.h:10 +msgid "_Tools" +msgstr "工具(_T)" + +#: ../data/gupnp-av-cp.ui.in.h:11 +msgid "_Lenient Mode" +msgstr "" + +#: ../data/gupnp-av-cp.ui.in.h:12 ../data/gupnp-universal-cp.ui.h:27 +msgid "_Help" +msgstr "帮助(_H)" + +#: ../data/gupnp-av-cp.ui.in.h:13 +msgid "_Renderer: " +msgstr "渲染器(_R)：" + +#: ../data/gupnp-av-cp.ui.in.h:14 +msgid "" +"Clears the CP's idea of the state of the currently selected AV Renderer. " +"Useful for dealing with AV Renderers that don't report state changes." +msgstr "" + +#: ../data/gupnp-av-cp.ui.in.h:15 +msgid "_Clear state" +msgstr "清理状态(_C)" + +#: ../data/gupnp-av-cp.ui.in.h:16 +msgid "_Play" +msgstr "播放(_P)" + +#: ../data/gupnp-av-cp.ui.in.h:17 +msgid "P_ause" +msgstr "暂停(_A)" + +#: ../data/gupnp-av-cp.ui.in.h:18 +msgid "_Stop" +msgstr "停止(_S)" + +#: ../data/gupnp-av-cp.ui.in.h:19 +msgid "Pre_vious" +msgstr "上一个(_V)" + +#: ../data/gupnp-av-cp.ui.in.h:20 +msgid "_Next" +msgstr "下一个(_N)" + +#: ../data/gupnp-av-cp.ui.in.h:21 +msgid "Rescan" +msgstr "重新扫描" + +#: ../data/gupnp-av-cp.ui.in.h:22 +msgid "Fetch the DIDL-Lite XML for this media object" +msgstr "获取该媒体对象的 DIDL-Lite XML" + +#: ../data/gupnp-av-cp.ui.in.h:23 +msgid "Fetch _DIDL-Lite" +msgstr "获取 _DIDL-Lite" + +#: ../data/gupnp-network-light.desktop.in.in.h:1 +msgid "UPnP Network Light" +msgstr "UPnP 网络指示灯" + +#: ../data/gupnp-network-light.ui.h:2 +msgid "" +"A virtual network light bulb based on GUPnP framework.\n" +"Inspired by Intel Tools for UPnP." +msgstr "" +"一个基于 GUPnP 框架的虚拟网络指示灯。\n" +"灵感源于英特尔 UPnP 工具。" + +#: ../data/gupnp-network-light.ui.h:7 +msgid "GUPnP Network Light" +msgstr "GUPnP 网络指示灯" + +#: ../data/gupnp-network-light.ui.h:8 +msgctxt "network-light" +msgid "_On" +msgstr "开(_O)" + +#: ../data/gupnp-network-light.ui.h:10 +#, no-c-format +msgid "_Increase luminance by 20%" +msgstr "亮度增加 20%(_I)" + +#: ../data/gupnp-network-light.ui.h:12 +#, no-c-format +msgid "_Decrease luminance by 20%" +msgstr "亮度降低 20%(_D)" + +#: ../data/gupnp-network-light.ui.h:13 +msgid "_About" +msgstr "关于(_A)" + +#: ../data/gupnp-universal-cp.desktop.in.in.h:1 +msgid "UPnP Universal Control Point" +msgstr "UPnP 通用控制点" + +#: ../data/gupnp-universal-cp.ui.h:2 +msgid "" +"A Generic Control Point based on GUPnP framework.\n" +"Inspired by Intel Tools for UPnP." +msgstr "" +"一个基于 GUPnP 架构的常规控制点。\n" +"灵感源于英特尔的 UPnP 工具。" + +#: ../data/gupnp-universal-cp.ui.h:7 +msgid "Action Invocation" +msgstr "动作调用" + +#: ../data/gupnp-universal-cp.ui.h:8 +msgid "action" +msgstr "动作" + +#: ../data/gupnp-universal-cp.ui.h:9 +msgid "service" +msgstr "服务" + +#: ../data/gupnp-universal-cp.ui.h:10 +msgid "device" +msgstr "设备" + +#: ../data/gupnp-universal-cp.ui.h:11 +msgid "_Invoke" +msgstr "调用(_I)" + +#: ../data/gupnp-universal-cp.ui.h:12 +msgid "<b>'in' arguments</b>" +msgstr "<b>'in' 参数</b>" + +#: ../data/gupnp-universal-cp.ui.h:13 +msgid "<b>'out' arguments</b>" +msgstr "<b>'out' 参数</b>" + +#: ../data/gupnp-universal-cp.ui.h:14 +msgid "Copy value" +msgstr "复制值" + +#: ../data/gupnp-universal-cp.ui.h:15 +msgid "Copy all details" +msgstr "复制全部详情" + +#: ../data/gupnp-universal-cp.ui.h:16 +msgid "Invoke" +msgstr "调用" + +#: ../data/gupnp-universal-cp.ui.h:17 +msgid "Subscribe to events" +msgstr "订阅事件" + +#: ../data/gupnp-universal-cp.ui.h:18 +msgid "_Expand all devices" +msgstr "展开全部设备(_E)" + +#: ../data/gupnp-universal-cp.ui.h:19 +msgid "_Collapse all devices" +msgstr "折叠全部设备(_C)" + +#: ../data/gupnp-universal-cp.ui.h:20 +msgid "Copy event" +msgstr "复制事件" + +#: ../data/gupnp-universal-cp.ui.h:21 +msgid "Copy all events" +msgstr "复制全部事件" + +#: ../data/gupnp-universal-cp.ui.h:22 +msgid "_Clear event log" +msgstr "清除事件日志(_C)" + +#. default details +#: ../data/gupnp-universal-cp.ui.h:23 ../src/universal-cp/device-treeview.c:35 +msgid "GUPnP Universal Control Point" +msgstr "GUPnP 通用控制点" + +#: ../data/gupnp-universal-cp.ui.h:25 +msgid "_View" +msgstr "查看(_V)" + +#: ../data/gupnp-universal-cp.ui.h:26 +msgid "Event _log" +msgstr "事件日志(_L)" + +#: ../src/av-cp/main.c:47 ../src/network-light/main.c:46 +#: ../src/universal-cp/main.c:41 +msgid "Network PORT to use for UPnP" +msgstr "用于 UPnP 的网络端口" + +#: ../src/av-cp/main.c:48 ../src/network-light/main.c:47 +#: ../src/universal-cp/main.c:42 +msgid "Network interfaces to use for UPnP communication" +msgstr "用于 UPnP 通讯的网络接口" + +#: ../src/av-cp/main.c:196 ../src/network-light/main.c:100 +#: ../src/universal-cp/main.c:145 +#| msgid "UPnP AV Control Point" +msgid "- UPnP AV control point" +msgstr "- UPnP AV 控制点" + +#: ../src/av-cp/main.c:201 ../src/network-light/main.c:105 +#: ../src/universal-cp/main.c:150 +#, c-format +msgid "Could not parse options: %s\n" +msgstr "无法解析选项：%s\n" + +#: ../src/universal-cp/action-dialog.c:710 +#, c-format +msgid "" +"Action failed.\n" +"\n" +"Error %d: %s" +msgstr "" +"动作失败。\n" +"\n" +"错误 %d: %s" + +#: ../src/universal-cp/details-treeview.c:180 +#: ../src/universal-cp/details-treeview.c:208 +#: ../src/universal-cp/details-treeview.c:234 +#: ../src/universal-cp/details-treeview.c:413 +msgid "Name" +msgstr "名称" + +#: ../src/universal-cp/details-treeview.c:182 +msgid "Direction" +msgstr "方向" + +#: ../src/universal-cp/details-treeview.c:187 +msgid "Related State Variable" +msgstr "相关的状态变量" + +#: ../src/universal-cp/details-treeview.c:189 +msgid "Is Return Value" +msgstr "是返回值" + +#: ../src/universal-cp/details-treeview.c:190 +#: ../src/universal-cp/details-treeview.c:237 +msgid "Yes" +msgstr "是" + +#: ../src/universal-cp/details-treeview.c:190 +#: ../src/universal-cp/details-treeview.c:237 +msgid "No" +msgstr "否" + +#: ../src/universal-cp/details-treeview.c:210 +msgid "Number of Arguments" +msgstr "参数个数" + +#: ../src/universal-cp/details-treeview.c:236 +msgid "Send Events" +msgstr "发送事件" + +#: ../src/universal-cp/details-treeview.c:238 +msgid "GType" +msgstr "GType" + +#: ../src/universal-cp/details-treeview.c:241 +msgid "Default Value" +msgstr "默认值" + +#: ../src/universal-cp/details-treeview.c:247 +msgid "Minimum" +msgstr "最小值" + +#: ../src/universal-cp/details-treeview.c:251 +msgid "Maximum" +msgstr "最大值" + +#: ../src/universal-cp/details-treeview.c:255 +msgid "Step" +msgstr "步长" + +#: ../src/universal-cp/details-treeview.c:275 +msgid "Allowed Values" +msgstr "允许的值" + +#: ../src/universal-cp/details-treeview.c:299 +#: ../src/universal-cp/details-treeview.c:346 +msgid "Location" +msgstr "位置" + +#: ../src/universal-cp/details-treeview.c:304 +#: ../src/universal-cp/details-treeview.c:351 +msgid "UDN" +msgstr "UDN" + +#: ../src/universal-cp/details-treeview.c:309 +#: ../src/universal-cp/details-treeview.c:356 +msgid "Type" +msgstr "类型" + +#: ../src/universal-cp/details-treeview.c:314 +#: ../src/universal-cp/details-treeview.c:361 +msgid "Base URL" +msgstr "基 URL" + +#: ../src/universal-cp/details-treeview.c:319 +msgid "Service ID" +msgstr "服务 ID" + +#: ../src/universal-cp/details-treeview.c:321 +msgid "Service URL" +msgstr "服务 URL" + +#: ../src/universal-cp/details-treeview.c:323 +msgid "Control URL" +msgstr "控制 URL" + +#: ../src/universal-cp/details-treeview.c:325 +msgid "Event Subscription URL" +msgstr "事件订阅 URL" + +#: ../src/universal-cp/details-treeview.c:366 +msgid "Friendly Name" +msgstr "好记的名称" + +#: ../src/universal-cp/details-treeview.c:368 +msgid "Manufacturer" +msgstr "制造商" + +#: ../src/universal-cp/details-treeview.c:370 +msgid "Manufacturer URL" +msgstr "制造商 URL" + +#: ../src/universal-cp/details-treeview.c:372 +msgid "Model Description" +msgstr "型号描述" + +#: ../src/universal-cp/details-treeview.c:374 +msgid "Model Name" +msgstr "型号名称" + +#: ../src/universal-cp/details-treeview.c:376 +msgid "Model Number" +msgstr "型号数值" + +#: ../src/universal-cp/details-treeview.c:378 +msgid "Model URL" +msgstr "型号 URL" + +#: ../src/universal-cp/details-treeview.c:380 +msgid "Serial Number" +msgstr "序列号" + +#: ../src/universal-cp/details-treeview.c:382 +msgid "UPC" +msgstr "UPC" + +#: ../src/universal-cp/details-treeview.c:384 +#, fuzzy +msgid "Presentation URL" +msgstr "演示 URL" + +#: ../src/universal-cp/details-treeview.c:414 +#: ../src/universal-cp/event-treeview.c:376 +msgid "Value" +msgstr "值" + +#: ../src/universal-cp/device-treeview.c:52 +msgid "Software" +msgstr "软件" + +#: ../src/universal-cp/device-treeview.c:54 +msgid "Version" +msgstr "版本" + +#: ../src/universal-cp/device-treeview.c:56 +msgid "Author" +msgstr "作者" + +#: ../src/universal-cp/device-treeview.c:460 +msgid "State variables" +msgstr "状态变量" + +#: ../src/universal-cp/device-treeview.c:501 +msgid "Information not available" +msgstr "信息不可用" + +#: ../src/universal-cp/device-treeview.c:679 +msgid "UPnP Network" +msgstr "UPnP 网络" + +#: ../src/universal-cp/device-treeview.c:692 +#: ../src/universal-cp/event-treeview.c:373 +msgid "Device" +msgstr "设备" + +#: ../src/universal-cp/event-treeview.c:372 +msgid "Time" +msgstr "时间" + +#: ../src/universal-cp/event-treeview.c:374 +msgid "Service" +msgstr "服务" + +#: ../src/universal-cp/event-treeview.c:375 +msgid "State Variable" +msgstr "状态变量" + +#~ msgid "GPL" +#~ msgstr "GPL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/src/av-cp/main.c new/gupnp-tools-0.8.8/src/av-cp/main.c --- old/gupnp-tools-0.8.7/src/av-cp/main.c 2013-05-01 15:34:00.000000000 +0200 +++ new/gupnp-tools-0.8.8/src/av-cp/main.c 2013-10-20 12:57:39.000000000 +0200 @@ -1,7 +1,9 @@ /* * Copyright (C) 2007 Zeeshan Ali (Khattak) <zeesha...@gnome.org> + * Copyright (C) 2013 Jens Georg <m...@jensge.org> * * Authors: Zeeshan Ali (Khattak) <zeesha...@gnome.org> + * Jens Georg <m...@jensge.org> * * 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 @@ -38,10 +40,12 @@ #define MEDIA_SERVER "urn:schemas-upnp-org:device:MediaServer:1" static int upnp_port = 0; +static char **interfaces = NULL; static GOptionEntry entries[] = { { "port", 'p', 0, G_OPTION_ARG_INT, &upnp_port, N_("Network PORT to use for UPnP"), "PORT" }, + { "interface", 'i', 0, G_OPTION_ARG_STRING_ARRAY, &interfaces, N_("Network interfaces to use for UPnP communication"), "INTERFACE" }, { NULL } }; @@ -137,6 +141,8 @@ static gboolean init_upnp (int port) { + GUPnPWhiteList *white_list; + #if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init (); #endif @@ -144,6 +150,13 @@ context_manager = gupnp_context_manager_create (port); g_assert (context_manager != NULL); + if (interfaces != NULL) { + white_list = gupnp_context_manager_get_white_list + (context_manager); + gupnp_white_list_add_entryv (white_list, interfaces); + gupnp_white_list_set_enabled (white_list, TRUE); + } + g_signal_connect (context_manager, "context-available", G_CALLBACK (on_context_available), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/src/network-light/main.c new/gupnp-tools-0.8.8/src/network-light/main.c --- old/gupnp-tools-0.8.7/src/network-light/main.c 2013-03-20 12:07:38.000000000 +0100 +++ new/gupnp-tools-0.8.8/src/network-light/main.c 2013-10-20 13:15:48.000000000 +0200 @@ -1,9 +1,11 @@ /* * Copyright (C) 2007 Zeeshan Ali. * Copyright (C) 2007 OpenedHand Ltd. + * Copyright (C) 2013 Jens Georg <m...@jensge.org> * - * Author: Zeeshan Ali (Khattak) <zeesha...@gnome.org> - * Author: Jorn Baayen <j...@openedhand.com> + * Authors: Zeeshan Ali (Khattak) <zeesha...@gnome.org> + * Jorn Baayen <j...@openedhand.com> + * Jens Georg <m...@jensge.org> * * 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 @@ -36,6 +38,16 @@ static gboolean light_status; static gint light_load_level; +static int upnp_port = 0; +static char **interfaces = NULL; + +static GOptionEntry entries[] = +{ + { "port", 'p', 0, G_OPTION_ARG_INT, &upnp_port, N_("Network PORT to use for UPnP"), "PORT" }, + { "interface", 'i', 0, G_OPTION_ARG_STRING_ARRAY, &interfaces, N_("Network interfaces to use for UPnP communication"), "INTERFACE" }, + { NULL } +}; + void set_status (gboolean status) { @@ -73,6 +85,9 @@ int main (int argc, char **argv) { + GError *error = NULL; + GOptionContext *context = NULL; + /* Light is off in the beginning */ light_status = FALSE; light_load_level = 100; @@ -82,11 +97,21 @@ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); + context = g_option_context_new (_("- UPnP AV control point")); + g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + + if (!g_option_context_parse (context, &argc, &argv, &error)) { + g_print (_("Could not parse options: %s\n"), error->message); + + return -4; + } + if (!init_ui (&argc, &argv)) { return -1; } - if (!init_upnp ()) { + if (!init_upnp (interfaces, upnp_port)) { return -2; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/src/network-light/upnp.c new/gupnp-tools-0.8.8/src/network-light/upnp.c --- old/gupnp-tools-0.8.7/src/network-light/upnp.c 2012-03-26 19:10:30.000000000 +0200 +++ new/gupnp-tools-0.8.8/src/network-light/upnp.c 2013-10-20 13:15:48.000000000 +0200 @@ -669,9 +669,10 @@ } gboolean -init_upnp (void) +init_upnp (gchar **interfaces, guint port) { GError *error = NULL; + GUPnPWhiteList *white_list; switch_proxies = NULL; dimming_proxies = NULL; @@ -685,9 +686,16 @@ return FALSE; } - context_manager = gupnp_context_manager_new (NULL, 0); + context_manager = gupnp_context_manager_new (NULL, port); g_assert (context_manager != NULL); + if (interfaces != NULL) { + white_list = gupnp_context_manager_get_white_list + (context_manager); + gupnp_white_list_add_entryv (white_list, interfaces); + gupnp_white_list_set_enabled (white_list, TRUE); + } + g_signal_connect (context_manager, "context-available", G_CALLBACK (on_context_available), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/src/network-light/upnp.h new/gupnp-tools-0.8.8/src/network-light/upnp.h --- old/gupnp-tools-0.8.7/src/network-light/upnp.h 2012-03-26 19:10:30.000000000 +0200 +++ new/gupnp-tools-0.8.8/src/network-light/upnp.h 2013-10-20 13:15:48.000000000 +0200 @@ -30,7 +30,7 @@ notify_load_level_change (gint load_level); gboolean -init_upnp (void); +init_upnp (gchar **interfaces, guint port); void deinit_upnp (void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/src/universal-cp/action-dialog.c new/gupnp-tools-0.8.8/src/universal-cp/action-dialog.c --- old/gupnp-tools-0.8.7/src/universal-cp/action-dialog.c 2013-04-01 15:12:18.000000000 +0200 +++ new/gupnp-tools-0.8.8/src/universal-cp/action-dialog.c 2013-11-11 20:50:03.000000000 +0100 @@ -196,8 +196,9 @@ NULL, (const char *) node->data); - if (default_str != NULL && - strcmp (default_str, node->data) == 0) { + if (node == variable->allowed_values || + (default_str != NULL && + strcmp (default_str, node->data) == 0)) { gtk_combo_box_set_active ( GTK_COMBO_BOX (widget), index); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/src/universal-cp/device-treeview.c new/gupnp-tools-0.8.8/src/universal-cp/device-treeview.c --- old/gupnp-tools-0.8.7/src/universal-cp/device-treeview.c 2013-03-20 12:07:39.000000000 +0100 +++ new/gupnp-tools-0.8.8/src/universal-cp/device-treeview.c 2013-10-20 12:14:37.000000000 +0200 @@ -445,6 +445,7 @@ static void append_state_variables (GUPnPServiceProxy *proxy, + GUPnPServiceIntrospection *introspection, const GList *variables, GtkTreeStore *store, GtkTreeIter *service_iter) @@ -471,6 +472,7 @@ 0, get_icon_by_id (ICON_VARIABLE), 1, info->name, 2, proxy, + 3, introspection, 4, info, 5, ICON_VARIABLE, -1); @@ -507,6 +509,7 @@ introspection); if (list) append_state_variables (proxy, + introspection, list, store, service_iter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8.7/src/universal-cp/main.c new/gupnp-tools-0.8.8/src/universal-cp/main.c --- old/gupnp-tools-0.8.7/src/universal-cp/main.c 2013-03-20 12:07:39.000000000 +0100 +++ new/gupnp-tools-0.8.8/src/universal-cp/main.c 2013-10-20 13:15:48.000000000 +0200 @@ -1,7 +1,9 @@ /* * Copyright (C) 2007 Zeeshan Ali (Khattak) <zeesha...@gnome.org> + * Copyright (C) 2013 Jens Georg <m...@jensge.org> * * Authors: Zeeshan Ali (Khattak) <zeesha...@gnome.org> + * Jens Georg <m...@jensge.org> * * 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 @@ -31,6 +33,16 @@ #include <gmodule.h> #include <glib/gi18n.h> +static int upnp_port = 0; +static char **interfaces = NULL; + +static GOptionEntry entries[] = +{ + { "port", 'p', 0, G_OPTION_ARG_INT, &upnp_port, N_("Network PORT to use for UPnP"), "PORT" }, + { "interface", 'i', 0, G_OPTION_ARG_STRING_ARRAY, &interfaces, N_("Network interfaces to use for UPnP communication"), "INTERFACE" }, + { NULL } +}; + static GUPnPContextManager *context_manager; static void @@ -78,13 +90,22 @@ static gboolean init_upnp (void) { + GUPnPWhiteList *white_list; + #if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init (); #endif - context_manager = gupnp_context_manager_new (NULL, 0); + context_manager = gupnp_context_manager_new (NULL, upnp_port); g_assert (context_manager != NULL); + if (interfaces != NULL) { + white_list = gupnp_context_manager_get_white_list + (context_manager); + gupnp_white_list_add_entryv (white_list, interfaces); + gupnp_white_list_set_enabled (white_list, TRUE); + } + g_signal_connect (context_manager, "context-available", G_CALLBACK (on_context_available), @@ -113,11 +134,24 @@ main (gint argc, gchar *argv[]) { + GError *error = NULL; + GOptionContext *context = NULL; + setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); + context = g_option_context_new (_("- UPnP AV control point")); + g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + + if (!g_option_context_parse (context, &argc, &argv, &error)) { + g_print (_("Could not parse options: %s\n"), error->message); + + return -4; + } + if (!init_ui (&argc, &argv)) { return -2; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
