[meego-commits] 24899: Changes to MeeGo:1.2:oss/UMMS
rui_long
no_reply at build.meego.com
Wed May 30 08:18:05 UTC 2012
Hi,
I have made the following changes to UMMS in project MeeGo:1.2:oss. Please review and accept ASAP.
Thank You,
rui_long
[This message was auto-generated]
---
Request #24899:
submit: devel:tv:1.2/UMMS(r10)(update) -> MeeGo:1.2:oss/UMMS
Message:
None
State: new 2012-05-30T00:17:44 rui_long
Comment: None
changes files:
--------------
--- umms.changes
+++ umms.changes
@@ -2,33 +1,0 @@
-Thu May 17 01:18:44 UTC 2012 - jieke.wu at intel.com
-
-- commit baf0807a7724e2262aac6b56aa0b99b87009a966
-- Author: Alex Wu <zhiwen.wu at linux.intel.com>
-- Date: Wed May 16 16:44:35 2012 +0800
- UmmsPlayerBackend: Stop backend in dispose
- This patch make the backend stopped when destroy it.
-
--------------------------------------------------------------------
-Fri May 11 05:18:34 UTC 2012 - jieke.wu at intel.com
-
-- commit 93e58f89f731d6cf942ea04ec74ec1a759be0e12
-- Author: Alex Wu <zhiwen.wu at linux.intel.com>
-- Date: Thu May 3 16:52:55 2012 +0800
-
- umms.conf: Fix set a invalid proxy uri.
-
- Because UMMS core will use the proxy setting in umms.conf instead
- of the proxy by SetProxy method call. The default umms.conf provides
- a invalid proxy uri, that makes SetProxy method take no effects.
- Also add a checking for "" string.
-
-- commit d8fdc2ab1f39521c7087963284f37a596de2d884
-- Author: Alex Wu <zhiwen.wu at linux.intel.com>
-- Date: Wed Apr 25 09:07:59 2012 +0800
-
- UmmsMediaPlayer: Emit Initialized signal when going up to Paused
-
- The semantic of Initialized signal is backend has got enough media
- data and been ready for query media matadata.
-
-
--------------------------------------------------------------------
spec files:
-----------
other changes:
--------------
++++++ umms-0.1.tar.gz
--- .git
+++ .git
-(directory)
--- .git/FETCH_HEAD
+++ .git/FETCH_HEAD
-baf0807a7724e2262aac6b56aa0b99b87009a966 branch 'master' of git://gitorious.org/meego-middleware/umms
--- .git/HEAD
+++ .git/HEAD
-ref: refs/heads/master
--- .git/ORIG_HEAD
+++ .git/ORIG_HEAD
-93e58f89f731d6cf942ea04ec74ec1a759be0e12
--- .git/branches
+++ .git/branches
-(directory)
--- .git/config
+++ .git/config
-[core]
- repositoryformatversion = 0
- filemode = true
- bare = false
- logallrefupdates = true
-[remote "origin"]
- fetch = +refs/heads/*:refs/remotes/origin/*
- url = git://gitorious.org/meego-middleware/umms.git
-[branch "master"]
- remote = origin
- merge = refs/heads/master
--- .git/description
+++ .git/description
-Unnamed repository; edit this file 'description' to name the repository.
--- .git/hooks
+++ .git/hooks
-(directory)
--- .git/hooks/applypatch-msg.sample
+++ .git/hooks/applypatch-msg.sample
-#!/bin/sh
-#
-# An example hook script to check the commit log message taken by
-# applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit. The hook is
-# allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "applypatch-msg".
-
-. git-sh-setup
-test -x "$GIT_DIR/hooks/commit-msg" &&
- exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
-:
--- .git/hooks/commit-msg.sample
+++ .git/hooks/commit-msg.sample
-#!/bin/sh
-#
-# An example hook script to check the commit log message.
-# Called by "git commit" with one argument, the name of the file
-# that has the commit message. The hook should exit with non-zero
-# status after issuing an appropriate message if it wants to stop the
-# commit. The hook is allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "commit-msg".
-
-# Uncomment the below to add a Signed-off-by line to the message.
-# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
-# hook is more suited to it.
-#
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
-
-# This example catches duplicate Signed-off-by lines.
-
-test "" = "$(grep '^Signed-off-by: ' "$1" |
- sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
- echo >&2 Duplicate Signed-off-by lines.
- exit 1
-}
--- .git/hooks/post-commit.sample
+++ .git/hooks/post-commit.sample
-#!/bin/sh
-#
-# An example hook script that is called after a successful
-# commit is made.
-#
-# To enable this hook, rename this file to "post-commit".
-
-: Nothing
--- .git/hooks/post-receive.sample
+++ .git/hooks/post-receive.sample
-#!/bin/sh
-#
-# An example hook script for the "post-receive" event.
-#
-# The "post-receive" script is run after receive-pack has accepted a pack
-# and the repository has been updated. It is passed arguments in through
-# stdin in the form
-# <oldrev> <newrev> <refname>
-# For example:
-# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
-#
-# see contrib/hooks/ for a sample, or uncomment the next line and
-# rename the file to "post-receive".
-
-#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
--- .git/hooks/post-update.sample
+++ .git/hooks/post-update.sample
-#!/bin/sh
-#
-# An example hook script to prepare a packed repository for use over
-# dumb transports.
-#
-# To enable this hook, rename this file to "post-update".
-
-exec git update-server-info
--- .git/hooks/pre-applypatch.sample
+++ .git/hooks/pre-applypatch.sample
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed
-# by applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-applypatch".
-
-. git-sh-setup
-test -x "$GIT_DIR/hooks/pre-commit" &&
- exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
-:
--- .git/hooks/pre-commit.sample
+++ .git/hooks/pre-commit.sample
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments. The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
- against=HEAD
-else
- # Initial commit: diff against an empty tree object
- against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-fi
-
-# If you want to allow non-ascii filenames set this variable to true.
-allownonascii=$(git config hooks.allownonascii)
-
-# Cross platform projects tend to avoid non-ascii filenames; prevent
-# them from being added to the repository. We exploit the fact that the
-# printable range starts at the space character and ends with tilde.
-if [ "$allownonascii" != "true" ] &&
- # Note that the use of brackets around a tr range is ok here, (it's
- # even required, for portability to Solaris 10's /usr/bin/tr), since
- # the square bracket bytes happen to fall in the designated range.
- test "$(git diff --cached --name-only --diff-filter=A -z $against |
- LC_ALL=C tr -d '[ -~]\0')"
-then
- echo "Error: Attempt to add a non-ascii file name."
- echo
- echo "This can cause problems if you want to work"
- echo "with people on other platforms."
- echo
- echo "To be portable it is advisable to rename the file ..."
- echo
- echo "If you know what you are doing you can disable this"
- echo "check using:"
- echo
- echo " git config hooks.allownonascii true"
- echo
- exit 1
-fi
-
-exec git diff-index --check --cached $against --
--- .git/hooks/pre-rebase.sample
+++ .git/hooks/pre-rebase.sample
-#!/bin/sh
-#
-# Copyright (c) 2006, 2008 Junio C Hamano
-#
-# The "pre-rebase" hook is run just before "git rebase" starts doing
-# its job, and can prevent the command from running by exiting with
-# non-zero status.
-#
-# The hook is called with the following parameters:
-#
-# $1 -- the upstream the series was forked from.
-# $2 -- the branch being rebased (or empty when rebasing the current branch).
-#
-# This sample shows how to prevent topic branches that are already
-# merged to 'next' branch from getting rebased, because allowing it
-# would result in rebasing already published history.
-
-publish=next
-basebranch="$1"
-if test "$#" = 2
-then
- topic="refs/heads/$2"
-else
- topic=`git symbolic-ref HEAD` ||
- exit 0 ;# we do not interrupt rebasing detached HEAD
-fi
-
-case "$topic" in
-refs/heads/??/*)
- ;;
-*)
- exit 0 ;# we do not interrupt others.
- ;;
-esac
-
-# Now we are dealing with a topic branch being rebased
-# on top of master. Is it OK to rebase it?
-
-# Does the topic really exist?
-git show-ref -q "$topic" || {
- echo >&2 "No such branch $topic"
- exit 1
-}
-
-# Is topic fully merged to master?
-not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
-if test -z "$not_in_master"
-then
- echo >&2 "$topic is fully merged to master; better remove it."
- exit 1 ;# we could allow it, but there is no point.
-fi
-
-# Is topic ever merged to next? If so you should not be rebasing it.
-only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
-only_next_2=`git rev-list ^master ${publish} | sort`
-if test "$only_next_1" = "$only_next_2"
-then
- not_in_topic=`git rev-list "^$topic" master`
- if test -z "$not_in_topic"
- then
- echo >&2 "$topic is already up-to-date with master"
- exit 1 ;# we could allow it, but there is no point.
- else
- exit 0
- fi
-else
- not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
- /usr/bin/perl -e '
- my $topic = $ARGV[0];
- my $msg = "* $topic has commits already merged to public branch:\n";
- my (%not_in_next) = map {
- /^([0-9a-f]+) /;
- ($1 => 1);
- } split(/\n/, $ARGV[1]);
- for my $elem (map {
- /^([0-9a-f]+) (.*)$/;
- [$1 => $2];
- } split(/\n/, $ARGV[2])) {
- if (!exists $not_in_next{$elem->[0]}) {
- if ($msg) {
- print STDERR $msg;
- undef $msg;
- }
- print STDERR " $elem->[1]\n";
- }
- }
- ' "$topic" "$not_in_next" "$not_in_master"
- exit 1
-fi
-
-exit 0
-
-<<\DOC_END
-################################################################
-
-This sample hook safeguards topic branches that have been
-published from being rewound.
-
-The workflow assumed here is:
-
- * Once a topic branch forks from "master", "master" is never
- merged into it again (either directly or indirectly).
-
- * Once a topic branch is fully cooked and merged into "master",
- it is deleted. If you need to build on top of it to correct
- earlier mistakes, a new topic branch is created by forking at
- the tip of the "master". This is not strictly necessary, but
- it makes it easier to keep your history simple.
-
- * Whenever you need to test or publish your changes to topic
- branches, merge them into "next" branch.
-
-The script, being an example, hardcodes the publish branch name
-to be "next", but it is trivial to make it configurable via
-$GIT_DIR/config mechanism.
-
-With this workflow, you would want to know:
-
-(1) ... if a topic branch has ever been merged to "next". Young
- topic branches can have stupid mistakes you would rather
- clean up before publishing, and things that have not been
- merged into other branches can be easily rebased without
- affecting other people. But once it is published, you would
- not want to rewind it.
-
-(2) ... if a topic branch has been fully merged to "master".
- Then you can delete it. More importantly, you should not
- build on top of it -- other people may already want to
- change things related to the topic as patches against your
- "master", so if you need further changes, it is better to
- fork the topic (perhaps with the same name) afresh from the
- tip of "master".
-
-Let's look at this example:
-
- o---o---o---o---o---o---o---o---o---o "next"
- / / / /
- / a---a---b A / /
- / / / /
- / / c---c---c---c B /
- / / / \ /
- / / / b---b C \ /
- / / / / \ /
- ---o---o---o---o---o---o---o---o---o---o---o "master"
-
-
-A, B and C are topic branches.
-
- * A has one fix since it was merged up to "next".
-
- * B has finished. It has been fully merged up to "master" and "next",
- and is ready to be deleted.
-
- * C has not merged to "next" at all.
-
-We would want to allow C to be rebased, refuse A, and encourage
-B to be deleted.
-
-To compute (1):
-
- git rev-list ^master ^topic next
- git rev-list ^master next
-
- if these match, topic has not merged in next at all.
-
-To compute (2):
-
- git rev-list master..topic
-
- if this is empty, it is fully merged to "master".
-
-DOC_END
--- .git/hooks/prepare-commit-msg.sample
+++ .git/hooks/prepare-commit-msg.sample
-#!/bin/sh
-#
-# An example hook script to prepare the commit log message.
-# Called by "git commit" with the name of the file that has the
-# commit message, followed by the description of the commit
-# message's source. The hook's purpose is to edit the commit
-# message file. If the hook fails with a non-zero status,
-# the commit is aborted.
-#
-# To enable this hook, rename this file to "prepare-commit-msg".
-
-# This hook includes three examples. The first comments out the
-# "Conflicts:" part of a merge commit.
-#
-# The second includes the output of "git diff --name-status -r"
-# into the message, just before the "git status" output. It is
-# commented because it doesn't cope with --amend or with squashed
-# commits.
-#
-# The third example adds a Signed-off-by line to the message, that can
-# still be edited. This is rarely a good idea.
-
-case "$2,$3" in
- merge,)
- /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
-
-# ,|template,)
-# /usr/bin/perl -i.bak -pe '
-# print "\n" . `git diff --cached --name-status -r`
-# if /^#/ && $first++ == 0' "$1" ;;
-
- *) ;;
-esac
-
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
--- .git/hooks/update.sample
+++ .git/hooks/update.sample
-#!/bin/sh
-#
-# An example hook script to blocks unannotated tags from entering.
-# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
-#
-# To enable this hook, rename this file to "update".
-#
-# Config
-# ------
-# hooks.allowunannotated
-# This boolean sets whether unannotated tags will be allowed into the
-# repository. By default they won't be.
-# hooks.allowdeletetag
-# This boolean sets whether deleting tags will be allowed in the
-# repository. By default they won't be.
-# hooks.allowmodifytag
-# This boolean sets whether a tag may be modified after creation. By default
-# it won't be.
-# hooks.allowdeletebranch
-# This boolean sets whether deleting branches will be allowed in the
-# repository. By default they won't be.
-# hooks.denycreatebranch
-# This boolean sets whether remotely creating branches will be denied
-# in the repository. By default this is allowed.
-#
-
-# --- Command line
-refname="$1"
-oldrev="$2"
-newrev="$3"
-
-# --- Safety check
-if [ -z "$GIT_DIR" ]; then
- echo "Don't run this script from the command line." >&2
- echo " (if you want, you could supply GIT_DIR then run" >&2
- echo " $0 <ref> <oldrev> <newrev>)" >&2
- exit 1
-fi
-
-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
- echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
- exit 1
-fi
-
-# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
-
-# check for no description
-projectdesc=$(sed -e '1q' "$GIT_DIR/description")
-case "$projectdesc" in
-"Unnamed repository"* | "")
- echo "*** Project description file hasn't been set" >&2
- exit 1
- ;;
-esac
-
-# --- Check types
-# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
-if [ "$newrev" = "$zero" ]; then
- newrev_type=delete
-else
- newrev_type=$(git cat-file -t $newrev)
-fi
-
-case "$refname","$newrev_type" in
- refs/tags/*,commit)
- # un-annotated tag
- short_refname=${refname##refs/tags/}
- if [ "$allowunannotated" != "true" ]; then
- echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
- echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
- exit 1
- fi
- ;;
- refs/tags/*,delete)
- # delete tag
- if [ "$allowdeletetag" != "true" ]; then
- echo "*** Deleting a tag is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/tags/*,tag)
- # annotated tag
- if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
- then
- echo "*** Tag '$refname' already exists." >&2
- echo "*** Modifying a tag is not allowed in this repository." >&2
- exit 1
- fi
- ;;
- refs/heads/*,commit)
- # branch
- if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
- echo "*** Creating a branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/heads/*,delete)
- # delete branch
- if [ "$allowdeletebranch" != "true" ]; then
- echo "*** Deleting a branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/remotes/*,commit)
- # tracking branch
- ;;
- refs/remotes/*,delete)
- # delete tracking branch
- if [ "$allowdeletebranch" != "true" ]; then
- echo "*** Deleting a tracking branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- *)
- # Anything else (is there anything else?)
- echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
- exit 1
- ;;
-esac
-
-# --- Finished
-exit 0
--- .git/info
+++ .git/info
-(directory)
--- .git/info/exclude
+++ .git/info/exclude
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
--- .git/logs
+++ .git/logs
-(directory)
--- .git/logs/HEAD
+++ .git/logs/HEAD
-0000000000000000000000000000000000000000 7e06fc867539b5c56cdca3fda2d114ebd0b9a563 Jieke.Wu <jieke.wu at intel.com> 1333160249 +0800 clone: from git://gitorious.org/meego-middleware/umms.git
-7e06fc867539b5c56cdca3fda2d114ebd0b9a563 93e58f89f731d6cf942ea04ec74ec1a759be0e12 Jieke.Wu <jieke.wu at intel.com> 1336713132 +0800 pull : Fast-forward
-93e58f89f731d6cf942ea04ec74ec1a759be0e12 baf0807a7724e2262aac6b56aa0b99b87009a966 Jieke.Wu <jieke.wu at intel.com> 1337217292 +0800 pull : Fast-forward
--- .git/logs/refs
+++ .git/logs/refs
-(directory)
--- .git/logs/refs/heads
+++ .git/logs/refs/heads
-(directory)
--- .git/logs/refs/heads/master
+++ .git/logs/refs/heads/master
-0000000000000000000000000000000000000000 7e06fc867539b5c56cdca3fda2d114ebd0b9a563 Jieke.Wu <jieke.wu at intel.com> 1333160249 +0800 clone: from git://gitorious.org/meego-middleware/umms.git
-7e06fc867539b5c56cdca3fda2d114ebd0b9a563 93e58f89f731d6cf942ea04ec74ec1a759be0e12 Jieke.Wu <jieke.wu at intel.com> 1336713132 +0800 pull : Fast-forward
-93e58f89f731d6cf942ea04ec74ec1a759be0e12 baf0807a7724e2262aac6b56aa0b99b87009a966 Jieke.Wu <jieke.wu at intel.com> 1337217292 +0800 pull : Fast-forward
--- .git/logs/refs/remotes
+++ .git/logs/refs/remotes
-(directory)
--- .git/logs/refs/remotes/origin
+++ .git/logs/refs/remotes/origin
-(directory)
--- .git/logs/refs/remotes/origin/master
+++ .git/logs/refs/remotes/origin/master
-7e06fc867539b5c56cdca3fda2d114ebd0b9a563 93e58f89f731d6cf942ea04ec74ec1a759be0e12 Jieke.Wu <jieke.wu at intel.com> 1336713132 +0800 pull : fast-forward
-93e58f89f731d6cf942ea04ec74ec1a759be0e12 baf0807a7724e2262aac6b56aa0b99b87009a966 Jieke.Wu <jieke.wu at intel.com> 1337217292 +0800 pull : fast-forward
--- .git/objects
+++ .git/objects
-(directory)
--- .git/objects/02
+++ .git/objects/02
-(directory)
--- .git/objects/05
+++ .git/objects/05
-(directory)
--- .git/objects/0c
+++ .git/objects/0c
-(directory)
--- .git/objects/10
+++ .git/objects/10
-(directory)
--- .git/objects/13
+++ .git/objects/13
-(directory)
--- .git/objects/14
+++ .git/objects/14
-(directory)
--- .git/objects/17
+++ .git/objects/17
-(directory)
--- .git/objects/18
+++ .git/objects/18
-(directory)
--- .git/objects/19
+++ .git/objects/19
-(directory)
--- .git/objects/1e
+++ .git/objects/1e
-(directory)
--- .git/objects/22
+++ .git/objects/22
-(directory)
--- .git/objects/25
+++ .git/objects/25
-(directory)
--- .git/objects/2c
+++ .git/objects/2c
-(directory)
--- .git/objects/3c
+++ .git/objects/3c
-(directory)
--- .git/objects/40
+++ .git/objects/40
-(directory)
--- .git/objects/42
+++ .git/objects/42
-(directory)
--- .git/objects/45
+++ .git/objects/45
-(directory)
--- .git/objects/48
+++ .git/objects/48
-(directory)
--- .git/objects/4a
+++ .git/objects/4a
-(directory)
--- .git/objects/4c
+++ .git/objects/4c
-(directory)
--- .git/objects/4f
+++ .git/objects/4f
-(directory)
--- .git/objects/51
+++ .git/objects/51
-(directory)
--- .git/objects/52
+++ .git/objects/52
-(directory)
--- .git/objects/5c
+++ .git/objects/5c
-(directory)
--- .git/objects/5d
+++ .git/objects/5d
-(directory)
--- .git/objects/5d/c11836e7f5acde4dcacc8bd54fa48967ea7c96
+++ .git/objects/5d/c11836e7f5acde4dcacc8bd54fa48967ea7c96
-x•O=oƒ0íÊý
-K͆€*EÝ"ÅR¹2PaRu¨„‚ãDV
±°ùÿŬ]Nwïî}\.5Z¿¾<Á>MYõmú¦1«í8¥ø#/ª¯¤`$϶Á$Ù#¨ùÈŒ(I²òÆçJŠÖþOØþ-&Û˜Ž#£GJÖ.Ì$†¬0v,a/‘áÔÖŽh
aZátGñ;C´"¨Y@LXÑg;B·ð¼ ðËë›>š§9º|—®
w`8ó@ó@¶c;å˜ý{æ—ö$ÏGÙ
·‹åvhýp^ÜOª—x<šÝ§ Öϲ5ö Ôðc£ÕÁ
-4é÷@'©¸q2
å!
¥±•oòc^À ‹‘þ--- .git/objects/5f
+++ .git/objects/5f
-(directory)
--- .git/objects/65
+++ .git/objects/65
-(directory)
--- .git/objects/67
+++ .git/objects/67
-(directory)
--- .git/objects/6b
+++ .git/objects/6b
-(directory)
--- .git/objects/6c
+++ .git/objects/6c
-(directory)
--- .git/objects/70
+++ .git/objects/70
-(directory)
--- .git/objects/72
+++ .git/objects/72
-(directory)
--- .git/objects/7f
+++ .git/objects/7f
-(directory)
--- .git/objects/80
+++ .git/objects/80
-(directory)
--- .git/objects/82
+++ .git/objects/82
-(directory)
--- .git/objects/8a
+++ .git/objects/8a
-(directory)
--- .git/objects/8c
+++ .git/objects/8c
-(directory)
--- .git/objects/8e
+++ .git/objects/8e
-(directory)
--- .git/objects/93
+++ .git/objects/93
-(directory)
--- .git/objects/95
+++ .git/objects/95
-(directory)
--- .git/objects/9d
+++ .git/objects/9d
-(directory)
--- .git/objects/a0
+++ .git/objects/a0
-(directory)
--- .git/objects/a7
+++ .git/objects/a7
-(directory)
--- .git/objects/a9
+++ .git/objects/a9
-(directory)
--- .git/objects/ab
+++ .git/objects/ab
-(directory)
--- .git/objects/af
+++ .git/objects/af
-(directory)
--- .git/objects/b1
+++ .git/objects/b1
-(directory)
--- .git/objects/b5
+++ .git/objects/b5
-(directory)
--- .git/objects/b5/960f95ada42e5f034e52a8677dd9eb3ca3c524
+++ .git/objects/b5/960f95ada42e5f034e52a8677dd9eb3ca3c524
-xTkkÛHígýŠC
-‹
ÅJ),¸”UÒ¸q‰ãGCº,a,¬ÛŒgÄ<lÔÒÿ¾w”¤é¶û¡þ¢Ñ}
sî
¯•Y#;þùâø0Á!VÓ齕¦Šd‰iPž0•% ,¤ÝQ!ûh¬ÙQ)
œô0Þ‡|6qð.4±>‚5J´¤7ÈCIB—øÈ|rØK¥âóÝÇÓ®l-Šû”{b[
|m,~ÝâSM{©qðæKwL÷á/Ò^ª´0Û·±üÇ߇ [¡q!ñæswLkùSù™iZK›Ú£Wôq2Ì2L"
ÎŒmž(t6Ce¥„3•ß +GhM@ÁøLŽœ·´^‚|”vll$³5%UmŒ]J _Kxi·.ú_Þ_p)ãÜ{©¥
-³°VTÄîK6X;ibÐÕ.ÄÆq¤²x¤‚±a|áÉè$q¾ûúNZÇ!œ¤ÙÓ÷
!0=ᣠÓÄÎ>ón¡óÃcçÏúŸe– Ý ¨MÃ’j†b‘{â1®%‚“UPƒ¨=ÁÍdyq½Z"¿ºÅM>ŸçWËÛó\9+w<Ñ(‰¶ŠkÆæZ¡}Ëœ#Âô|~vÁ-ùéär²¼ÌÇ“åÕùbñõ
9fù|99[]æsÌVóÙõâ<ïg¤ÕÜYù
7¸bÌ-ïJé)÷¤û–오*Q‹äA’vLQ à½y2õ÷†¨ ï~Ýݪ¨‚6~€½%^¾*¿Œ5žì€³Hxñð
¾W<
ç5`Œ1UŒ;VÆØNóF0ÍáI–
²WÃ X-rF<N’—¤ J¾Eë´~ûcÄß oüý‚a»uG
=
-”ÖÏÕωx·¥É$áûˆ Ý‹a7ÅE-,ù¼ûûŸ~ò5íŽ4ùÞ ñ±ëNº+¬ä=ìñ;øÿ }¨üžàw¬µ‰\a¥Vc8J¾%ÿá†--- .git/objects/ba
+++ .git/objects/ba
-(directory)
--- .git/objects/bf
+++ .git/objects/bf
-(directory)
--- .git/objects/c0
+++ .git/objects/c0
-(directory)
--- .git/objects/c2
+++ .git/objects/c2
-(directory)
--- .git/objects/c7
+++ .git/objects/c7
-(directory)
--- .git/objects/c9
+++ .git/objects/c9
-(directory)
--- .git/objects/cc
+++ .git/objects/cc
-(directory)
--- .git/objects/ce
+++ .git/objects/ce
-(directory)
--- .git/objects/d3
+++ .git/objects/d3
-(directory)
--- .git/objects/d5
+++ .git/objects/d5
-(directory)
--- .git/objects/d8
+++ .git/objects/d8
-(directory)
--- .git/objects/d9
+++ .git/objects/d9
-(directory)
--- .git/objects/da
+++ .git/objects/da
-(directory)
--- .git/objects/db
+++ .git/objects/db
-(directory)
--- .git/objects/dc
+++ .git/objects/dc
-(directory)
--- .git/objects/e1
+++ .git/objects/e1
-(directory)
--- .git/objects/eb
+++ .git/objects/eb
-(directory)
--- .git/objects/ec
+++ .git/objects/ec
-(directory)
--- .git/objects/f3
+++ .git/objects/f3
-(directory)
--- .git/objects/fa
+++ .git/objects/fa
-(directory)
--- .git/objects/info
+++ .git/objects/info
-(directory)
--- .git/objects/pack
+++ .git/objects/pack
-(directory)
--- .git/packed-refs
+++ .git/packed-refs
-# pack-refs with: peeled
-7e06fc867539b5c56cdca3fda2d114ebd0b9a563 refs/remotes/origin/master
--- .git/refs
+++ .git/refs
-(directory)
--- .git/refs/heads
+++ .git/refs/heads
-(directory)
--- .git/refs/heads/master
+++ .git/refs/heads/master
-baf0807a7724e2262aac6b56aa0b99b87009a966
--- .git/refs/remotes
+++ .git/refs/remotes
-(directory)
--- .git/refs/remotes/origin
+++ .git/refs/remotes/origin
-(directory)
--- .git/refs/remotes/origin/HEAD
+++ .git/refs/remotes/origin/HEAD
-ref: refs/remotes/origin/master
--- .git/refs/remotes/origin/master
+++ .git/refs/remotes/origin/master
-baf0807a7724e2262aac6b56aa0b99b87009a966
--- .git/refs/tags
+++ .git/refs/tags
-(directory)
--- src/umms-media-player.c
+++ src/umms-media-player.c
@@ -174,8 +174,6 @@
player_state_changed_cb (UmmsPlayerBackend *iface, gint old_state, gint new_state, UmmsMediaPlayer *player)
{
g_signal_emit (player, umms_media_player_signals[SIGNAL_MEDIA_PLAYER_PlayerStateChanged], 0, old_state, new_state);
- if (new_state == PlayerStatePaused && old_state < PlayerStatePaused)
- g_signal_emit (player, umms_media_player_signals[SIGNAL_MEDIA_PLAYER_Initialized], 0);
}
static void
@@ -363,7 +361,7 @@
umms_player_backend_set_video_size (priv->backend, priv->x, priv->y, priv->w, priv->h, NULL);
priv->video_size_cached = FALSE;
- if (umms_ctx->proxy_uri && umms_ctx->proxy_uri[0] != '\0') {
+ if (umms_ctx->proxy_uri) {
if (priv->http_proxy_params)
g_hash_table_unref (priv->http_proxy_params);
priv->http_proxy_params = param_table_create ("proxy-uri", G_TYPE_STRING, umms_ctx->proxy_uri,
@@ -380,6 +378,8 @@
if (priv->sub_uri)
umms_player_backend_set_subtitle_uri (priv->backend, priv->sub_uri, NULL);
+ g_signal_emit (player, umms_media_player_signals[SIGNAL_MEDIA_PLAYER_Initialized], 0);
+
return TRUE;
}
--- src/umms-player-backend.c
+++ src/umms-player-backend.c
@@ -51,8 +51,6 @@
{
UmmsPlayerBackend *self = UMMS_PLAYER_BACKEND (object);
- umms_player_backend_stop (self, NULL);
-
G_OBJECT_CLASS (umms_player_backend_parent_class)->dispose (object);
}
--- src/umms-server-main.c
+++ src/umms-server-main.c
@@ -182,7 +182,9 @@
get_proxy_from_conf (UmmsCtx *ctx, GKeyFile *conf)
{
gchar **keys = NULL;
+ gchar **value_holder = NULL;
gsize len;
+ gint i;
GError *err = NULL;
if (!conf)
@@ -200,9 +202,21 @@
return;
}
- ctx->proxy_uri = g_key_file_get_string (conf, PROXY_GROUP, keys[0], NULL);
- ctx->proxy_id = g_key_file_get_string (conf, PROXY_GROUP, keys[1], NULL);
- ctx->proxy_pw = g_key_file_get_string (conf, PROXY_GROUP, keys[2], NULL);
+ for (i = 0; i < len; i++) {
+ if (g_strcmp0(keys[i], "uri") == 0)
+ value_holder = &ctx->proxy_uri;
+ else if (g_strcmp0(keys[i], "user") == 0)
+ value_holder = &ctx->proxy_id;
+ else if (g_strcmp0(keys[i], "password") == 0)
+ value_holder = &ctx->proxy_pw;
+ else {
+ value_holder = NULL;
+ UMMS_WARNING ("Invalid key %s", keys[i]);
+ }
+
+ if (value_holder)
+ *value_holder = g_key_file_get_string (conf, PROXY_GROUP, keys[i], NULL);
+ }
g_strfreev (keys);
return;
--- umms.conf
+++ umms.conf
@@ -14,6 +14,6 @@
[Proxy]
#section to specify the proxy
-#uri =
-#user =
-#password =
+uri = http://host:port
+user =
+password =
More information about the MeeGo-commits
mailing list