Hello community, here is the log from the commit of package totem for openSUSE:Factory checked in at 2013-09-30 09:32:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/totem (Old) and /work/SRC/openSUSE:Factory/.totem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "totem" Changes: -------- --- /work/SRC/openSUSE:Factory/totem/totem.changes 2013-09-27 19:08:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.totem.new/totem.changes 2013-09-30 09:32:18.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 29 14:22:14 UTC 2013 - dimstar@opensuse.org + +- Add totem-git-fixes.patch: Backport three fixes from git, fixing + minor errors messages on startups and the possibility of an + assert on launch (bgo#708647). + +------------------------------------------------------------------- New: ---- totem-git-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.5xbJk1/_old 2013-09-30 09:32:19.000000000 +0200 +++ /var/tmp/diff_new_pack.5xbJk1/_new 2013-09-30 09:32:19.000000000 +0200 @@ -24,9 +24,10 @@ Summary: Movie Player for the GNOME Desktop License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Video/Players -# FIXME: set build_zeitgeist_plugin to 1 again. Url: http://www.gnome.org/projects/totem/ Source0: http://download.gnome.org/sources/totem/3.10/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM totem-git-fixes.patch dimstar@opensuse.org -- Backport fixes from git, fixing crashes and errors on startup +Patch0: totem-git-fixes.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gstreamer-plugins-bad >= 0.11.93 @@ -192,6 +193,7 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build ++++++ totem-git-fixes.patch ++++++

From 437e64ffb5f19d2f088339954686e794cc276319 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess@hadess.net> Date: Mon, 23 Sep 2013 18:27:17 +0000 Subject: main: Fix typo in action name

See: https://bugzilla.gnome.org/show_bug.cgi?id=708647 --- diff --git a/src/totem.c b/src/totem.c index bf82c04..12a0e5b 100644 --- a/src/totem.c +++ b/src/totem.c @@ -107,7 +107,7 @@ app_init (Totem *totem, char **argv) set_rtl_icon_name (totem, "next-chapter", "media-skip-forward"); set_rtl_icon_name (totem, "previous-chapter", "media-skip-backward"); set_rtl_icon_name (totem, "skip-forward", "media-seek-forward"); - set_rtl_icon_name (totem, "skip-backward", "media-seek-backward"); + set_rtl_icon_name (totem, "skip-backwards", "media-seek-backward"); totem->win = GTK_WIDGET (gtk_builder_get_object (totem->xml, "totem_main_window")); g_object_bind_property (G_OBJECT (totem), "fullscreen", -- cgit v0.9.2 m 0304069cf8a02919f71cce079bf7a47121cf8c4f Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess@hadess.net> Date: Mon, 23 Sep 2013 18:29:46 +0000 Subject: main: Remove unused variable --- diff --git a/src/totem.c b/src/totem.c index 12a0e5b..74ac285 100644 --- a/src/totem.c +++ b/src/totem.c @@ -87,7 +87,6 @@ app_init (Totem *totem, char **argv) { GtkSettings *gtk_settings; char *sidebar_pageid; - GtkAction *action; if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS) g_warning ("gtk-clutter failed to initialise, expect problems from here on."); -- cgit v0.9.2

From b252133d765245a297e446c805822601e5a4924b Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess@hadess.net> Date: Fri, 27 Sep 2013 13:50:20 +0000 Subject: main: Fix possible assertion on startup

In some cases, Totem was focused on startup by the time we handled command-line arguments. This triggered an assertion when trying to show the fullscreen popups because we weren't fullscreened yet. https://bugzilla.gnome.org/show_bug.cgi?id=708647 --- diff --git a/src/totem-fullscreen.c b/src/totem-fullscreen.c index fac1b05..69e1fd7 100644 --- a/src/totem-fullscreen.c +++ b/src/totem-fullscreen.c @@ -307,7 +307,8 @@ totem_fullscreen_show_popups (TotemFullscreen *fs, gboolean show_cursor) { GtkWidget *item; - g_assert (fs->priv->is_fullscreen != FALSE); + if (!fs->priv->is_fullscreen) + return; if (fs->priv->popup_in_progress != FALSE) return; -- cgit v0.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org