diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-20 11:12:20 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-20 11:12:20 -0300 |
| commit | 5c0a5f2b9fa7f1683f279728342aa7f5f0cf90a3 (patch) | |
| tree | a55da6178b48e7abe9508505d3e92cf02a03da52 /extra/totem | |
| parent | c56b2c50f5748090efb9f10f2a021e57a2455764 (diff) | |
| parent | 1a136cf48dd7f710f38ff998182508f5a0d41c35 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/comix/PKGBUILD
community/geany/PKGBUILD
community/gnome-do-docklets/PKGBUILD
community/gnome-do-plugins/PKGBUILD
community/gnome-system-tools/PKGBUILD
community/gnustep-make/PKGBUILD
community/gtweakui/PKGBUILD
community/hwinfo/PKGBUILD
community/kungfu/PKGBUILD
community/liboauth/PKGBUILD
community/liboobs/PKGBUILD
community/lua-lzlib/PKGBUILD
community/mcdp/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-runtime/PKGBUILD
community/mplayer2/PKGBUILD
community/pdf2svg/PKGBUILD
community/perl-data-dumper/PKGBUILD
community/perl-digest-md5/PKGBUILD
community/perl-perlio-eol/PKGBUILD
community/perl-xml-libxslt/PKGBUILD
community/python-cherrypy/PKGBUILD
community/python-pexpect/PKGBUILD
community/python-pyro/PKGBUILD
community/python2-cherrypy/PKGBUILD
community/rexima/PKGBUILD
community/shp2svg/PKGBUILD
community/system-tools-backends/PKGBUILD
community/tracker/PKGBUILD
community/virtualbox/PKGBUILD
core/bridge-utils/PKGBUILD
extra/avidemux/PKGBUILD
extra/beagle/PKGBUILD
extra/bug-buddy/PKGBUILD
extra/dssi/PKGBUILD
extra/evolution-sharp/PKGBUILD
extra/evolution-webcal/PKGBUILD
extra/feh/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gnome-mag/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnutls/PKGBUILD
extra/gok/PKGBUILD
extra/gpsd/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/hyphen/PKGBUILD
extra/kdelibs/PKGBUILD
extra/keytouch-editor/PKGBUILD
extra/keytouch/PKGBUILD
extra/koffice/PKGBUILD
extra/krusader/PKGBUILD
extra/libbeagle/PKGBUILD
extra/libffi/PKGBUILD
extra/libgnomeuimm/PKGBUILD
extra/libreoffice/PKGBUILD
extra/m17n-lib/PKGBUILD
extra/mtr/PKGBUILD
extra/openbabel/PKGBUILD
extra/poppler/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/rox/PKGBUILD
extra/transmission/PKGBUILD
extra/xf86-input-synaptics/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xinit/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/icecat/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-ncurses/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-talloc/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/totem')
| -rw-r--r-- | extra/totem/fix_crash.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/extra/totem/fix_crash.patch b/extra/totem/fix_crash.patch deleted file mode 100644 index 08409696c..000000000 --- a/extra/totem/fix_crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cee6399c1de27e5ccae35975aaae4fd7cfa40c2c Mon Sep 17 00:00:00 2001 -From: Marcel van den Hof <marcelvdh@gmail.com> -Date: Sun, 29 May 2011 23:45:36 +0100 -Subject: [PATCH] Fix segfault in Bemused plugin - -If bluetoothd is not running sdp_connect() returns a null value which -will cause the plugin to segfault. - -This patch adds a check for a possible null value from sdp_connect(). ---- - src/plugins/bemused/totem-bemused.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/bemused/totem-bemused.c b/src/plugins/bemused/totem-bemused.c -index 584b4d3..c51a0ee 100644 ---- a/src/plugins/bemused/totem-bemused.c -+++ b/src/plugins/bemused/totem-bemused.c -@@ -655,7 +655,8 @@ sdp_svc_add_spp(u_int8_t port, - - /* Connect to the local SDP server, register the service record */ - session = sdp_connect (BDADDR_ANY, BDADDR_LOCAL, 0); -- sdp_record_register (session, &record, 0); -+ if (session != NULL) -+ sdp_record_register (session, &record, 0); - - /* Cleanup */ - sdp_data_free (channel); --- -1.7.5.2 - |