diff -Nru betaradio-1.5+bzr169/configure.ac betaradio-1.5+bzr171/configure.ac --- betaradio-1.5+bzr169/configure.ac 2014-06-30 07:40:27.000000000 +0000 +++ betaradio-1.5+bzr171/configure.ac 2014-07-02 07:33:36.000000000 +0000 @@ -24,6 +24,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package]) AC_SUBST(GETTEXT_PACKAGE) +PKG_CHECK_MODULES([X11], [x11 >= 1.6.2], [ + VALA_CFLAGS="$VALA_CFLAGS $X11_CFLAGS" + VALA_LIBS="$VALA_LIBS $X11_LIBS" + ], AC_MSG_ERROR([x11 >= 1.6.2 not found])) PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.10], [ VALA_CFLAGS="$VALA_CFLAGS $GTK_CFLAGS" VALA_LIBS="$VALA_LIBS $GTK_LIBS" @@ -44,7 +48,7 @@ VALA_CFLAGS="$VALA_CFLAGS $SOUP_CFLAGS" VALA_LIBS="$VALA_LIBS $SOUP_LIBS" ], AC_MSG_ERROR([libsoup-2.4 not found])) -VALA_FLAGS="--thread --pkg libsoup-2.4 --pkg json-glib-1.0 --pkg gstreamer-1.0 --pkg gtk+-3.0" +VALA_FLAGS="--thread --pkg libsoup-2.4 --pkg json-glib-1.0 --pkg gstreamer-1.0 --pkg gtk+-3.0 --pkg x11" AC_SUBST(VALA_CFLAGS) AC_SUBST(VALA_FLAGS) diff -Nru betaradio-1.5+bzr169/debian/bzr-builder.manifest betaradio-1.5+bzr171/debian/bzr-builder.manifest --- betaradio-1.5+bzr169/debian/bzr-builder.manifest 2014-06-30 07:40:29.000000000 +0000 +++ betaradio-1.5+bzr171/debian/bzr-builder.manifest 2014-07-02 07:33:37.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}+bzr169-0ubuntu0~201406300740 -lp:betaradio revid:git-v1:717daafcb9a2032d87aca44e11d6722bbf418f54 +# bzr-builder format 0.3 deb-version {debupstream}+bzr171-0ubuntu0~201407020733 +lp:betaradio revid:git-v1:37ecad486158f36a9d361f90c10771895164d9f0 merge packaging lp:~fourdollars/betaradio/daily-packaging revid:sylee@canonical.com-20140627072926-p07d233vcg35r5y4 diff -Nru betaradio-1.5+bzr169/debian/changelog betaradio-1.5+bzr171/debian/changelog --- betaradio-1.5+bzr169/debian/changelog 2014-06-30 07:40:29.000000000 +0000 +++ betaradio-1.5+bzr171/debian/changelog 2014-07-02 07:33:37.000000000 +0000 @@ -1,8 +1,8 @@ -betaradio (1.5+bzr169-0ubuntu0~201406300740~ubuntu14.04.1) trusty; urgency=low +betaradio (1.5+bzr171-0ubuntu0~201407020733~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Shih-Yuan Lee Mon, 30 Jun 2014 07:40:29 +0000 + -- Shih-Yuan Lee Wed, 02 Jul 2014 07:33:37 +0000 betaradio (1.5-1) unstable; urgency=low diff -Nru betaradio-1.5+bzr169/po/zh_TW.po betaradio-1.5+bzr171/po/zh_TW.po --- betaradio-1.5+bzr169/po/zh_TW.po 2014-06-30 07:40:27.000000000 +0000 +++ betaradio-1.5+bzr171/po/zh_TW.po 2014-07-02 07:33:36.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: betaradio 1.2\n" "Report-Msgid-Bugs-To: http://code.google.com/p/betaradio\n" -"POT-Creation-Date: 2014-06-27 17:02+0800\n" +"POT-Creation-Date: 2014-07-02 11:33+0800\n" "PO-Revision-Date: 2010-06-25 23:05+0800\n" "Last-Translator: Shih-Yuan Lee (FourDollars) \n" "Language-Team: Shih-Yuan Lee (FourDollars) \n" @@ -17,23 +17,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/betaradio.vala:56 src/betaradio.vala:70 src/betaradio.vala:86 -#: src/betaradio.vala:95 +#: src/betaradio.vala:58 src/betaradio.vala:72 src/betaradio.vala:88 +#: src/betaradio.vala:97 msgid "BetaRadio Tuner" msgstr "BetaRadio 點播器" -#: src/betaradio.vala:57 +#: src/betaradio.vala:59 msgid "Data Synchronizing ..." msgstr "資料同步中..." -#: src/betaradio.vala:64 +#: src/betaradio.vala:66 msgid "Stop" msgstr "停止播放" -#: src/betaradio.vala:80 +#: src/betaradio.vala:82 msgid "Quit" msgstr "離開" -#: src/betaradio.vala:107 +#: src/betaradio.vala:109 msgid "Connection failed. Please restart this program." msgstr "連線失敗,請重新啟動程式。" diff -Nru betaradio-1.5+bzr169/src/betaradio.vala betaradio-1.5+bzr171/src/betaradio.vala --- betaradio-1.5+bzr169/src/betaradio.vala 2014-06-30 07:40:27.000000000 +0000 +++ betaradio-1.5+bzr171/src/betaradio.vala 2014-07-02 07:33:36.000000000 +0000 @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +using X; using Gtk; using Gst; @@ -25,6 +26,7 @@ private AnyTray.Icon icon = null; public static int main (string[] args) { + X.init_threads(); Gtk.init(ref args); Gst.init(ref args);